更新

 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue

@@ -2,9 +2,11 @@
  <basic-container>
    <div class="testbox">
      <div>
        <el-button plain size="small" type="primary" @click="addvisible=true">增加
        <el-button plain size="small" type="primary" @click="addvisible = true"
          >增加
        </el-button>
        <el-button plain size="small" type="primary" @click="editHandler">编辑
        <el-button plain size="small" type="primary" @click="editHandler"
          >编辑
        </el-button>
        <el-button plain size="small" type="primary">批量导入申请</el-button>
        <el-button plain size="small" type="primary">历史数据导入</el-button>
@@ -12,47 +14,65 @@
        <el-button plain size="small" type="primary">批量发布</el-button>
        <el-button plain size="small" type="primary">查看流程历史</el-button>
        <el-button plain size="small" type="primary">删除</el-button>
        <el-button plain size="small" type="primary" @click="setHandler">发布</el-button>
        <el-button plain size="small" type="primary" @click="DataChange">数据更改</el-button>
        <el-button plain size="small" type="primary" @click="huishouHandler">回收</el-button>
        <el-button plain size="small" type="primary" @click="openD">导出
        <el-button plain size="small" type="primary" @click="setHandler"
          >发布</el-button
        >
        <el-button plain size="small" type="primary" @click="DataChange"
          >数据更改</el-button
        >
        <el-button plain size="small" type="primary" @click="huishouHandler"
          >回收</el-button
        >
        <el-button plain size="small" type="primary" @click="openD"
          >导出
        </el-button>
        <el-button plain size="small" type="primary" @click="findHandler">查询
        <el-button plain size="small" type="primary" @click="findHandler"
          >查询
        </el-button>
        <el-button plain size="small" type="primary" @click="similarHandler">相似项查询</el-button>
        <el-button plain size="small" type="primary" @click="similarHandler"
          >相似项查询</el-button
        >
        <el-button plain size="small" type="primary">刷新</el-button>
        <el-input placeholder="请输入关键字按回车查询" size="small"
                  style="width: 180px;margin-left: 5px;margin-top:10px"></el-input>
        <el-input
          placeholder="请输入关键字按回车查询"
          size="small"
          style="width: 180px; margin-left: 5px; margin-top: 10px"
        ></el-input>
      </div>
      <el-row style="height: 700px;width: 100%">
        <el-table v-loading="isLoading" :data="tableData" max-height="700" style="" @cell-click="handleCellClick"
                  @selection-change="handleSelectionChange" @sort-change="sortChange" v-if="tableData.length != 0">
          <el-table-column
            fixed
            type="selection"
            width="55">
      <el-row style="height: 700px; width: 100%">
        <el-table
          v-loading="isLoading"
          :data="tableData"
          max-height="700"
          style=""
          @cell-click="handleCellClick"
          @selection-change="handleSelectionChange"
          @sort-change="sortChange"
          v-if="tableData.length != 0"
        >
          <el-table-column fixed type="selection" width="55"> </el-table-column>
          <el-table-column fixed label="序号" type="index" width="55">
          </el-table-column>
          <el-table-column
            fixed
            label="序号"
            type="index"
            width="55">
            v-for="item in this.tableHeadFindData"
            :key="item.id"
            :label="item.label"
            :prop="item.prop"
            :sortable="item.sortable"
            :formatter="formatBoolean"
          >
            <!-- 编辑和展示逻辑 -->
            <!--              <template slot-scope="{ row }">-->
            <!--                <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>-->
            <!--                <span v-else>{{row[item.prop]}}</span>-->
            <!--                <el-switch-->
            <!--                  v-if="editShow === 'true'"-->
            <!--                  v-model="row[item.prop]"-->
            <!--                  active-color="#13ce66"-->
            <!--                  inactive-color="#ff4949">-->
            <!--                </el-switch>-->
            <!--              </template>-->
          </el-table-column>
