From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/BatchImport/index.vue |   59 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 1d9c488..e9fb97f 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -31,6 +31,7 @@
         left="30px"
       ></Divider>
       <FormTemplate
+        v-loading="!showCodeApply"
         style="margin-top: 30px"
         type="add"
         :selfColumnType="selfColumnType"
@@ -49,6 +50,7 @@
       :on-exceed="handleExceed"
       :headers="uploadHeaders"
       :on-success="onSuccess"
+      :on-error="onError"
       :show-file-list="false"
       :on-change="uploadChange"
       :data="upParams"
@@ -75,6 +77,9 @@
       :codeClassifyOid="codeClassifyOid"
       :redisOid="redisOid"
       :type="type"
+      :title="title"
+      :secDTOList="secDTOList"
+      :resetTable="resetTable"
     ></ShowImportData>
   </el-dialog>
 </template>
@@ -112,6 +117,7 @@
       type: String,
       default: "",
     },
+    resetTable: Function
   },
   computed: {
     uploadHeaders() {
@@ -134,28 +140,30 @@
       return this.currentTypeObj[this.type]["tipList"];
     },
     downloadTemplateApi() {
-      console.log(this.currentTypeObj[this.type], 'this.type');
+      console.log(this.currentTypeObj[this.type], "this.type");
       return this.currentTypeObj[this.type]["downloadTemplateFun"];
     },
     action() {
       return this.currentTypeObj[this.type]["action"];
     },
     upParams() {
-      if (this.type === "historyImport") {
+      if (this.type === "historyImport" || this.type === "batchApplyCode") {
         return {
           codeClassifyOid: this.codeClassifyOid,
           classifyAttr: this.classifyAttr,
         };
       } else if (this.type === "batchImportApply") {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.secDTOList = this.localSecVOList.map((item) => {
+          return {
+            secOid: item.oid,
+            secValue: this.codeApplyForm[item.oid],
+          };
+        });
         return {
           codeClassifyOid: this.codeClassifyOid,
-          secDTOList: this.secDTOList,
+          secDTOList: JSON.stringify(this.secDTOList),
           ...this.codeApplyForm,
-        };
-      } else if (this.type === "batchApplyCode") {
-        return {
-          codeClassifyOid: this.codeClassifyOid,
-          classifyAttr: this.classifyAttr,
         };
       }
     },
@@ -168,6 +176,7 @@
       leftTree: [],
       redisOid: "",
       pageLoading: null,
+      showCodeApply: true,
       currentTypeObj: {
         historyImport: {
           title: "鍘嗗彶鏁版嵁瀵煎叆",
@@ -204,18 +213,18 @@
           upParams: "classifyAttr",
         },
       },
+      secDTOList: [],
     };
   },
   methods: {
     async beforeUpload(file) {
-      console.log(file, 'file');
       const fileType = file.name.split(".").pop();
       if (fileType !== "xlsx" && fileType !== "xls") {
         // 涓婁紶鏍煎紡涓嶇鍚堣姹傦紝鎻愮ず閿欒淇℃伅骞跺彇娑堜笂浼�
         this.$message.error("鍙厑璁镐笂浼爔lsx銆亁ls鏍煎紡鐨勬枃浠�");
         return Promise.reject(false);
       }
-      if (this.type === "batchImportApply") {
+      if (this.type === "batchImportApply" && this.showCodeApply) {
         const flag = await this.$refs.CodeApply.validate();
         if (!flag) {
           return Promise.reject(false);
@@ -245,12 +254,12 @@
     },
     onSuccess(res) {
       if (Object.keys(res.data).length === 0) {
-        this.$message.success(this.title + '瀵煎叆鎴愬姛锛�')
-        this.dialogVisible = false
-        return
+        this.$message.success(this.title + "瀵煎叆鎴愬姛锛�");
+        this.dialogVisible = false;
+        return;
       }
-      let fileName = res.data.filePath.split("/").pop();
       if (res.data.fileOid) {
+        const fileName = res.data.filePath.split("/").pop();
         this.$message.error("璇蜂笅杞介敊璇俊鎭枃浠惰繘琛屾煡鐪嬶紒");
         downloadErrorFile({ uuid: res.data.fileOid }).then((res2) => {
           this.$utilFunc.downloadFileByBlob(res2.data, fileName);
@@ -258,19 +267,33 @@
       }
       if (res.data.redisUuid) {
         this.redisOid = res.data.redisUuid;
-        importDataShow(res.data.redisUuid).then((res) => {
-          this.leftTree = res.obj.map((item) => {
-            return {
+        importDataShow(res.data.redisUuid).then((res2) => {
+          this.leftTree = res2.data.data.map((item) => {
+            if (this.type === 'batchApplyCode') {
+              return {
+                cloNamesList: item.cloNamesList,
+                oid: item.codeTemplateOid,
+                codeClassifyOid: item.codeClassifyOid,
+                codeRuleOid: item.codeRuleOid,
+                name: item.codeRuleVO.name
+              }
+            } else {
+              return {
               ...item.codeClassifyTemplateVO,
               cloNamesList: item.cloNamesList,
+              codeClassifyOid: item.codeClassifyTemplateVO.codeclassifyoid
             };
+            }
           });
           this.showVisible = true;
         });
       }
     },
+    onError(err) {
+      console.log(err, "err");
+      this.pageLoading.close();
+    },
     uploadChange(file) {
-      console.log(file, 'file', file.status === "success");
       if (file.status === "success" || file.status === "error") {
         this.pageLoading.close();
       }

--
Gitblit v1.9.3