From 22631f40df976ba6e1ba5c5cbb5ab15f92accb1f Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Wed, 29 Dec 2021 17:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=BB=B4=E8=A1=A8=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/oneimport/addOrEdit.vue |  2 +-
 src/views/system/oneimport/index.vue     | 17 +++++------------
 src/views/system/oneimport/upload.vue    |  9 ++++++---
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/views/system/oneimport/addOrEdit.vue b/src/views/system/oneimport/addOrEdit.vue
index f2aa13f..9b6e103 100644
--- a/src/views/system/oneimport/addOrEdit.vue
+++ b/src/views/system/oneimport/addOrEdit.vue
@@ -197,7 +197,7 @@ export default {
     },
     // 取消
     cancel() {
-      this.$emit("setIsAddOrEdit", "")
+      this.$emit("setIsAddOrEdit", "close")
     },
     // 确认
     submitForm() {
diff --git a/src/views/system/oneimport/index.vue b/src/views/system/oneimport/index.vue
index a4750eb..833dd57 100644
--- a/src/views/system/oneimport/index.vue
+++ b/src/views/system/oneimport/index.vue
@@ -91,17 +91,17 @@
       />
     </ContentContainer>
     <AddOrEdit
-      v-if="isAddOrEdit"
+      v-if="isAddOrEdit === 'add' || isAddOrEdit === 'edit'"
       :isAddOrEdit="isAddOrEdit"
       :item="item"
       @setIsAddOrEdit="setIsAddOrEdit"
     />
     <!-- 上传 -->
     <uploadTemplate
-      v-if="isShowDialog === 'upload'"
+      v-if="isAddOrEdit ==='upload'"
+      :isAddOrEdit="isAddOrEdit"
       :item="item"
-      v-model:isShowDialog="isShowDialog"
-      @editCallBack="completeCallBack" />
+      @setIsAddOrEdit="setIsAddOrEdit" />
   </div>
 </template>
 <script>
@@ -133,20 +133,13 @@ export default {
         "Script-AppendAndUpdateRecord"
       ], // 遍历表头
       tableHeight: 0,
-      isShowDialog: '',
     };
   },
   methods: {
     // 上传
 		handleUpload(item) {
       this.item = item;
-			this.isShowDialog = 'upload'
-		},
-		completeCallBack(data) {
-			this.isShowDialog = ''
-			if (data) {
-				this.handleUpdate(this.item.CustomerId, this.item.VersionId)
-			}
+      this.setIsAddOrEdit("upload");
 		},
     // 是否显示编辑/新增界面
     setIsAddOrEdit(value) {
diff --git a/src/views/system/oneimport/upload.vue b/src/views/system/oneimport/upload.vue
index 6987103..89d5ddc 100644
--- a/src/views/system/oneimport/upload.vue
+++ b/src/views/system/oneimport/upload.vue
@@ -21,7 +21,10 @@ export default {
 	props: {
 		item: {
 			default: null,
-		}
+		},
+    isAddOrEdit: {
+      default: "add",
+    },
 	},
 	data() {
 		return {
@@ -32,7 +35,7 @@ export default {
 	},
 	methods: {
 		cancel() { // 取消按钮
-			this.$emit('update:isShowDialog','')
+      this.$emit("setIsAddOrEdit", "close")
 		},
 		// 上传文件预览
     previewUpload(file) {
@@ -61,7 +64,7 @@ export default {
               message: '导入成功',
               type: 'success'
             })
-						this.$emit('update:isShowDialog','')
+            this.$emit("setIsAddOrEdit", "close")
           } else {
             this.$message({
               showClose: true,