<!--          <div>-->
            <el-table-column  v-for="(item,index) in this.tableHeadFindData" :key="item.id" :label="item.label" :prop="item.prop" :sortable="item.sortable" >
              <!-- 编辑和展示逻辑 -->
              <!--              <template slot-scope="{ row }">-->
              <!--                <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>-->
              <!--                <span v-else>{{row[item.prop]}}</span>-->
              <!--                <el-switch-->
              <!--                  v-if="editShow === 'true'"-->
              <!--                  v-model="row[item.prop]"-->
              <!--                  active-color="#13ce66"-->
              <!--                  inactive-color="#ff4949">-->
              <!--                </el-switch>-->
              <!--              </template>-->
            </el-table-column>
<!--          </div>-->
        </el-table>
      </el-row>
      <FormTemplateDialog
@@ -86,12 +106,21 @@
        :title="'已发布数据更改'"
        :visible.sync="DataVisible"
      ></FormTemplateDialog>
      <set-personnel :visible.sync="visibleFlow"  :parameter="this.parameter"
      <set-personnel
        :visible.sync="visibleFlow"
        :parameter="this.parameter"
      ></set-personnel>
      <advanced-query :options="this.options" :visible.sync="findvisible"
                      @echoContion="echoContion"></advanced-query>
      <integration-transfer :data="transferData" :props="transferProps"
                            :visible.sync="dialogPush" @save="handelTransferSave"></integration-transfer>
      <advanced-query
        :options="this.options"
        :visible.sync="findvisible"
        @echoContion="echoContion"
      ></advanced-query>
      <integration-transfer
        :data="transferData"
        :props="transferProps"
        :visible.sync="dialogPush"
        @save="handelTransferSave"
      ></integration-transfer>
      <ResembleQueryDialog
        :visible.sync="similarVisible"
        :templateOid="templateOid"
@@ -100,7 +129,7 @@
        :codeRuleOid="this.codeRuleOid"
      ></ResembleQueryDialog>
    </div>
    <div class="block" style="display: flex;justify-content: flex-end">
    <div class="block" style="display: flex; justify-content: flex-end">
      <el-pagination
        :current-page="page.currentPage"
        :page-size="page.pageSizes"
@@ -108,84 +137,85 @@
        :total="page.total"
        layout="total, sizes, prev, pager, next, jumper"
        @size-change="handleSizeChange"
        @current-change="handleCurrentChange">
        @current-change="handleCurrentChange"
      >
      </el-pagination>
    </div>
  </basic-container>
