Merge remote-tracking branch 'origin/master'

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

@@ -242,7 +242,7 @@
        datetime: "datetime",
      },
      tableData: [],
      tableHeight: 'calc(100vh - 330px)',
      tableHeight: 'calc(100vh - 350px)',
      DataVisible: false,
      tableHeadData: [],
      items: {},
@@ -770,6 +770,7 @@
      this.addvisible = false;
      addSaveCode(val).then(res => {
        this.$nextTick(() => {
          this.$message.warning("保存成功");
          this.onLoad()
        })
      })
@@ -779,6 +780,7 @@
      this.editvisible = false;
      editSaveCode(val).then(res => {
        this.$nextTick(() => {
          this.$message.warning("保存成功");
          this.onLoad()
        })
      })
@@ -792,6 +794,7 @@
      upSaveCode(val).then(res => {
        console.log(res)
        this.$nextTick(() => {
          this.$message.warning("保存成功");
          this.onLoad()
        })
      })

 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue

@@ -327,6 +327,7 @@
        <template slot-scope="{ row }">
          <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text'  ||item.edit == 'refer' )"
                    ref="inputRef"
                    v-show="!AddCellFlag"
                    v-model="row[item.prop]"
                    autofocus @blur="saveRows"></el-input>
          <el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
@@ -481,6 +482,8 @@
  },
  data() {
    return {
      // 保存单元格状态
      AddCellFlag:false,
      //全屏编辑高度状态
      editStyleFlag: false,
      loading: false,
@@ -1740,7 +1743,7 @@
    addsHandler(event) {
      this.$refs.referAttrCrud.sort("orderNum");
      var ischeck = true;
      console.log(this.ProData)
      console.log('ProData',this.ProData)
      this.ProData.forEach((item, index) => {
        if ((item.requireFlag && item.requireFlag.toString() == 'true') && (item.readOnlyFlag && item.readOnlyFlag.toString() == 'true')) {
          this.$message.warning(item.name + "(" + item.id + ")必输的属性不能是只读");
@@ -1796,6 +1799,7 @@
          this.editOpenFlag = false;
          // 调用父组件修改按钮状态
          this.$emit('editCloseChildren')
          this.AddCellFlag=true;
        }).catch(() => {
          this.$message.warning('保存失败，请查看控制台输出！')
        });
@@ -1836,7 +1840,7 @@
          }
        } else if (column.property == 'componentRule') {
          if (this.CurrentCell) {
            this.CurrentCell.componentRule = this.componentRuleText;
            // this.CurrentCell.componentRule = this.componentRuleText;
          }
          this.isShowformulaEdit = true;
        } else if (column.property == 'enumString') {
@@ -2026,12 +2030,11 @@
    },
    //分类注入清空
    injectHandleReset() {
      // this.injectOption.classifyInvokeAttrName = "分类名称";
      // this.injectOption.classifyInvokeAttr = "name";
      // this.injectOption.classifyInvokeLevel = "min";
      // this.injectOption.classifyInvokeEditFlag = "true";
      // this.injectOption.classifyNumber = "0";
      this.$set(this.CurrentCell, 'classifyInvokeText', '')
      this.$set(this.CurrentCell, 'classifyInvokeAttr:', '')
      this.$set(this.CurrentCell, 'classitwInvokeAttrName', '')
      this.$set(this.CurrentCell, 'classifyInvokeEditFlag', 'false')
      this.$set(this.CurrentCell, 'classifyInvokeLevel', 'none')
      this.injectVisible = false;
    },
    // 分类注入取消
@@ -2102,6 +2105,7 @@
    updataFormlaContent(val) {
      if (this.CurrentCell) {
        this.$set(this.CurrentCell, 'componentRule', val.replace(/"/g, ''))
        this.componentRuleText= this.CurrentCell.componentRule
      } else {
        this.$set(this.attrRow, 'componentRule', val.replace(/"/g, ''))
      }
@@ -2123,6 +2127,7 @@
    //开启编辑
    editOpen() {
      this.editOpenFlag = true;
      this.AddCellFlag=false;
    },
    //定义一个关闭编辑的方法供子组件使用
    editClose() {

 Source/UBCS-WEB/src/components/flow-design/main.vue

@@ -8,13 +8,13 @@
               width="70%"
               custom-class="flow-design-dialog">
      <wf-design-base ref="bpmn"
                      style="height: 60vh;"
                      style="height: 60vh;width:100%"
                      :options="option"></wf-design-base>
    </el-dialog>
    <div v-else>
      <wf-design-base v-if="visible"
                      ref="bpmn"
                      style="height: 60vh;"
                      style="height: 50vh;width:100%"
                      :options="option"></wf-design-base>
    </div>
  </div>

 Source/UBCS-WEB/src/components/work/BusinessWork.vue

@@ -104,24 +104,26 @@
  },
  methods:{
    HandlerSave(){
      this.editingRow = null;
      //保存
      let datas=this.tableData.map(item=> {
        let newitem = {
          codeClassifyOid: item.codeclsfid,
          templateOid: this.templateId,
          editInProcess: true,
          data: item,
          oid:item.oid,
          ts:item.ts
        }
        return newitem;
      })
      batchUpdateCode(datas).then(res => {
        if(res.data.data.success){
          this.$message.success("修改成功");
        }
      })
      if(!validatenull(this.editingRow)) {
        this.editingRow = null;
        //保存
        let datas = this.tableData.map(item => {
          let newitem = {
            codeClassifyOid: item.codeclsfid,
            templateOid: this.templateId,
            editInProcess: true,
            data: item,
            oid: item.oid,
            ts: item.ts
          }
          return newitem;
        })
        batchUpdateCode(datas).then(res => {
          if (res.data.data.success) {
            this.$message.success("修改成功");
          }
        })
      }
    },
    //表格头渲染
    CrudHeaderRend() {

 Source/UBCS-WEB/src/views/system/user.vue

@@ -372,6 +372,7 @@
                  trigger: "click"
                }],
                span: 24,
                // value:'986926'
              },
              {
                label: "登录账号",
@@ -746,6 +747,9 @@
    }
  },
  methods: {
    beOpen(done,type){
      console.log(done,type)
    },
    //esc取消键操作
    handleClose(done) {
      this.$confirm('确认关闭？')
@@ -765,8 +769,6 @@
      }else {
        this.passVisible=true;
      }
      //console.log("selectionList",this.selectionList)
      //console.log(this.UserPwdstrategyVO)
    },
    // 设置密码策略，传递下拉框的id和多选框的id
    passhandle(){
@@ -807,6 +809,7 @@
      });
    },
    nodeClick(data) {
      console.log(data)
      this.treeDeptId = data.id;
      this.page.currentPage = 1;
      this.onLoad(this.page);
@@ -839,9 +842,12 @@
      });
    },
    rowSave(row, done, loading) {
      const prop = this.findObject(this.option.group, 'tenantId');
      console.log('2',prop)
      row.deptId = row.deptId.join(",");
      row.roleId = row.roleId.join(",");
      row.postId = row.postId.join(",");
      console.log('3',row)
      add(row).then(() => {
        this.initFlag = false;
        this.onLoad(this.page);
@@ -1025,6 +1031,7 @@
      })
    },
    beforeOpen(done, type) {
      console.log(type)
      if (["edit", "view"].includes(type)) {
        getUser(this.form.id).then(res => {
          this.form = res.data.data;
@@ -1039,6 +1046,8 @@
          }
        });
      }
      const prop = this.findObject(this.option.group, 'tenantId');
      console.log('1',prop)
      this.initFlag = true;
      done();
    },

 Source/UBCS-WEB/src/views/work/process/leave/handle.vue

@@ -10,14 +10,9 @@
            <el-tab-pane label="流程跟踪" name="second">
              <avue-crud :data="flowList" :option="option" ref="crud">
              </avue-crud>
              <el-card shadow="hover">
                <div slot="header">
                  <span>流程跟踪</span>
                </div>
                <el-row class="row-bg">
                  <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
                </el-row>
              </el-card>
              <el-row class="row-bg" style="margin-top: 20px">
                <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
              </el-row>
            </el-tab-pane>
          </el-tabs>
        </el-card>
@@ -233,4 +228,11 @@
::v-deep(.el-upload-dragger .el-icon-upload) {
  margin: 15px 0 16px;
}
.el-tab-pane{
  height: 75vh;
  overflow: auto;
}
.el-button{
  margin:0 10px 10px 0;
}
</style>

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

@@ -2448,8 +2448,8 @@
        if (conditionMap == null) {
            conditionMap = new HashMap<>();
        }
        //pageHelper.addDefaultDesc("createTime");
        pageHelper.addDefaultDesc("id");
        pageHelper.addDefaultDesc("createTime");
//        pageHelper.addDefaultDesc("id");
        if (!classifyService.checkHasChild(codeClassifyOid)) {
            conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, codeClassifyOid);
        } else {