From dbe1b807e2a0e4aaa37277b69c50dd69dc42dda2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 25 六月 2023 10:34:36 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/BatchImport/index.vue |   50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 3c674f4..3c65d7a 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -29,6 +29,7 @@
       :headers="uploadHeaders"
       :on-success="onSuccess"
       :show-file-list="false"
+      :on-change="uploadChange"
       :data="{
         codeClassifyOid: this.codeClassifyOid,
         classifyAttr: this.classifyAttr,
@@ -46,9 +47,14 @@
         :loading="downloadLoading"
         >涓嬭浇瀵煎叆妯℃澘</el-button
       >
-      <el-button size="small" @click="visible = false">鍏抽棴</el-button>
+      <el-button size="small" @click="dialogVisible = false">鍏抽棴</el-button>
     </template>
-    <ShowImportData :visible="showVisible" v-if="showVisible"></ShowImportData>
+    <ShowImportData
+      :visible.sync="showVisible"
+      v-if="dialogVisible"
+      :leftTree="leftTree"
+      :redisOid="redisOid"
+    ></ShowImportData>
   </el-dialog>
 </template>
 
@@ -57,6 +63,7 @@
 import {
   downloadHistoryImportTemplate,
   downloadErrorFile,
+  getHistoryLeftTree
 } from "../../api/batchImport/index";
 import { getToken } from "@/util/auth";
 export default {
@@ -86,6 +93,9 @@
       uploadParams: {},
       downloadLoading: false,
       showVisible: false,
+      leftTree: [],
+      redisOid:'',
+      pageLoading: null
     };
   },
   computed: {
@@ -139,19 +149,47 @@
         codeClassifyOid: this.codeClassifyOid,
       })
         .then((res) => {
-          this.downloadLoading = false;
           this.$utilFunc.downloadFileByBlob(res.data, "鍘嗗彶鏁版嵁瀵煎叆妯℃澘.xls");
+          this.downloadLoading = false;
         })
         .catch(() => {
           this.downloadLoading = false;
         });
     },
     onSuccess(res) {
-      if (res.code === 400) {
-        this.$message.error(`${res.msg}锛岃涓嬭浇閿欒淇℃伅杩涜鏌ョ湅锛乣);
+      let fileName = res.data.filePath.split('/').pop()
+      if (res.data.fileOid) {
+        this.$message.error("璇蜂笅杞介敊璇俊鎭枃浠惰繘琛屾煡鐪嬶紒");
+        downloadErrorFile({ uuid: res.data.fileOid }).then((res2) => {
+          this.$utilFunc.downloadFileByBlob(res2.data, fileName);
+        });
       }
-      downloadErrorFile({ uuid: res.data.fileOid });
+      if (res.data.redisUuid) {
+        this.redisOid = res.data.redisUuid
+        getHistoryLeftTree(res.data.redisUuid).then(res => {
+          this.leftTree = res.obj.map(item => {
+            return {
+              ...item.codeClassifyTemplateVO,
+              cloNamesList: item.cloNamesList
+            }
+          })
+          this.showVisible = true
+        })
+      }
     },
+    uploadChange(file) {
+      if (file.status === 'ready') {
+        this.pageLoading = this.$loading({
+          lock: true,
+          text: '鏂囦欢涓婁紶涓�',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+      }
+      if (file.status === 'success' || file.status === 'error') {
+        this.pageLoading.close()
+      }
+    }
   },
   watch: {
     visible: {

--
Gitblit v1.9.3