前端代码提交

 Source/UBCS-WEB/src/api/refer/table.js

@@ -1,9 +1,9 @@
import request from "@/router/axios";

export const getList = (params,page, limit, url) => {
export const getList = (params,page, limit, url, method) => {
  return request({
    url: url,
    method: 'get',
    method: method,
    params: {
      ...params,
      page,

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

@@ -198,9 +198,9 @@
        column: [
          {
            label: '主题库/分类编号',
            prop: 'btmtypeid',
            prop: 'id',
            labelWidth:135,
            readonly: true,
            disabled: true,
            rules: [{
              required: true,
              message: "主题库/分类编号",
@@ -210,7 +210,7 @@
          {
            label: '主题库/分类名称',
            prop: 'name',
            readonly: true,
            disabled: true,
            labelWidth:135,
            rules: [{
              required: true,
@@ -222,13 +222,13 @@
            label:"描述",
            prop:"description",
            labelWidth:128,
            readonly: true,
            disabled: true,
          },
          {
            label: '存储的业务类型',
            prop: 'btmtypename',
            prop: 'btmTypeName',
            labelWidth:128,
            readonly: true,
            disabled: true,
            rules: [{
              required: true,
              message: "存储的业务类型",
@@ -237,21 +237,21 @@
          },
          {
            label:"编码规则",
            prop:"coderuleoidName",
            prop:"coderuleOidName",
            labelWidth:128,
            readonly: true,
            disabled: true,
          },
          {
            label:"关键属性查询规则",
            prop:"codekeyattrrepeatoidName",
            prop:"codeKeyAttrRepeatOidName",
            labelWidth:128,
            readonly: true,
            disabled: true,
          },
          {
            label:"相似查询规则",
            prop:"codeResembleRuleOidName",
            labelWidth:128,
            readonly: true,
            disabled: true,
          },
        ]
      },
@@ -259,7 +259,7 @@
        column: [
          {
            label: '主题库/分类编号',
            prop: 'btmtypeid',
            prop: 'id',
            labelWidth:128,
            rules: [{
              required: true,
@@ -284,9 +284,10 @@
          },
          {
            label: '存储的业务类型',
            prop: 'btmtypename',
            prop: 'btmTypeName',
            labelWidth:128,
            focus:this.btmFoucus,
            readonly: true,
            rules: [{
              required: true,
              message: "存储的业务类型",
@@ -295,21 +296,24 @@
          },
          {
            label:"编码规则",
            prop:"coderuleoidName",
            prop:"coderuleOidName",
            labelWidth:128,
            focus:this.CodeFoucus
            focus:this.CodeFoucus,
            readonly: true,
          },
          {
            label:"关键属性查询规则",
            prop:"codekeyattrrepeatoidName",
            prop:"codeKeyAttrRepeatOidName",
            labelWidth:128,
            focus:this.Keyfouce
            focus:this.Keyfouce,
            readonly: true,
          },
          {
            label:"相似查询规则",
            prop:"codeResembleRuleOidName",
            labelWidth:128,
            focus: this.simFouce
            focus: this.simFouce,
            readonly: true,
          },

        ]
@@ -370,7 +374,7 @@
        this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
        this.$set(this.loneTreeNewForm,'coderuleOid',this.masterOid)
        this.$emit('MasterHandler',this.loneTreeNewForm)
        console.log(this.loneTreeNewForm)
        // console.log(this.loneTreeNewForm)
      }
    },
    //编码多选
@@ -378,7 +382,7 @@
      this.masterSelectList=row;
      this.masterName=row[0].name;
      this.masterOid=row[0].oid;
      console.log('oid',this.oid)
      // console.log('oid',this.oid)
    },
    //编码接口
    MasterdefaultRend(masterParameter){
@@ -510,10 +514,10 @@
      }else if(this.btmSelectList.length<=0){
        this.$message.warning('请选择一条数据')
      }else {
        this.SimidialogVisible=false;
        this.simSelectList=[]
        this.$set(this.loneTreeNewForm,'btmtypename',this.btmName)
        this.$set(this.loneTreeNewForm,'btmtypeoid',this.btmOid)
        this.BtmdialogVisible=false;
        this.btmSelectList=[]
        this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName)
        this.$set(this.loneTreeNewForm,'btmTypeOid',this.btmOid)
        this.$emit('MasterHandler',this.loneTreeNewForm)
      }
    },
@@ -544,7 +548,7 @@
    //业务类型接口
    btmdefaultRend(masterParameter){
      referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
        console.log(res)
        // console.log(res)
        this.BtmData=res.data.data.records
      })
    }

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

@@ -30,15 +30,18 @@
              <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-input v-model="TreeAddform.coderuleoidName" readonly autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
            </el-form-item>
            <el-form-item label="关键属性查询规则：" label-width="150px">
              <el-input v-model="TreeAddform.codekeyattrrepeatoidName" autocomplete="off" @focus="Keyfouce"
              <el-input v-model="TreeAddform.codekeyattrrepeatoidName" readonly autocomplete="off" @focus="Keyfouce"
                        style="width: 585px"></el-input>
            </el-form-item>
            <el-form-item label="相似查询规则：" label-width="150px">
              <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" @focus="simFouce"
                        style="width: 585px"></el-input>
              <el-input v-model="TreeAddform.codeResembleRuleOidName"
               autocomplete="off" 
               readonly
               @focus="simFouce"
               style="width: 585px"></el-input>
            </el-form-item>
          </el-form>
          <div slot="footer" class="dialog-footer">
@@ -507,19 +510,6 @@
          prop: 'tab2',
        }]
      },
      //模拟表单假数据
      Treeform: [
        {
          name: "测试1",
          sex: "男",
          value: 0
        },
        {
          name: "测试2",
          sex: "女",
          value: 1
        }
      ],
      //传递给子组件动态渲染的数据
      TreeList: {},
      codeClassifyOid: ""
@@ -782,7 +772,7 @@
    TreeAddHandler() {
      const data = this.TreeAddform
      this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid)
      console.log('data',data)
      // console.log('data',data)
      TreeSave(data).then(() => {
        this.$message({
          type: 'success',

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

@@ -50,6 +50,7 @@
        label: this.referConfig.textField || this.referConfig.options.textField || "name"
      },
      url: this.referConfig.options.url || '/api/ubcs-code/mdmEngineController/defaultReferDataGrid',
      method: this.referConfig.options.method || 'GET',
      tableDefinedUrl:'',//平台表格地址
      copyParam: ['referBo', 'textField', 'valueField', 'displayTable', 'whereSql',  'queryScheme'],
      query: {},
@@ -275,7 +276,7 @@
            query['conditionMap["' + key + '"]'] = this.query[key];
          }
        }
        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).then(res => {
          this.data = res.data.records;
          this.page.total=res.data.total
          this.loading = false;

 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/controller/MdmEngineController.java

@@ -510,12 +510,12 @@
     * @return 分类码值的内容
     */
    @GetMapping("/listCodeClassifyValueBySecOid")
    public DataGrid<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
    public IPage<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
        List<CodeClassifyValueVO> valueVOS = engineService.listCodeClassifyValueBySecOid(classifySecOid, parentClassifyValueOid);
        DataGrid<CodeClassifyValueVO> dataGrid = new DataGrid<>();
        dataGrid.setData(valueVOS);
        dataGrid.setTotal(valueVOS==null?0:valueVOS.size());
        return dataGrid;
        IPage<CodeClassifyValueVO> valueVOIPage = new Page<>();
        valueVOIPage.setRecords(valueVOS);
        valueVOIPage.setTotal(valueVOS==null?0:valueVOS.size());
        return valueVOIPage;
    }

    /**

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

@@ -241,7 +241,6 @@
     */
    CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid);


    /**
     * 使用编号的路径获取对象
     * @param clsfNamePath 分类名称的路径，一定要从最顶层节点开始，格式为xxx/yyy/zz 这样

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

@@ -117,9 +117,6 @@
        return codeClassifyMapper.selectObjs(wrapper);
    }




    @Override
    public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
        return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
@@ -200,7 +197,6 @@
     * @return  数据对象
     */
    private CodeClassify selectByOid(String oid){

        CodeClassify codeClassifyEntity = codeClassifyMapper.selectClassifyByKeyAndReseRel("'"+oid.trim()+"'").get(0);
        if(codeClassifyEntity == null || StringUtils.isBlank(codeClassifyEntity.getOid())){
            throw new ServiceException("dataOidNotExist");//根据主键id未查到相关数据