From f9c5d6c45ccefd2e4a9926284e25c04586ed4dd3 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 05 七月 2023 16:49:13 +0800
Subject: [PATCH] 批量导入

---
 Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue |   10 ++++++++++
 Source/UBCS-WEB/src/components/BatchImport/index.vue          |   20 ++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index 684801e..f4d3ed5 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -199,6 +199,7 @@
       type: String,
       default: "",
     },
+    type: String
   },
   computed: {
     dialogVisible: {
@@ -322,6 +323,15 @@
     filterText(val) {
       this.$refs.tree.filter(val);
     },
+    leftTree: {
+      immediate: true,
+      deep: true,
+      handler(arr) {
+        if (arr.length > 0 && this.type === 'batchImportApply') {
+          this.treeNodeClick(arr[0])
+        }
+      }
+    }
   },
 };
 </script>
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 2bbbf18..b794d20 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"
@@ -168,6 +169,7 @@
       leftTree: [],
       redisOid: "",
       pageLoading: null,
+      showCodeApply: false,
       currentTypeObj: {
         historyImport: {
           title: "鍘嗗彶鏁版嵁瀵煎叆",
@@ -208,18 +210,17 @@
   },
   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") {
-        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,
@@ -249,8 +250,8 @@
         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);
@@ -269,8 +270,11 @@
         });
       }
     },
+    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