From 5a3dd615ebbc9919330ac375d4798a73f64fe89c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 26 七月 2023 17:41:06 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/BatchImport/index.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b951e11..e9fb97f 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"
@@ -78,6 +79,7 @@
       :type="type"
       :title="title"
       :secDTOList="secDTOList"
+      :resetTable="resetTable"
     ></ShowImportData>
   </el-dialog>
 </template>
@@ -115,6 +117,7 @@
       type: String,
       default: "",
     },
+    resetTable: Function
   },
   computed: {
     uploadHeaders() {
@@ -154,7 +157,7 @@
         this.secDTOList = this.localSecVOList.map((item) => {
           return {
             secOid: item.oid,
-            secValue: this.codeApplyForm[item.id],
+            secValue: this.codeApplyForm[item.oid],
           };
         });
         return {
@@ -173,7 +176,7 @@
       leftTree: [],
       redisOid: "",
       pageLoading: null,
-      showCodeApply: false,
+      showCodeApply: true,
       currentTypeObj: {
         historyImport: {
           title: "鍘嗗彶鏁版嵁瀵煎叆",

--
Gitblit v1.9.3