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

 Source/UBCS-WEB/src/api/GetItem.js

@@ -56,6 +56,16 @@
    }
  })
}
//导出
export function exportCode(data){
  return request({
    url: 'api/ubcs-code/mdmEngineController/exportCode',
    method: 'post',
    params:{
      ...data
    }
  })
}
// 批量修改数据
export function batchUpdateCode(data) {
  return request({

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

@@ -77,7 +77,7 @@
<!--          高级查询-->
          <advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
<!--          导出-->
          <MasterTransfer :visible.sync="dialogPush" :tableHeadData="tableHeadFindData" :codeClassifyOid="codeClassifyOid" :tableData="tableData"></MasterTransfer>
          <MasterTransfer :visible.sync="dialogPush" :tableHeadData="tableHeadFindData" :codeClassifyOid="codeClassifyOid" :tableData="tableData" :selectRow="selectRow"></MasterTransfer>
<!--          相似项-->
          <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
                               :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>

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

@@ -1,8 +1,6 @@
<template>
<el-dialog :visible.sync="dialogPush" append-to-body  :close-on-click-modal="false"  @close="recoverPage" title="导出">
  <div style="margin-bottom: 10px">
    <el-button type="success"
               @click="handleExcel">下载 多级表头excel</el-button>
    <el-radio-group v-model="radio">
      <el-radio :label="0">选择</el-radio>
      <el-radio :label="1">全部</el-radio>
@@ -20,13 +18,18 @@
    :data="data">
  </el-transfer>
  </div>
  <div style="display: flex;justify-content: flex-end;">
    <el-button size="small" plain type="success" @click="handleExcel">确定</el-button>
    <el-button size="small" plain >取消</el-button>
  </div>
</el-dialog>
</template>

<script>
import {exportCode} from '@/api/GetItem'
export default {
name: "MasterTransfer",
  props:['visible','tableHeadData','codeClassifyOid','tableData'],
  props:['visible','tableHeadData','codeClassifyOid','tableData','selectRow'],
  data(){
    return {
      data: [],
@@ -41,7 +44,7 @@
      option:{
        title: '文档标题',
        column: [{
          label: '多级表头',
          label: '主数据',
          prop: 'header',
          children: []
        }],
@@ -106,11 +109,28 @@
      this.$emit('update:visible', false);
    },
    handleExcel(){
      this.$Export.excel({
        title: this.option.title,
        columns: this.option.column,
        data: this.option.data
      });
      // this.$Export.excel({
      //   title: this.option.title,
      //   columns: this.option.column,
      //   data: this.option.data
      // });
      if(this.radio === 0){
        if(this.selectRow.length<=0){
          this.$message.warning('请选择要导出的模板')
        }else {
          const selectList=[]
          let exportArr=[]
          this.selectRow.forEach(item=>{
            selectList.push(
             item.oid
            )
          })
          exportArr=this.value.map(index => this.tableHeadData[index].prop);
          exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':selectList,'attrIdIndexMap[index]':exportArr}).then(res=>{
            console.log(res)
          })
        }
      };
    },
  }
}

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

@@ -234,11 +234,14 @@
          <el-button size="small" type="primary" @click="addVisible=false">取消</el-button>
        </div>
      </el-dialog>

      <!--      参照配置-->
        <refer-config-form-dialog
          ref="referConfigFormDialog"
          @echoReferConfig="echoReferConfig"
        ></refer-config-form-dialog>
        <refer-config-dialog
          :display="referConfigVisble"
          @setReferConfigValue="setReferConfigValue"
          :referConfigOption="referConfigOption"
        ></refer-config-dialog>

    </div>
    <el-table :data="ProData"
              style="width: 100%"
@@ -356,6 +359,11 @@
  },
  data() {
    return {
      referConfigText:"",
      referConfigVisble:false,
      referConfigOption:{
        referConfig:'',
      },
      screenWidth: document.documentElement.clientWidth, // 屏幕宽度
      //当前单元格
      CurrentCell:'',
@@ -1332,7 +1340,8 @@
      //时间格式下拉框
      codeDataFlag:false,
    //  组合规单元格编辑回填
      componentRuleText:""
      componentRuleText:"",

    }
  },
  computed:{
@@ -1352,17 +1361,6 @@
    }
  },
  mounted() {
    window.addEventListener(
      'resize',
      () => {
        if(Math.abs(this.screenWidth - document.body.clientWidth) > 20) {
          this.$nextTick(() => {
            this.$refs.AddOriginPlace.refreshTable();
          })
        }
        this.screenWidth = document.body.clientWidth;
      }
    )
  },
  created() {
    this.option.column.forEach((item,index) => {
@@ -1569,12 +1567,20 @@
        this.rowOid = row.oid;
      this.CurrentCell=row;
      if(column.property == 'referConfig' ){
        this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
        this.$refs.referConfigFormDialog.onloadAttrData();
        this.referConfigVisble= true;
        this.referConfigOption = {
          referConfig: this.referConfigText || '',
        }
        if(this.CurrentCell.referConfig == ''){
          this.referConfigOption = {
            referConfig:'',
          }
        }
        console.log('--',this.referConfigOption)
        // this.$refs.referConfigFormDialog.onloadAttrData();
      }else if(column.property == 'classifyInvokeLevelName'){
        this.injectVisible=true;
      }else if(column.property == 'componentRule'){

        if(this.CurrentCell){
          this.CurrentCell.componentRule=this.componentRuleText;
        }
@@ -1599,7 +1605,6 @@
    },
    saveRows() {
      this.editingRows = null;
      console.log('1321')
    },
    // 枚举注入添加一行空数据
    addRow() {
@@ -1761,7 +1766,12 @@
    },
    //表格重置
    reset() {
      this.CrudRend()
      // this.CrudRend(
      this.referConfigVisble=true;
      this.referConfigOption = {
        referConfig: 'confing',
      }
      console.log(this.referConfigOption)
    },
    //同步到其他模板
    syncHandle() {
@@ -1813,6 +1823,15 @@
      }

    },
    setReferConfigValue(content){
      let submitFormJson = JSON.stringify(content);
      this.referConfigText=submitFormJson
      if(this.CurrentCell){
        this.$set(this.CurrentCell, 'referConfig', JSON.stringify(content))
      }else {
        this.$set(this.attrRow, 'referConfig', JSON.stringify(content))
      }
    },
    // 排序
    sortChange(val) {
      console.log(val)

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

@@ -914,7 +914,6 @@
    //业务类型接口
    btmdefaultRend(masterParameter){
      referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
        // console.log(res)
        this.BtmData=res.data.data.records
      })
    },
@@ -927,7 +926,6 @@
      this.crudOid=row.oid;
      this.crudLCStatus=row.lcStatus;
      this.crudArray=selection;
      console.log(selection,row)
      gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => {
        this.ProData = res.data.data;
      }).catch(res => {

 Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue

@@ -24,17 +24,23 @@
    components: {referConfigFormDialog, referConfigCrudDialog},
    data() {
        return {

        };
    },
    watch:{
      display:{
        handler(newval,oldval){
          console.log('newval',newval)
          console.log('oldval',oldval)
        }
      },
        referConfigOption (){
          console.log(111)
            if(func.notEmpty(this.referConfigOption.referConfig) || func.notEmpty(this.referConfigOption.referBtmId)){
                this.openReconfigInterFace(this.referConfigOption);
            }else{
                this.openTipsChooseOrCust();
            }
        }
        },
    },
    methods: {
        echoReferConfig(value) {
@@ -94,4 +100,4 @@

<style>

</style>
</style>

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

@@ -1015,7 +1015,6 @@
                                            }
                                        } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())) {//树形
                                            Map<String, Object> condtionMap = new HashMap<>();
                                            String parentFieldName=coderefersecSearchVO.getParentFieldName();

                                            //使用传入的业务类型查询表
                                            R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
@@ -1026,6 +1025,7 @@

                                            String oidFieldName = StringUtils.isNotBlank(coderefersecSearchVO.getParentUsedField())?coderefersecSearchVO.getParentUsedField():coderefersecSearchVO.getValueField();
                                            String parentValue =coderefersecSearchVO.getParentValue();
                                            String parentFieldName =StringUtils.isBlank(coderefersecSearchVO.getParentFieldName())?"":coderefersecSearchVO.getParentFieldName();
                                            List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();
                                            List<CodeShowFieldConfigVO> codeShowFieldConfigVOS=coderefersecSearchVO.getCodeShowFieldConfigVOS();
                                            if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
@@ -1072,7 +1072,7 @@
                                            //查询全部的信息
                                            buildSqlwhere+= " and oid  in (select oid from " +referTable + " START WITH " + coderefersecSearchVO.getParentFieldName() + " "+
                                            parentOidSql +
                                            " CONNECT BY PRIOR " + oidFieldName + " = " + coderefersecSearchVO.getParentFieldName() + ")";
                                            " CONNECT BY PRIOR " + oidFieldName + " = " + parentFieldName + ")";

                                            /*}else{
                                                if(StringUtils.isNotBlank(coderefersecSearchVO.getParentFieldName()) && StringUtils.isNotBlank(parentValue)){
@@ -1098,7 +1098,8 @@
                                                    String value = map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
                                                    String text = map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
                                                    String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
                                                    CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, "", description);
                                                    String pid = map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();
                                                    CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);
                                                    codeSectionValueVOList.add(sectionValueVO);
                                                });
                                            }

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml

@@ -21,6 +21,7 @@
mybatis-plus:
  configuration:
    map-underscore-to-camel-case: false
    call-setters-on-nulls: true


#顶层批量申请配置