From e1beaf409dca5c236dd42bc9f3f3619eeb3e5ae2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 17 七月 2023 14:23:22 +0800
Subject: [PATCH] 代码整合

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

diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b54d048..3b347ac 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"
@@ -76,6 +77,8 @@
       :codeClassifyOid="codeClassifyOid"
       :redisOid="redisOid"
       :type="type"
+      :title="title"
+      :secDTOList="secDTOList"
     ></ShowImportData>
   </el-dialog>
 </template>
@@ -135,34 +138,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") {
-        const secDTOList = this.localSecVOList.map(item => {
-            return {
-              secOid: item.oid,
-              secValue: this.codeApplyForm[item.id]
-            }
-          })
+        // 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: JSON.stringify(secDTOList),
+          secDTOList: JSON.stringify(this.secDTOList),
           ...this.codeApplyForm,
-        };
-      } else if (this.type === "batchApplyCode") {
-        return {
-          codeClassifyOid: this.codeClassifyOid,
-          classifyAttr: this.classifyAttr,
         };
       }
     },
@@ -175,7 +174,7 @@
       leftTree: [],
       redisOid: "",
       pageLoading: null,
-      showCodeApply: false,
+      showCodeApply: true,
       currentTypeObj: {
         historyImport: {
           title: "鍘嗗彶鏁版嵁瀵煎叆",
@@ -212,6 +211,7 @@
           upParams: "classifyAttr",
         },
       },
+      secDTOList: [],
     };
   },
   methods: {
@@ -223,10 +223,10 @@
         return Promise.reject(false);
       }
       if (this.type === "batchImportApply" && this.showCodeApply) {
-        // const flag = await this.$refs.CodeApply.validate();
-        // if (!flag) {
-        //   return Promise.reject(false);
-        // }
+        const flag = await this.$refs.CodeApply.validate();
+        if (!flag) {
+          return Promise.reject(false);
+        }
       }
       this.pageLoading = this.$loading({
         lock: true,
@@ -252,9 +252,9 @@
     },
     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;
       }
       if (res.data.fileOid) {
         const fileName = res.data.filePath.split("/").pop();
@@ -267,17 +267,28 @@
         this.redisOid = res.data.redisUuid;
         importDataShow(res.data.redisUuid).then((res2) => {
           this.leftTree = res2.data.data.map((item) => {
-            return {
+            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');
+      console.log(err, "err");
       this.pageLoading.close();
     },
     uploadChange(file) {

--
Gitblit v1.9.3