Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

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

@@ -66,28 +66,31 @@
      this.dialogPush = this.visible;
    },
    //表头数据 用来渲染穿梭框
    tableHeadData:{
      handler(newval,oldval){
    tableHeadData: {
      handler(newval, oldval) {
        console.log(newval)
       if(newval){
         //excel表头数据转换
         this.tableHeadFindData=newval.map(obj => obj.label);
         this.tableHeadFindData.forEach((city, index) => {
           this.data.push({
             label: city,
             key: index,
           });
         });
         //excel表格数据转换
         this.option.column[0].children=newval.map(obj => {
           return {
             label: obj.label,
             prop: obj.prop
           }
         })
       }
        if (newval) {
          // 清空data数组
          this.data = [];
          // excel表头数据转换
          this.tableHeadFindData = newval.map(obj => obj.label);
          this.tableHeadFindData.forEach((city, index) => {
            this.data.push({
              label: city,
              key: index,
            });
          });
          console.log(this.data)
          // excel表格数据转换
          this.option.column[0].children = newval.map(obj => {
            return {
              label: obj.label,
              prop: obj.prop
            }
          })
        }
      }
},
    },
    tableData(){
      // 将值里面的true或false改变为是或否
      this.option.data = this.tableData.map(obj => {

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

@@ -397,12 +397,16 @@
                  cancelButtonText: '取消',
                  type: 'warning'
                }).then(() => {
                  this.userName = localStorage.getItem("username");
                  this.parameter.template = this.userName + "-发布" + "[物品]";
                  this.parameter.type = 'PUBLIC'
                  this.title = '流程审批'
                  this.visibleFlow = true;
                  this.onLoad()
                  const index = this.$route.query.id.indexOf('@');
                  const result = this.$route.query.id.substring(0, index);
                  console.log(this.$route.query)
                  const oid = this.selectRow.map(obj => obj.oid).join(",");
                  changeStatus({ oid: oid, btmname: result, lcStatus: 'Released' }).then(res => {
                    if(res.data.code == 200 ){
                      this.$message.success('发布成功')
                      this.onLoad()
                    }
                  });
                }).catch(() => {
                  this.$message({
                    type: 'info',