</template>
<script>
import {MasterTable, TableData,FindData} from "@/api/GetItem";
import {listCodeAttributeByClassId} from '@/api/integration/integration.js'
import integrationTransfer from '@/views/integration/integrationTransfer'
import SetPersonnel from '@/components/template/SetPersonnel'
import { MasterTable, TableData, FindData } from "@/api/GetItem";
import { listCodeAttributeByClassId } from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
export default {
  components: {
    integrationTransfer,
    SetPersonnel,
    ResembleQueryDialog
    ResembleQueryDialog,
  },
  name: "Crud.vue",
  props: {
    page: {
      type: Object,
      default: () => {
        return {}
      }
        return {};
      },
    },
    codeClassifyOid: {
      type: String,
      default: ""
      default: "",
    },
    coderuleoid: {
      type: String,
      default: ""
      default: "",
    },
    tableDataArray: {
      type: Array,
    },
    total: {
      type: String,
      default: ""
      default: "",
    },
    templateOid: {
      type: String,
      default:''
      default: "",
    },
    tableHeadDataFateher: {
      type: Array,
    },
    isLoading: {
      type: Boolean,
      default: false
      default: false,
    },
    tableHeadFindData:{
      type:Array,
    }
    tableHeadFindData: {
      type: Array,
    },
  },
  data() {
    return {
      //相似项查询
      similarVisible:false,
      similarVisible: false,
      //发布
      parameter:{
        ids:[],
        code:'',
        type:'PUBLIC',
        template:''
      parameter: {
        ids: [],
        code: "",
        type: "PUBLIC",
        template: "",
      },
      visibleFlow: false,
      transferData: [],
      transferProps: {
        key: 'oid',
        label: 'name'
        key: "oid",
        label: "name",
      },
      tableHeadFindDatas:[],
      tableHeadFindDatas: [],
      addvisible: false,
      editvisible: false,
      findvisible: false,
      dialogPush: false,
      rowOid: '',
      rowOid: "",
      disabledProp: ["id"],
      editingRow: null,
      editShow: "",
@@ -193,7 +223,7 @@
      data: [],
      options: {},
      option: {
        column: []
        column: [],
      },
      List: [],
      columnType: {
@@ -204,106 +234,115 @@
        datetime: "datetime",
      },
      tableData: [],
      DataVisible:false,
      DataVisible: false,
      tableHeadData: [],
      items: {},
      seniorQueryColumns: [],
      selectRow: [],
      userName:""
    }
      userName: "",
    };
  },
  computed: {},
  created() {

  },
  mounted() {
  },
  created() {},
  mounted() {},
  activated() {
    this.doLayout()
    this.doLayout();
  },
  watch: {
    codeClassifyOid: {
      handler(newval, oldval) {
        this.codeClassifyOid = newval;

      },
      deep: true
      deep: true,
    },
    tableDataArray: {
      handler(newval, oldval) {
        this.tableData = newval;
      }
      },
    },
    tableHeadFindData:{
    tableHeadFindData: {
      handler(newval, oldval) {
        this.tableHeadFindDatas = newval;
      }
      },
    },
    total: {
      handler(newval, oldval) {
        this.page.total = newval;
      }
    },
    templateOid:{
      handler(newval,oldval) {
        this.parameter.code=newval;
      },
      deep:true
    }
    },
    templateOid: {
      handler(newval, oldval) {
        this.parameter.code = newval;
      },
      deep: true,
    },
  },
  methods: {
    // 转换数据true和false
    formatBoolean(row, column) {
      if (column.property === "xiaoshouwl"
        ||column.property === "shifoupihaoguanli" 
        ||column.property === "caigouwl" 
        ||column.property === "kucunwl" 
        ||column.property === "passing") {
        return row[column.property] =='true'? "是" : "否";
      }
      return row[column.property];
    },
    // 发布
    setHandler() {
      console.log('1111')
      console.log('父',this.parameter)
      console.log("1111");
      console.log("父", this.parameter);

      if (this.selectRow.length <= 0) {
        this.$message.warning('请选择一条数据')
      }  else {
        this.userName=localStorage.getItem('username')
        this.parameter.template=this.userName+'-发布'+'[物品]'
        this.$message.warning("请选择一条数据");
      } else {
        this.userName = localStorage.getItem("username");
        this.parameter.template = this.userName + "-发布" + "[物品]";
        this.visibleFlow = true;
      }
    },
    openD() {
      this.getListCodeByClassId()
      this.getListCodeByClassId();
    },
    async getListCodeByClassId() {
      this.transferData = []
      const response = await listCodeAttributeByClassId({codeClassifyId: this.codeClassifyOid})
      this.transferData = [];
      const response = await listCodeAttributeByClassId({
        codeClassifyId: this.codeClassifyOid,
      });
      if (response.status === 200) {
        const data = response.data.data
        this.transferData = data
        const data = response.data.data;
        this.transferData = data;
      }
    },
    rend() {
      this.tableData = this.tableHeadData
      this.tableData = this.tableHeadData;
    },
    handleSizeChange(val) {
      this.isLoading = true;
      setTimeout(() => {
        this.page.pageSize = val
        this.$emit('pageSize', val)
        this.CrudRend()
        this.page.pageSize = val;
        this.$emit("pageSize", val);
        this.CrudRend();
      }, 3000);

    },
    handleCurrentChange(val) {
      this.isLoading = true;
      setTimeout(() => {
        this.page.currentPage = val
        this.$emit('currentPage', val)
        this.CrudRend()
        this.page.currentPage = val;
        this.$emit("currentPage", val);
        this.CrudRend();
      }, 3000);
    },
    // 监听单元格点击事件并存储正在编辑的行
    handleCellClick(row, column) {
      this.editingRow = row;
      this.editShow = column.property;
      this.rowOid = row.oid
      this.rowOid = row.oid;
    },
    //删除
    enumDeleteRow(row) {
      this.tableData.splice(row, 1)
      this.tableData.splice(row, 1);
    },
    // 将正在编辑的行的状态变为 null ，即退出编辑状态
    saveRow() {
@@ -320,23 +359,23 @@
        MasterTable({
          codeClassifyOid: this.codeClassifyOid,
          functionId: 5,
        }).then(res => {
          this.options = res.data.tableDefineVO.seniorQueryColumns
        }).then((res) => {
          this.options = res.data.tableDefineVO.seniorQueryColumns;
          this.List = res.data.tableDefineVO.cols[0];
          this.List.forEach(item => {
          this.List.forEach((item) => {
            let columnItem = {
              label: item.title,
              prop: item.field,
              type: this.columnType[item.type],
              sortable: item.sort,
              width: item.minWidth
              width: item.minWidth,
            };
            this.option.column.push(columnItem);
            this.option.column = this.tableHeadData;
            this.templateOid = res.data.tableDefineVO.oid
            this.$emit('templateOid', this.templateOid)
          })
        })
            this.templateOid = res.data.tableDefineVO.oid;
            this.$emit("templateOid", this.templateOid);
          });
        });
      }
    },
    //表格数据
