From 279385239c826bf26512e3ef3437aba85aa11145 Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Wed, 29 Dec 2021 16:46:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/oneimport/addOrEdit.vue | 40 ++++++++++--------------
 src/views/system/oneimport/index.vue     | 29 +++++++----------
 2 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/src/views/system/oneimport/addOrEdit.vue b/src/views/system/oneimport/addOrEdit.vue
index 148d95a..f2aa13f 100644
--- a/src/views/system/oneimport/addOrEdit.vue
+++ b/src/views/system/oneimport/addOrEdit.vue
@@ -43,11 +43,6 @@
             <el-input-number v-model="formData['Script-StartRow']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-StartCol')">
-            <el-input-number v-model="formData['Script-StartCol']" placeholder="请输入" />
-          </el-form-item>
-        </el-col> -->
         <el-col :span="24">
           <el-form-item>
             <el-checkbox v-model="formData['Script-ClearTable']" :label="getColumnName('Script-ClearTable')" @change="changeCheckbox('ClearTable')" />
@@ -58,11 +53,11 @@
         </el-col>
         <el-col :span="24">
           <el-table 
-          style="width: 100%;margin-bottom:10px;"
+            style="width: 100%;margin-bottom:10px;"
             height="400px"
             border
 						size="mini"
-          :data="formData['Script-ScriptItem']">
+            :data="formData['Script-ScriptItem']">
 						<el-table-column :label="getColumnName('ScriptItem-TabMapCol')">
 							<template #default="scope">
 								<el-input v-model="scope.row['ScriptItem-TabMapCol']" clearable placeholder="请输入" />
@@ -152,7 +147,6 @@ export default {
       formData: {
         'Script-ScriptItem': []
       },
-      uomtypeArray: [], // 单位类型
       // 表单校验
       rules: {
         "Script-Script": [
@@ -186,7 +180,7 @@ export default {
 				}
 			})
     },
-    /** 新增字段 */
+    // 新增字段
     handleAddValst() {
       this.formData['Script-ScriptItem'].push({
         'ScriptItem-TabMapCol': undefined,
@@ -197,23 +191,23 @@ export default {
         'ScriptItem-DefaultValue': undefined
       })
     },
-    /** 删除字段 */
+    // 删除字段
     handleDeleteValst(index) {
       this.formData['Script-ScriptItem'].splice(index, 1)
     },
     // 取消
     cancel() {
-      this.$emit("setIsAddOrEdit", "");
+      this.$emit("setIsAddOrEdit", "")
     },
     // 确认
     submitForm() {
       this.$refs["formData"].validate((valid) => {
         if (valid) {
-          this.loading = true;
+          this.loading = true
           if (this.isAddOrEdit == "add") {
-            this.add();
+            this.add()
           } else {
-            this.edit();
+            this.edit()
           }
         }
       });
@@ -221,28 +215,28 @@ export default {
     // 新增
     add() {
       post('/admin/base/script/insertone',this.formData).then(({ code }) => {
-          this.loading = false;
+          this.loading = false
           if (code == 200) {
             this.msgSuccess("新增成功");
-            this.$emit("setIsAddOrEdit", false);
+            this.$emit("setIsAddOrEdit", false)
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 修改
     edit() {
       put('/admin/base/script/updateone',this.formData).then(({ code }) => {
-          this.loading = false;
+          this.loading = false
           if (code == 200) {
-            this.msgSuccess("修改成功");
-            this.$emit("setIsAddOrEdit", false);
+            this.msgSuccess("修改成功")
+            this.$emit("setIsAddOrEdit", false)
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
   },
 };
diff --git a/src/views/system/oneimport/index.vue b/src/views/system/oneimport/index.vue
index 2f3c7b7..a4750eb 100644
--- a/src/views/system/oneimport/index.vue
+++ b/src/views/system/oneimport/index.vue
@@ -120,23 +120,18 @@ export default {
       isAddOrEdit: "", // 控制是否显示添加/编辑界面
       item: {}, // 当前要操作的对象
       headers: [
-					"Script-PlantNr",
-          "Script-Script",
-          "Script-Bez",
-          "Script-ScriptTable",
-          // "Script-ScriptType",
-          // "Script-FilePath",
-          "Script-Separator",
-          "Script-UseHead",
-          "Script-ClearTable",
-          "Script-StartRow",
-          // "Script-StartCol",
-          "Script-AppendNewRecord",
-          "Script-UpdateRecord",
-          "Script-AppendAndUpdateRecord",
-          // "Script-CallSpecFunc",
-          // "Script-CallFunction",
-				], // 遍历表头
+        "Script-PlantNr",
+        "Script-Script",
+        "Script-Bez",
+        "Script-ScriptTable",
+        "Script-Separator",
+        "Script-UseHead",
+        "Script-ClearTable",
+        "Script-StartRow",
+        "Script-AppendNewRecord",
+        "Script-UpdateRecord",
+        "Script-AppendAndUpdateRecord"
+      ], // 遍历表头
       tableHeight: 0,
       isShowDialog: '',
     };

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 2/2] =?UTF-8?q?=E4=B8=80=E7=BB=B4=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=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,