From e4ad5c0aa7bd574c36be97eea4dd124dad9479ca Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 16:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/BatchImport/index.vue |   58 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 45efd2b..9b76f3d 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -13,7 +13,7 @@
       </li>
     </ul>
     <div
-      v-show="currentTypeObj[type]['upParams'] === 'classifyAttr' && this.type !== 'bulkEdit'"
+      v-show="currentTypeObj[type]['upParams'] === 'classifyAttr' && this.type !== 'bulkEdit'&& this.type !== 'groupCode'"
       class="radio_box"
     >
       <span>鍒嗙被鐨勮矾寰勪娇鐢ㄧ殑灞炴��:</span>
@@ -61,21 +61,23 @@
       >
     </el-upload>
     <template #footer>
-      <el-button
-        v-if="type !== 'bulkEdit'"
-        :loading="downloadLoading"
-        size="small"
-        type="primary"
-        @click="downloadTemplateFun"
-      >涓嬭浇瀵煎叆妯℃澘
-      </el-button>
-      <el-button v-if="type === 'bulkEdit'"
-                 :loading="downloadLoading"
-                 size="small"
-                 type="primary"
-                 @click="downloadTemplateFun"
-      >涓嬭浇缂栬緫妯℃澘
-      </el-button>
+      <div v-if="type !== 'groupCode'">
+        <el-button
+          v-if="type !== 'bulkEdit' "
+          :loading="downloadLoading"
+          size="small"
+          type="primary"
+          @click="downloadTemplateFun"
+        >涓嬭浇瀵煎叆妯℃澘
+        </el-button>
+        <el-button v-if="type === 'bulkEdit'"
+                   :loading="downloadLoading"
+                   size="small"
+                   type="primary"
+                   @click="downloadTemplateFun"
+        >涓嬭浇缂栬緫妯℃澘
+        </el-button>
+      </div>
       <el-button size="small" @click="dialogVisible = false">鍏抽棴</el-button>
     </template>
     <ShowImportData
@@ -167,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,
@@ -189,6 +191,10 @@
         return {
           codeClassifyOid: this.codeClassifyOid,
         };
+      }else if(this.type === 'groupCode'){
+        return {
+          codeClassifyOid: this.codeClassifyOid,
+        };
       }
     },
   },
@@ -248,6 +254,17 @@
           downloadTemplateFun: downloadBatchApplyCodeTemplate,
           upParams: "classifyAttr",
         },
+        groupCode: {
+          title: "闆嗗洟鐮佸鍏�",
+          tipList: [
+            "1.鏍囬甯︿簲瑙掓槦鐨勮〃绀哄叧閿睘鎬э紝甯︽槦鍙疯〃绀哄繀杈撻」",
+            "2.姣忔浠呰兘鏈�澶氬鍏�5000鏉℃暟鎹�(鍙�氳繃nacos杩涜閰嶇疆锛屾帹鑽�5000/娆″鍏�)锛屽鏋滃嚭閿欎細杩斿洖閿欒鐨勬暟鎹拰鍘熷洜锛屼絾鏄纭暟鎹彲浠ョ户缁繚瀛�",
+            "3.Excel绗竴琛屽拰绗簩琛屼緷娆′负浼佷笟缂栫爜鍜岄泦鍥㈢紪鐮侊紙蹇呭～锛�"
+          ],
+          action: "/api/ubcs-code/mdmEngineController/importGroupCode",
+          downloadTemplateFun: null,
+          upParams: "classifyAttr",
+        }
       },
       secDTOList: [],
     };
@@ -291,16 +308,9 @@
         return;
       }
       if (this.type === 'bulkEdit') {
-        this.tableHeadFindData.map(item => item.prop)
-          .forEach((prop, index) => {
-            this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
-          });
         downloadExcelBatchEdit({
           codeClassifyOid: this.codeClassifyOid,
-          'conditionMap[oid]': this.ids, ...this.exportArrTwo,
-          limit: -1
         }).then(res => {
-          // console.log('res',res)
           if (res) {
             func.downloadFileByBlobHandler(res);
             this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�')

--
Gitblit v1.10.0