bug修改提交

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

@@ -30,7 +30,7 @@
      <!--    重置-->
      <el-button size="small" @click="reset">重置</el-button>
      <!--    同步到其他模板-->
      <el-button size="small"@click="syncHandle">同步到其他模板</el-button>
      <el-button size="small" @click="syncHandle">同步到其他模板</el-button>
      <!--    编码申请预览-->
      <el-button size="small" @click="applicationHandle" style="">编码申请预览</el-button>
      <!--        验证规则-->
@@ -1215,14 +1215,10 @@
    },
    //业务类型保存
    busineAddHandle() {
      if (this.busineSelectList.length > 1) {
        this.$message.warning('请选择一条业务类型数据')
      } else {
        this.$set(this.busineAddList, 'classifytemplateoid', this.crudOid)
        this.$set(this.busineAddList, 'oid', '')
        this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
        this.addVisible = false;
      }
      this.$set(this.busineAddList, 'classifytemplateoid', this.crudOid)
      this.$set(this.busineAddList, 'oid', '')
      this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
      this.addVisible = false;
    },
    //业务类型单选
    businessSelect(selection, row) {
@@ -1363,7 +1359,14 @@
    },
    //分类注入保存
    injectAddHandle() {
      this.$set(this.attrRow, 'classifyInvokeLevel', this.injectOption);
      let data = {
        "注入类型": this.injectOption.type,
        "注入类型名称": this.injectOption.set,
        "层级设置": this.injectOption.injectNum,
        "是否可修改": this.injectOption.change
      }
      console.log(this.injectOption)      
      this.$set(this.attrRow, 'classifyInvokeLevel', data);
      this.injectVisible = false
    },
    //分类注入清空

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

@@ -84,9 +84,20 @@
            <el-button plain size="small" type="primary" @click="Enable">启用</el-button>
            <el-button plain size="small" type="primary" @click="Deactivate">停用</el-button>
              <el-button plain size="small" type="primary" @click="CloneBtn">从其它模板克隆</el-button>
              <div style="display: inline-block"> <el-input v-model="FindText" placeholder="请输入关键字按回车查询"
                                                            size="small"
                                                            @keyup.enter.native="EnterFind"></el-input></div>
              <!-- <div style="display: inline-block">
                <el-select v-model="searchTemplate.searchCondition" placeholder="请选择" class="search-condition">
                  <el-option
                    v-for="item in searchTemplateOptions"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value">
                  </el-option>
                </el-select>
                <el-input v-model="searchTemplate.findText" placeholder="请输入关键字按回车查询"
                  size="small"
                  @keyup.enter.native="EnterFind">
                </el-input>
              </div> -->
              <!--              查询对话框-->
           <el-dialog :visible.sync="FindFormVisible" append-to-body title="高级查询">
              <div>
@@ -95,7 +106,7 @@
              </div>
             <div style="padding-left: 80px;margin-top: 15px;">
               <template v-for="(value, key) in FindSelect">
                <div style="display: flex;justify-content: space-around;width: 85%;margin-bottom: 15px">
                <div style="display: flex; justify-content: space-around; width: 85%; margin-bottom: 15px">
                <el-select v-model="FindSelect[key]" placeholder="请选择" style="width: 28%"
                           @change="handleSelectChange(key)">
                  <el-option label="模板编号" value="0"></el-option>
@@ -236,6 +247,15 @@
      //     }
      //   ]
      // },
      // searchTemplateOptions: [
      //   {
      //     value: 'id',
      //     label: '模板编号'
      //   }, {
      //     value: 'name',
      //     label: '模板名称'
      //   }
      // ],
      addFlag:false,
      // 表格当前行id
      crudOid:"",
@@ -244,7 +264,11 @@
      //模板属性展示内容
      ProData: [],
      //回车键搜索绑定值
      FindText: "",
      searchTemplate: {
        searchCondition: 'id',
        findText: "",
      },
      
      //高级查询对话框
      FindFormVisible: false,
      //克隆模板对话框
@@ -832,20 +856,20 @@
        });
      })
    },
    //模板管理表格查询
    EnterFind() {
      if (this.FindText == "") {
    //模板管理表格查询,只有一条数据没必要做搜索
    /*nterFind() {
      if (this.findText == "") {
        gridCodeClassifyTemplate().then(res => {
          this.Formlist = res.data.data
        })
      } else {
        gridCodeClassifyTemplate().then(res => {
          this.Formlist = res.data.data.filter(item => {
            return item.name.includes(this.FindText)
            return item.name.includes(this.findText)
          })
        })
      }
    },
    },*/
    //克隆模板查询
    CloneEnterFind(){
      gridCodeClassifyTemplate().then(res => {
@@ -957,4 +981,5 @@
.my-messageboxs {
  width: 500px;
}

</style>

 Source/UBCS-WEB/src/page/login/userlogin.vue

@@ -155,7 +155,6 @@
    this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
      if (res.data.code == 200) {
        this.loginForm.tenantId = res.data.data[0].TENANT_ID;
        console.log(res.data.data);
        this.loginForm.region = res.data.data
      }
    })

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java

@@ -56,6 +56,4 @@





}

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

@@ -3352,7 +3352,13 @@
        //checkReferConfig(referConfigVO);
        //使用业务类型查询
        R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
        BtmTypeVO btmTypeVO = allAttributeByBtmId.getData();
        if (allAttributeByBtmId.getCode() != 200) {
            throw new ServiceException("业务类型feign接口调用错误！");
        }
        if (Func.isEmpty(allAttributeByBtmId.getData())) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        BtmTypeVO btmTypeVO = allAttributeByBtmId.getData();
        /**
         * 加上查询最新版次
         */