From 9630f5f0c834496da20fca1e391dcdfef1021de1 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 26 七月 2023 17:38:01 +0800
Subject: [PATCH] 关闭弹窗

---
 Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue |    5 ++++-
 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue         |    2 +-
 Source/UBCS-WEB/src/components/BatchImport/index.vue          |    2 ++
 Source/UBCS-WEB/vue.config.js                                 |    5 -----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index 5268994..6d28988 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -237,6 +237,7 @@
       type: Array,
       default: () => ({}),
     },
+    resetTable: Function
   },
   computed: {
     dialogVisible: {
@@ -549,11 +550,13 @@
           },
         ];
       }
-        this.submitLoading = true
+      this.submitLoading = true
       submitHistoryimport(params).then((res) => {
         this.submitLoading = false
         if (res.data.code === 200) {
           this.$message.success(res.data.msg);
+          this.$parent.dialogVisible = false
+          this.resetTable()
         }
       });
     },
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 3b347ac..e9fb97f 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -79,6 +79,7 @@
       :type="type"
       :title="title"
       :secDTOList="secDTOList"
+      :resetTable="resetTable"
     ></ShowImportData>
   </el-dialog>
 </template>
@@ -116,6 +117,7 @@
       type: String,
       default: "",
     },
+    resetTable: Function
   },
   computed: {
     uploadHeaders() {
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index a3c4375..6685967 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -89,7 +89,7 @@
           </el-pagination>
         </div>
       </div>
-        <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
+        <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible" :resetTable="CrudRend">
         </BatchImport>
       </div>
       <div class="bottom">
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index b93b10b..0991057 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -28,13 +28,8 @@
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
         // target: 'http://localhost:37000',
         // target: 'http://192.168.1.51:37000',
-<<<<<<< HEAD
         // target: 'http://192.168.1.46:37000',
         target: 'http://dev.vci-tech.com:37000',
-=======
-        target: 'http://192.168.1.46:37000',
-        // target: 'http://dev.vci-tech.com:37000',
->>>>>>> edf6f5f6aedf7797861b088ad1058f75d2074ce1
         // target: 'http://192.168.1.51:37000/',
         // target: 'http://192.168.1.104:37000',
         // target: 'http://192.168.1.63:37000',

--
Gitblit v1.9.3