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

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

@@ -445,7 +445,7 @@
          if (this.selectRow.length === 1 && item.lcstatus === "Disabled" && showMessage) {
            this.$message.warning('选择的数据中状态无需再执行当前操作');
            showMessage = false;
          }  else if (this.selectRow.length >1 && !hasEditing && showMessage) {
          }  else if (this.selectRow.length >1 && !hasEditing  && showMessage) {
            this.$message.warning('您选择的数据全部为【发布状态】才可以发起流程');
            showMessage = false;
          } else if (this.selectRow.length >= 1 && hasEditing && showMessage) {

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

@@ -33,14 +33,14 @@
            <el-form-item :label="this.TreeFlag ? '分类名称：' :'主题库名称：'" label-width="110px" style="display: inline-block" prop="name">
              <el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
            </el-form-item>
            <el-form-item label="存储的业务类型：" label-width="150px" v-if="TreeFlagCode==false" prop="btmTypeName">
              <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px" @focus="btmFoucus"></el-input>
            </el-form-item>
            <el-form-item label="描述：" label-width="150px">
              <el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
            </el-form-item>
            <el-form-item label="编码规则：" label-width="150px">
              <el-input v-model="TreeAddform.codeRuleOidName" autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
            </el-form-item>
            <el-form-item label="业务类型：" label-width="150px" v-if="TreeFlagCode==false">
              <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px" @focus="btmFoucus"></el-input>
            </el-form-item>
            <el-form-item label="关键属性查询规则：" label-width="150px">
                <el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" @focus="Keyfouce"
@@ -352,7 +352,7 @@
      masterSelectList:[],
      masterName:"",
      masterOid:"",
      //关键属性
      //关键属性btmTypeId
      KeydialogVisible:false,
      KeyName:"",
      KeyOid:"",
@@ -404,14 +404,6 @@
      ],
      SelectValue:"",
      SelectFInd:"",
      rules: {
        id: [
          { required: true, message: '请输入名称', trigger: 'blur' },
        ],
        name:[
          { required: true, message: '请输入编号', trigger: 'blur' },
        ]
      },
      addFlag:false,
      // 表格当前行id
      crudOid:"",
@@ -478,6 +470,17 @@
        codeRuleOidName: "",
        //存储的业务类型
        btmTypeName: ""
      },
      rules: {
        id: [
          { required: true, message: '请输入名称', trigger: 'blur' },
        ],
        name:[
          { required: true, message: '请输入编号', trigger: 'blur' },
        ],
        btmTypeName:[
          { required: true, message: '请选择业务类型', trigger: 'blur' },
        ]
      },
      //avue-tree数据，暂时没有作用，里面功能用element写了，只用avue的一个树组件不用内置表单了。
      TreeAvueform: {},
@@ -788,8 +791,8 @@
          'conditionMap[id]':this.SelectFInd
        }
        this.KeydefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
        this.SelectValue="";
        this.SelectFInd="";
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
@@ -909,7 +912,7 @@
    btmSelect(row){
      this.btmSelectList=row;
      this.btmName=row[0].name;
      this.btmOid=row[0].oid;
      this.btmOid=row[0].id;
    },
    //业务类型接口
    btmdefaultRend(masterParameter){
@@ -1225,6 +1228,7 @@
        });
      } else {
        this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
        console.log(this.nodeClickList)
        addSave(row).then(() => {
          this.$message({
            type: "success",

 Source/UBCS-WEB/vue.config.js

@@ -26,10 +26,10 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        target: 'http://localhost:37000',
        // 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',

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

@@ -132,6 +132,13 @@
        if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
            return R.fail("只有在顶层的主题库分类才能设置业务类型");
        }
        QueryWrapper<CodeClassify> classifyQueryWrapper = new QueryWrapper<>();
        classifyQueryWrapper.eq("parentCodeClassifyOid",codeClassifyEntity.getParentCodeClassifyOid());
        classifyQueryWrapper.eq("id",codeClassifyEntity.getId());
        List<CodeClassify> codeClassifyList = baseMapper.selectList(classifyQueryWrapper);
        if(codeClassifyList.size()!=0){
            return R.fail("当前分类下不允许分类编号重复，请检查！！！");
        }
        codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
        codeClassifyEntity.setCreateTime(new Date());
        codeClassifyEntity.setTs(new Date());