From 6aba675d2556170300a19010732e89a36737fc22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 23 Sep 2022 19:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=95=8C=E9=9D=A2=E7=9A=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/tools/ImportFileModal.vue     | 1 +
 jshERP-web/src/mixins/JeecgListMixin.js                 | 8 ++++----
 jshERP-web/src/views/material/modules/MaterialModal.vue | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jshERP-web/src/components/tools/ImportFileModal.vue b/jshERP-web/src/components/tools/ImportFileModal.vue
index 6d13cd51..611adddf 100644
--- a/jshERP-web/src/components/tools/ImportFileModal.vue
+++ b/jshERP-web/src/components/tools/ImportFileModal.vue
@@ -4,6 +4,7 @@
     :width="400"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    :maskClosable="false"
     @cancel="handleCancel"
     wrapClassName="ant-modal-cust-warp"
     style="top:25%;height: 45%;overflow-y: hidden">
diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index 4ff84278..0cf6e4d1 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -311,7 +311,7 @@ export const JeecgListMixin = {
     },
     /* 导入 */
     handleImportExcel(info){
-      this.loading = true
+      this.confirmLoading = true
       if (info.file.status !== 'uploading') {
         console.log(info.file, info.fileList);
       }
@@ -323,16 +323,16 @@ export const JeecgListMixin = {
           } else {
             this.$message.warning(info.file.response.data)
           }
-          this.loading = false
+          this.confirmLoading = false
           this.visible = false
           this.$emit('ok')
         } else {
           this.$message.error(`${info.file.name} ${info.file.response.data}.`);
-          this.loading = false
+          this.confirmLoading = false
         }
       } else if (info.file.status === 'error') {
         this.$message.error(`文件上传失败: ${info.file.msg} `)
-        this.loading = false
+        this.confirmLoading = false
       }
     },
     /* 图片预览 */
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index cbb15857..f0f610c7 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -391,8 +391,6 @@
     },
     created () {
       this.maxBarCodeAction();
-      this.loadTreeData();
-      this.loadUnitListData();
       this.loadParseMaterialProperty();
     },
     methods: {
@@ -436,6 +434,8 @@
           autoJumpNextInput('materialDetailModal')
         });
         this.initMaterialAttribute()
+        this.loadTreeData()
+        this.loadUnitListData()
         // 加载子表数据
         if (this.model.id) {
           //禁用多属性开关