田源
2023-12-06 f74c2fd43150311e0aa8b1eb8eb715ac20ca21cf
上传代码
已修改3个文件
18 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/BatchImport/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Master/MasterTree.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/MasterData/items.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -169,7 +169,7 @@
      return this.currentTypeObj[this.type]["action"];
    },
    upParams() {
      if (this.type === "historyImport" || this.type === "batchApplyCode") {
      if (this.type === "historyImport" || this.type === "batchApplyCode" ) {
        return {
          codeClassifyOid: this.codeClassifyOid,
          classifyAttr: this.classifyAttr,
@@ -188,6 +188,10 @@
          ...this.codeApplyForm,
        };
      } else if (this.type === "bulkEdit") {
        return {
          codeClassifyOid: this.codeClassifyOid,
        };
      }else if(this.type === 'groupCode'){
        return {
          codeClassifyOid: this.codeClassifyOid,
        };
@@ -257,7 +261,9 @@
            "2.每次仅能最多导入5000条数据(可通过nacos进行配置,推荐5000/次导入),如果出错会返回错误的数据和原因,但是正确数据可以继续保存",
            "3.Excel第一行和第二行依次为企业编码和集团编码(必填)"
          ],
          action: "/api/ubcs-code/mdmEngineController/importGroupCode"
          action: "/api/ubcs-code/mdmEngineController/importGroupCode",
          downloadTemplateFun: null,
          upParams: "classifyAttr",
        }
      },
      secDTOList: [],
Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -31,6 +31,10 @@
      type: String,
      default: ''
    },
    isLoading:{
      type: Boolean,
      default:false
    }
  },
  data() {
    return {
@@ -47,7 +51,6 @@
      CloneTreeAvueform: {},
      loading: false,
      Treedata: [],
      isLoading: false,
      nodeClickList: "",
      Treeoption: {
        addBtn: false,
Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,5 +1,5 @@
<template>
  <el-container>
  <el-container v-loading="isLoading">
    <el-aside style="width:250px">
      <basic-container>
        <!--          树组件-->
@@ -17,6 +17,7 @@
          @tableHeadFindData="tableHeadFindDatas"
          @nodeClickList="nodeClickLists"
          @total="totals"
          :isLoading="isLoading"
        >
        </master-tree>
      </basic-container>