Merge remote-tracking branch 'origin/master'

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

@@ -441,7 +441,7 @@
            processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
              if (res.data.data.records && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + '-申请[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.processName = this.userName + '-申请[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'PUBLIC';
                this.parameter.code = this.templateOid;
                this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -492,7 +492,7 @@
            processTS({templateId: this.templateOid, buttonTypeKey: 'DISABLE'}).then(res => {
              if (res.data.records != [] && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + '-停用[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.processName = this.userName + '-停用[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'DISABLE';
                this.parameter.code = this.templateOid
                this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -544,7 +544,7 @@
              if (res.data.data.records && res.data.data.records.length != 0) {
                this.parameter = res.data.data.records[0]
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + '-启用[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.processName = this.userName + '-启用[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'Released';
                this.parameter.code = this.templateOid
                this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -602,7 +602,7 @@
            processTS({templateId: this.templateOid, buttonTypeKey: 'ROLLBACK'}).then(res => {
              if (res.data.records != [] && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + '-回收[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
                this.parameter.processName = this.userName + '-回收[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'TakeBack';
                this.parameter.code = this.templateOid
                this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;

 Source/UBCS-WEB/src/components/template/SetPersonnel.vue

@@ -10,7 +10,7 @@
                <el-input placeholder="流程模板" v-model="saveParam.modelName" disabled></el-input>
            </el-form-item>
            <el-form-item label="流程名称" prop="processName">
                <el-input placeholder="流程名称" v-model="saveParam.template">
                <el-input placeholder="流程名称" v-model="saveParam.processName">
                </el-input>
            </el-form-item>
            <el-form-item label="流程描述">
@@ -24,7 +24,7 @@
        </div>
        <el-form :model="collectParam" class="demo-form-inline" label-position="left" label-width="auto">
            <el-form-item :label="item.taskName" v-for="(item, index) in initFrom" :key="index">
                <el-select style="width: 80%;" filterable v-model="collectParam.flowTaskUsers[index]['userId']"
                <el-select style="width: 100%;" filterable v-model="collectParam.flowTaskUsers[index]['userId']"
                    :placeholder="item.taskName" @change="handleSelect($event, index)">
                    <el-option :label="key.userNames" :value="key.userId" v-for="(key, keyi) in typeName"
                        :key="keyi"></el-option>
@@ -57,21 +57,21 @@
        // vars：object格式，名字为vars，里面key键值，自己随意
        parameter: {
            typeof: Object,
            default: () => { }
        default: () => {
        }
        },
        parameterKeys: {
            typeof: Object,
            default: () => {
                return {
                    ids: 'ids',
                    flowTemplate: 'flowTemplate',
            processName: 'processName',
                    code: 'code',
                    type: 'type',
                    btmtype:'btmtype'
                }
            }
        }

    },
    watch: {
        visible(n) {
@@ -93,7 +93,7 @@
        },
      parameter:{
          handler(newval,oldval){
                  this.saveParam=newval;
          this.saveParam = Object.assign({processName:'',processDesc: ''},newval) ;
          },
        deep:true,
            immediate:true
@@ -111,8 +111,8 @@
            users: [],
            rules: {
                processName: [
                    { required: true, message: '模板名称不能为空', trigger: 'blur' },
                    { min: 1, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur' }
                    { required: true, message: '流程名称不能为空', trigger: 'blur' },
                    { min: 3, max: 50, message: '长度在 3 到 50 个字符', trigger: 'blur' }
                ]
            }
        }
@@ -123,16 +123,6 @@
  created() {
  },
  methods: {
        setSaveParam() {
            return {
                processName: this.parameter[this.parameterKeys.flowTemplate],
                topName: this.title,
                ids: this.parameter[this.parameterKeys.ids],
                oids: this.parameter[this.parameterKeys.ids],
                btmtype:this.parameter[this.parameterKeys.btmtype],
                vars:this.parameter['vars']
            }
        },
        userIndex(arr1) {
            return this.initFrom.findIndex(i => i.taskId === arr1)
        },
@@ -145,10 +135,7 @@
                let flowTaskUsers = response.data.data.user
                this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
                this.users = response.data.data.user
                console.log(this.collectParam)
                console.log('this.saveParam.before',this.saveParam)
                this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
                console.log('this.saveParam',this.saveParam)
                if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
            }
        },
@@ -171,12 +158,9 @@
                confirmButtonText: '确定',
                cancelButtonText: '取消',
            }).then(async ({ value }) => {
                console.log(this.users)
                this.collectParam.flowTaskUsers = this.users
                this.collectParam = { ...this.collectParam, name: value }
                console.log(this.collectParam)
                const response = await personnelCollect(this.collectParam)
                console.log(response)
                if (response.status === 200) {
                    this.$nextTick(() => {
                        this.apiInit()

 Source/UBCS-WEB/src/components/transfer/transfer-panel.vue

@@ -228,4 +228,3 @@
    }
};
</script>
  

 Source/UBCS-WEB/src/views/wel/index.vue

@@ -95,26 +95,35 @@
          delBtn: false,
          column: [{
            label: '任务名称',
            prop: 'name',
            prop: 'taskName',
            sortable:true,
            headerAlign:'center',
            align:'left',
            html: true,
            formatter: (val) => {
              return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.taskName + '</a>'
              return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
            }
          },
            {
              label: '上一步处理时间',
              prop: 'createTime'
            },
            {
              label: '描述',
              prop: 'description'
              sortable:true,
              prop: 'historyActivityDurationTime'
            },
            {
              label: '上一步操作人',
              prop: 'creator_name'
              sortable:true,
              prop: 'historyActivityAssigneName'
            },
            {
              label: '流程描述',
              prop: 'processDesc',
              formatter: (val) => {
                return  val.variables.processDesc
              }
            },
            {
              label: '所属流程模板',
              sortable:true,
              prop: 'categoryName'
            }
          ]

 Source/UBCS-WEB/src/views/work/claim.vue

@@ -80,44 +80,42 @@
          dialogWidth: 900,
          menuWidth: 200,
          dialogClickModal: false,
          column: [
            {
              label: "流程分类",
              type: "select",
              row: true,
              dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              dataType: "number",
              slot: true,
              prop: "category",
              search: true,
              hide: true,
              width: 100,
            },
            {
          align: 'center',
          column: [{
              label: '流程名称',
              prop: 'processDefinitionName',
            prop: 'processName',
              search: true,
            },
            {
            headerAlign:'center',
            align:'left',
            sortable:true,
            formatter: (val) => {
              return val.variables.processName
            }
          }, {
            label: '发起人',
            prop: 'createUser',
            sortable:true,
            formatter: (val) => {
              return val.variables.createUser
            }
          }, {
            label: '发起时间',
            sortable:true,
            prop: 'createTime',
          }, {
              label: '当前步骤',
              prop: 'taskName',
            },
            {
              label: '流程版本',
              prop: 'processDefinitionVersion',
              slot: true,
              width: 80,
            },
            {
              label: '申请时间',
              prop: 'createTime',
              width: 165,
            },
          ]
          },{
            label: '所属流程模板',
            sortable:true,
            prop: 'categoryName'
          }, {
            label: '流程描述',
            prop: 'processDesc',
            formatter: (val) => {
              return val.variables.processDesc
            }
          }]
        },
        data: []
      };

 Source/UBCS-WEB/src/views/work/done.vue

@@ -74,44 +74,43 @@
          dialogWidth: 900,
          menuWidth: 150,
          dialogClickModal: false,
          column: [
            {
              label: "流程分类",
              type: "select",
              row: true,
              dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              dataType: "number",
              slot: true,
              prop: "category",
              search: true,
              hide: true,
              width: 100,
            },
            {
          align: 'center',
          column: [{
              label: '流程名称',
              prop: 'processDefinitionName',
            prop: 'processName',
              search: true,
            },
            {
              label: '当前步骤',
              prop: 'taskName',
            },
            {
              label: '流程版本',
              prop: 'processDefinitionVersion',
              slot: true,
              width: 80,
            },
            {
              label: '申请时间',
            headerAlign: 'center',
            align: 'left',
            sortable: true,
            formatter: (val) => {
              return val.variables.processName
            }
          }, {
            label: '发起人',
            prop: 'createUser',
            sortable: true,
            formatter: (val) => {
              return val.variables.createUser
            }
          }, {
            label: '发起时间',
            sortable: true,
              prop: 'createTime',
              width: 165,
            },
          ]
          }, {
            label: '完成时间',
            sortable: true,
            prop: 'endTime',
          }, {
            label: '所属流程模板',
            sortable: true,
            prop: 'categoryName'
          }, {
            label: '流程启动时描述',
            prop: 'processDesc',
            formatter: (val) => {
              return val.variables.processDesc
            }
          }]
        },
        data: []
      };

 Source/UBCS-WEB/src/views/work/send.vue

@@ -78,50 +78,40 @@
          dialogWidth: 900,
          menuWidth: 150,
          dialogClickModal: false,
          column: [
            {
              label: "流程分类",
              type: "select",
              row: true,
              dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              dataType: "number",
              slot: true,
              prop: "category",
              search: true,
              hide: true,
              width: 100,
            },
            {
          align: 'center',
          column: [{
              label: '流程名称',
              prop: 'processDefinitionName',
            prop: 'processName',
              search: true,
            },
            {
              label: '当前步骤',
              prop: 'taskName',
            },
            {
              label: '流程版本',
              prop: 'processDefinitionVersion',
              slot: true,
              width: 80,
            },
            {
            headerAlign:'center',
            align:'left',
            sortable:true,
            formatter: (val) => {
              return val.variables.processName
            }
          },  {
              label: '流程进度',
              prop: 'processIsFinished',
              slot: true,
              width: 80,
            },
            {
              label: '申请时间',
          }, {
            label: '当前步骤',
            prop: 'taskName',
          }, {
            label: '发起时间',
            sortable:true,
              prop: 'createTime',
              width: 165,
            },
          ]
          },{
            label: '所属流程模板',
            sortable:true,
            prop: 'categoryName'
          }, {
            label: '流程描述',
            prop: 'processDesc',
            formatter: (val) => {
              return val.variables.processDesc
            }
          }]
        },
        data: []
      };

 Source/UBCS-WEB/src/views/work/todo.vue

@@ -80,44 +80,39 @@
          dialogWidth: 900,
          menuWidth: 200,
          dialogClickModal: false,
          column: [
            {
              label: "流程分类",
              type: "select",
              row: true,
              dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              dataType: "number",
              slot: true,
              prop: "category",
              search: true,
              hide: true,
              width: 100,
            },
            {
          align: 'center',
          column: [{
              label: '流程名称',
              prop: 'processDefinitionName',
            prop: 'processName',
              search: true,
            },
            {
              label: '当前步骤',
              prop: 'taskName',
            },
            {
              label: '流程版本',
              prop: 'processDefinitionVersion',
              slot: true,
              width: 80,
            },
            {
              label: '申请时间',
            headerAlign:'center',
            align:'left',
            sortable:true,
            formatter: (val) => {
              return val.variables.processName
            }
          }, {
            label: '发起人',
            prop: 'createUser',
            sortable:true,
            formatter: (val) => {
              return val.variables.createUser
            }
          }, {
            label: '发起时间',
            sortable:true,
              prop: 'createTime',
              width: 165,
            },
          ]
          }, {
            label: '所属流程模板',
            sortable:true,
            prop: 'categoryName'
          }, {
            label: '流程描述',
            prop: 'processDesc',
            formatter: (val) => {
              return val.variables.processDesc
            }
          }]
        },
        data: []
      };

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

@@ -649,11 +649,10 @@
            }
            wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
        });
        conditionMap.put("CODETEMPLATEOID","'" + orderDTO.getTemplateOid() + "'");

        //没有限制分类，但是一个模板只可能在一个业务类型里面，所以直接查询这个业务类型即可

        if (!CollectionUtils.isEmpty(conditionMap)) {
            conditionMap.put("CODETEMPLATEOID","'" + orderDTO.getTemplateOid() + "'");
//            final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
            R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmTypeId()));
//                String referTable = VciBaseUtil.getTableName(referVO.getReferType());
@@ -805,10 +804,6 @@
        } else {
            fullPath = classifyFullInfo.getCurrentClassifyVO().getOid();
        }

//        BeanUtils.
//        BeanUtils.copyProperties(orderDTO.getData(),cbo);
//        cbo.setMaterialtype(Short.valueOf("1001"));
        orderDTO.getData().forEach((key, value) -> {
            if (!edit || (!checkUnAttrUnEdit(key) &&
                !VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
@@ -819,9 +814,6 @@
                }
            }
        });
//        BeanMap beanMap = BeanMap.create(cbo);
//        beanMap.putAll(orderDTO.getData());

        try {
            Map<String, String> data = new HashMap<>();
            data.put(cbo.getData().containsKey(CODE_CLASSIFY_OID_FIELD.toUpperCase())?CODE_CLASSIFY_OID_FIELD.toUpperCase():CODE_CLASSIFY_OID_FIELD, classifyFullInfo.getCurrentClassifyVO().getOid());