@@ -346,16 +385,16 @@
        codeClassifyOid: this.codeClassifyOid,
        page: this.page.currentPage,
        limit: this.page.pageSize,
      }).then(res => {
      }).then((res) => {
        this.page.total = res.data.total;
        this.data = res.data.data;
        this.tableData = res.data.data;
      })
      });
    },
    // 排序
    sortChange(val) {
      this.isLoading = true;
      let order = ""
      let order = "";
      if (val.order == "ascending") {
        order = "asc";
      } else {
@@ -368,12 +407,12 @@
        sort: val.prop,
        page: this.page.currentPage,
        limit: this.page.pageSize,
      }).then(res => {
      }).then((res) => {
        setTimeout(() => {
          this.data = res.data.data;
          this.isLoading = false;
        }, 100);
      })
      });
    },
    //分页刷新
    async onLoad(val) {
@@ -382,78 +421,79 @@
        codeClassifyOid: this.codeClassifyOid,
        page: val.currentPage,
        limit: val.pageSize,
      }).then(res => {
      }).then((res) => {
        this.data = res.data.data;
      })
      });
    },
    //多选
    handleSelectionChange(row) {
      if(this.row){
      if (this.row) {
        this.rowOid = row[0].oid;
      }else {
        this.rowOid=''
      } else {
        this.rowOid = "";
      }
      this.selectRow = row;
      row.forEach(item=>{
        this.parameter.ids.push(item.oid)
      })
      row.forEach((item) => {
        this.parameter.ids.push(item.oid);
      });
    },
    //编辑
    editHandler() {
      if (this.selectRow.length <= 0) {
        this.$message.warning('请选择一条数据')
        this.$message.warning("请选择一条数据");
      } else if (this.selectRow.length > 1) {
        this.$message.warning('只能选择一条数据')
      } else if (this.selectRow[0].lcstatus != 'Editing') {
        this.$message.warning('编码状态不是“编辑中”,不可编辑')
        this.$message.warning("只能选择一条数据");
      } else if (this.selectRow[0].lcstatus != "Editing") {
        this.$message.warning("编码状态不是“编辑中”,不可编辑");
      } else {
        this.editvisible = true
        this.editvisible = true;
      }
    },
    //高级查询按钮
    findHandler(){
      this.findvisible=true;
    findHandler() {
      this.findvisible = true;
    },
    // 高级查询
    echoContion(val) {
      FindData({templateOid:this.templateOid,
      FindData({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
        ...val
      }).then(res=>{
      })
        ...val,
      }).then((res) => {
        console.log(res);
      });
    },
    //相似项查询
    similarHandler(){
    similarHandler() {
      if (this.selectRow.length <= 0) {
        this.$message.warning('请选择一条数据')
        this.$message.warning("请选择一条数据");
      } else if (this.selectRow.length > 1) {
        this.$message.warning('只能选择一条数据')
      }  else {
        this.similarVisible=true;
        this.$message.warning("只能选择一条数据");
      } else {
        this.similarVisible = true;
      }

    },
    //数据更改
    DataChange(){
    DataChange() {
      if (this.selectRow.length <= 0) {
        this.$message.warning('请选择一条数据')
        this.$message.warning("请选择一条数据");
      } else if (this.selectRow.length > 1) {
        this.$message.warning('只能选择一条数据')
      } else if (this.selectRow[0].lcstatus != 'Released') {
        this.$message.warning('只有状态为已发布的数据才能进行数据更改')
        this.$message.warning("只能选择一条数据");
      } else if (this.selectRow[0].lcstatus != "Released") {
        this.$message.warning("只有状态为已发布的数据才能进行数据更改");
      } else {
        this.DataVisible = true
        this.DataVisible = true;
      }
    },
    //增加保存
    AddSumbit(val){
      this.addvisible=false
    AddSumbit() {
      this.addvisible = false;
    },
    EditSumbit(val){
      this.editvisible=false
    }
  }
}
    EditSumbit(val) {
      this.editvisible = false;
    },
  },
};
</script>

<style lang="scss" scoped>

 Source/UBCS-WEB/src/components/Master/MasterTree.vue

@@ -68,14 +68,14 @@
    }
  },
  created() {
    this.getTreeList()
    this.getTreeLists()

  },
  computed:{
   },
  methods:{
    //获取数据
    getTreeList(){
    getTreeLists(){
      getTreeList({'conditionMap[id]': 'wupin'}).then(res=>{
        this.Treedata=res.data
        this.ModifyProperties(this.Treedata, 'text', 'label');
@@ -146,14 +146,13 @@
    async nodeClick(data) {
      try {
        this.nodeClickList = data;
        this.tableHeadDataFateher=[]
        this.tableHeadFindData=[]
        await this.TableHeadRend(); // 先执行 TableHeadRend()
        this.TableRend(); // TableHeadRend() 方法完成后再执行 TableRend()
        this.$emit('nodeClick',this.templateOids)
        this.$emit("codeClassifyOid", this.nodeClickList.oid )
        // console.log('元数据',this.templateOids)
        // console.log('元数据cod',this.codeClassifyOid)
        // console.log('元数据nodeclick', this.nodeClickList.oid)
        // console.log(this.tableHeadFindData)
  
      } catch (error) {
        // 处理错误
        this.$message.error(error)

 Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue

@@ -26,6 +26,7 @@
</template>

<script>
import {defaultReferDataGrid} from '@/api/MasterData/master'
export default {
  name: "classifyTreeform.vue",
  props: ['loneTreeNewForm','flag'],
@@ -197,6 +198,9 @@
      masterSelectList:[]
    }
  },
  created() {

  },
  methods: {
    submit(form, done) {
      this.$message.success(JSON.stringify(form));
@@ -211,15 +215,22 @@
      console.log(this.dialogVisible)
    },
    MasterHandlerClick(){
      if(this.masterSelectList.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.masterSelectList.length<=0){
        this.$message.warning('请选择一条数据')
      }else {
        this.dialogVisible=false;
        console.log(this.masterInput)
        console.log(this.MasterSearchSelect)
      }
      defaultReferDataGrid({
        referType:'coderule',
        isMuti:'false',
        'conditionMap["lcstatus"]':'Released'
      }).then(res=>{
        console.log('---',res)
      })
      // if(this.masterSelectList.length>1){
      //   this.$message.warning('只能选择一条数据')
      // }else if(this.masterSelectList.length<=0){
      //   this.$message.warning('请选择一条数据')
      // }else {
      //   this.dialogVisible=false;
      //   console.log(this.masterInput)
      //   console.log(this.MasterSearchSelect)
      // }
    },
    masterSelect(row){
      console.log(row)
@@ -232,3 +243,6 @@
<style scoped>

</style>

<!--uiDataController/defaultReferDataGrid?referBo=coderule&isMuti=false&conditionMap%5B%22lcstatus%22%5D=Released-->
<!--uiDataController/defaultReferDataGrid?conditionMap%5B%22lcstatus%22%5D=Released&referBo=coderule&isMuti=false&_=1687831291212-->

 Source/UBCS-WEB/vue.config.js

@@ -29,13 +29,13 @@
        // target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        //   target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.1.63:37000',
        //target: 'http://192.168.3.7:37000',
        // target: 'http://dev.vci-tech.com:37000',
        //target: 'http://192.168.1.51:37000/',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        // target:'http://192.168.1.104:37000',
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',