Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/App.vue

@@ -29,7 +29,10 @@
  margin-bottom: 0;
}
.avue-dialog .el-dialog__body {
  margin-bottom: 10px
  margin-bottom: 40px
}
.avue-dialog__footer{
  z-index: 1000;
}
.avue-crud__pagination {
  padding: 10px 0 2px 20px;

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

@@ -1,9 +1,11 @@
<template>
  <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
             :option="Treeoption"
             style="height: calc(100vh - 150px);"
             @node-click=" nodeClick"
  ></avue-tree>
  <div style="overflow: auto; height: calc(100vh - 150px);">
    <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" @node-click="nodeClick" style="width: fit-content;">
      <template slot-scope="{ node }">
        <span style="display: inline-block;">{{ node.label }}</span>
      </template>
    </avue-tree>
  </div>
</template>

<script>

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

@@ -4,7 +4,7 @@
    <!--    左侧菜单-->
    <el-aside>
      <basic-container style="overflow:hidden;">
        <div>
        <div style="overflow: hidden">
          <div>
            <div style="display: flex; flex-direction: column;">
              <div style="display: flex;">
@@ -74,7 +74,7 @@
                     :defaultExpandAll="false"
                     :option="Treeoption"
                     class="classifyTree"
                     style="height: calc(100vh - 230px);"
                     style="height: calc(100vh - 230px)"
                     @node-click="nodeClick"
          >
          </avue-tree>
@@ -143,7 +143,7 @@
                        <avue-tree ref="cloneTree" v-model="TreeAvueform" v-loading="loading" :data="Treedata"
                                   :defaultExpandAll="false"
                                   :option="Treeoption"
                                   style="height: 50.5vh;margin-right: 10px"
                                   style="height: 50.5vh;margin-right: 10px;width: 300px"
                                   @node-click="ClonenodeClick"
                        >
                        </avue-tree>

 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue

@@ -5,8 +5,8 @@
               :visible.sync="visible"
               top="0"
               class="avue-dialog avue-dialog--top"
               :width="options.width|| '80%'">

               :width="options.width|| '80%'"
               :height="options.height|| 'auto'">
      <avue-crud :option="option"
                 :table-loading="loading"
                 :data="data"
@@ -247,7 +247,7 @@
      this.selectionList.forEach((item,_index) =>{
        if(isMutiValue){
          var valueFieldArray = _that.props.value.split(",");
          valueFieldArray.forEach((_itemField,_indexFiel)=>{
          valueFieldArray.forEach((_itemField,_indexField)=>{
            value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
          })
        }else {
@@ -313,14 +313,15 @@
          }
        }
        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).then(res => {
          let data=[]
          if(res.data.records){
            this.data = res.data.records
            data = res.data.records
            this.page.total=res.data.total ;
          }else{
            this.data = res.data.data.records;
            data = res.data.data.records;
            this.page.total=res.data.data.total;
          }
          this.data=this.data.map(item => {
          this.data=data.map(item => {
            item.data=item.data || {}
            return {
              ...item

 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue

@@ -5,7 +5,8 @@
               :visible.sync="visible"
               top="0"
               class="avue-dialog avue-dialog--top"
               :width="options.width|| '80%'">
               :width="options.width|| '80%'"
               :height="options.height|| 'auto'">
      <avue-crud :option="option"
                 :table-loading="loading"
                 :data="data"
@@ -305,7 +306,7 @@
      this.selectionList.forEach((item,_index) =>{
        if(isMutiValue){
          var valueFieldArray = _that.props.value.split(",");
          valueFieldArray.forEach((_itemField,_indexFiel)=>{
          valueFieldArray.forEach((_itemField,_indexField)=>{
            value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
          })
        }else {
@@ -371,14 +372,15 @@
          }
        }
        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
          let data=[]
          if(res.data.records){
            this.data = res.data.records
            data = res.data.records
            this.page.total=res.data.total ;
          }else{
            this.data = res.data.data.records;
            data = res.data.data.records;
            this.page.total=res.data.data.total;
          }
          this.data=this.data.map(item => {
          this.data=data.map(item => {
            item.data=item.data || {}
            return {
              ...item

 Source/UBCS-WEB/src/views/MasterData/items.vue

@@ -94,10 +94,5 @@
</script>

<style scoped>
.el-aside {
  height: calc(100% - 30px);
}
.el-main {
  height: calc(100% - 30px);
}

</style>

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java

@@ -83,7 +83,7 @@
    private StringBuffer tempStr= new StringBuffer();//可变码段的值;
    private  String  levelRes="";
    private String[] specialSecVals = new String[0];
    private RMDataTransmitObject transmitForRMData = null;
    private RMDataTransmitObject transmitForRMData = new RMDataTransmitObject();
    private CodeRuleVO codeRuleVO=null;
    /**
     * 存储属性和值的Map,key,用于默认值的显示
@@ -167,8 +167,10 @@
                }
            }
        }else{
            VCIOptionPane.showMessage(this,r.getMsg());
        }
            if(!r.getMsg().equals("当前主题库分类，以及它的所有的上级分类都没有设置编码规则")){
                VCIOptionPane.showMessage(this,r.getMsg());
                }
            }
        /**加载规则对应的码段信息**/
        if(codeRuleVO!=null){
            List<CodeBasicSecVO> codeBasicSecVOList=codeRuleVO.getSecVOList();

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java

@@ -161,7 +161,9 @@
                Object applyGroupCodeData = JSONObject.toJSON(applyMap);
                R applyResult= HttpUtil.sendPost(url+"/DockingPreApplyCode/applyGroupCode",applyGroupCodeData.toString(),headerMap);
                if(!applyResult.isSuccess()){
                    VCIOptionPane.showMessage(this.owner, r.getMsg());
                    VCIOptionPane.showMessage(this.owner, "集团码申请失败，"+r.getMsg());
                }else{
                    VCIOptionPane.showMessage(this.owner, "保存数据成功，等待集团码申请！");
                }
            }
        }else {

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

@@ -2867,7 +2867,7 @@
        } else {
            if (CollectionUtils.isEmpty(fullInfoBO.getParentClassifyVOs())) {
                //说明已经是最高层级,
                throw new VciBaseException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
                throw new ServiceException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
            }
            List<CodeClassifyVO> parentClassifyVOList = fullInfoBO.getParentClassifyVOs().stream().sorted((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel())).collect(Collectors.toList());
            //从最高的level开始获取
@@ -2879,7 +2879,7 @@
                }
            }
            if (StringUtils.isBlank(codeRuleOid)) {
                throw new VciBaseException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
                throw new ServiceException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
            }
        }
        return ruleService.getObjectHasSecByOid(codeRuleOid);