From 84e53f29d2c7eaceace2c7dd29d4f7125f211b76 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期三, 05 七月 2023 20:31:56 +0800
Subject: [PATCH] 生命周期的方法写完了，等着联调

---
 Source/UBCS-WEB/src/components/BatchImport/index.vue |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b517e50..b54d048 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -49,6 +49,7 @@
       :on-exceed="handleExceed"
       :headers="uploadHeaders"
       :on-success="onSuccess"
+      :on-error="onError"
       :show-file-list="false"
       :on-change="uploadChange"
       :data="upParams"
@@ -84,7 +85,7 @@
 import {
   downloadHistoryImportTemplate,
   downloadErrorFile,
-  getHistoryLeftTree,
+  importDataShow,
   downloadBatchImportApplyTemplate,
   downloadBatchApplyCodeTemplate,
 } from "../../api/batchImport/index";
@@ -147,9 +148,15 @@
           classifyAttr: this.classifyAttr,
         };
       } else if (this.type === "batchImportApply") {
+        const secDTOList = this.localSecVOList.map(item => {
+            return {
+              secOid: item.oid,
+              secValue: this.codeApplyForm[item.id]
+            }
+          })
         return {
           codeClassifyOid: this.codeClassifyOid,
-          secDTOList: this.secDTOList,
+          secDTOList: JSON.stringify(secDTOList),
           ...this.codeApplyForm,
         };
       } else if (this.type === "batchApplyCode") {
@@ -168,6 +175,7 @@
       leftTree: [],
       redisOid: "",
       pageLoading: null,
+      showCodeApply: false,
       currentTypeObj: {
         historyImport: {
           title: "鍘嗗彶鏁版嵁瀵煎叆",
@@ -214,11 +222,11 @@
         this.$message.error("鍙厑璁镐笂浼爔lsx銆亁ls鏍煎紡鐨勬枃浠�");
         return Promise.reject(false);
       }
-      if (this.type === "batchImportApply") {
-        const flag = await this.$refs.CodeApply.validate();
-        if (!flag) {
-          return Promise.reject(false);
-        }
+      if (this.type === "batchImportApply" && this.showCodeApply) {
+        // const flag = await this.$refs.CodeApply.validate();
+        // if (!flag) {
+        //   return Promise.reject(false);
+        // }
       }
       this.pageLoading = this.$loading({
         lock: true,
@@ -243,8 +251,13 @@
         });
     },
     onSuccess(res) {
-      let fileName = res.data.filePath.split("/").pop();
+      if (Object.keys(res.data).length === 0) {
+        this.$message.success(this.title + '瀵煎叆鎴愬姛锛�')
+        this.dialogVisible = false
+        return
+      }
       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);
@@ -252,8 +265,8 @@
       }
       if (res.data.redisUuid) {
         this.redisOid = res.data.redisUuid;
-        getHistoryLeftTree(res.data.redisUuid).then((res) => {
-          this.leftTree = res.obj.map((item) => {
+        importDataShow(res.data.redisUuid).then((res2) => {
+          this.leftTree = res2.data.data.map((item) => {
             return {
               ...item.codeClassifyTemplateVO,
               cloNamesList: item.cloNamesList,
@@ -263,6 +276,10 @@
         });
       }
     },
+    onError(err) {
+      console.log(err, 'err');
+      this.pageLoading.close();
+    },
     uploadChange(file) {
       if (file.status === "success" || file.status === "error") {
         this.pageLoading.close();

--
Gitblit v1.10.0