From 441700673a26144cfcf93b87e0bdcdb06958dabe Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 25 十一月 2024 16:06:23 +0800
Subject: [PATCH] 1. 修复问题新增对话框中,无法正确上传图片的问题 2. 工地施工阶段可选项更新

---
 src/views/fysp/check/components/CompProblemAddOrUpd.vue |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/views/fysp/check/components/CompProblemAddOrUpd.vue b/src/views/fysp/check/components/CompProblemAddOrUpd.vue
index f883acd..f6570c1 100644
--- a/src/views/fysp/check/components/CompProblemAddOrUpd.vue
+++ b/src/views/fysp/check/components/CompProblemAddOrUpd.vue
@@ -167,9 +167,7 @@
             <el-button type="primary" @click="onSubmit" v-show="!readonly"
               >淇濆瓨</el-button
             >
-            <el-button @click="onCancel" v-show="!readonly"
-              >鍙栨秷</el-button
-            >
+            <el-button @click="onCancel" v-show="!readonly">鍙栨秷</el-button>
           </el-form-item>
         </el-form>
         <ArbitraryPhoto
@@ -214,7 +212,6 @@
   </CompGenericWrapper>
 </template>
 <script>
-import CompGenericWrapper from './CompGenericWrapper.vue';
 import ArbitraryPhoto from './ArbitraryPhoto.vue';
 import CompLedgerPhoto from './CompLedgerPhoto.vue';
 import CompDevicePhoto from './CompDevicePhoto.vue';
@@ -231,8 +228,7 @@
   components: {
     ArbitraryPhoto,
     CompDevicePhoto,
-    CompLedgerPhoto,
-    CompGenericWrapper
+    CompLedgerPhoto
   },
   props: {
     readonly: {
@@ -588,7 +584,8 @@
       return true;
     },
     onCancel() {
-      this.$emit("cancel")
+      this.$emit('cancel');
+      this.$emit('update:visible', false);
     },
     onSubmit() {
       this.$refs.formRef.validate((valid) => {
@@ -617,7 +614,7 @@
           });
           if (this.type == 1) {
             let deleteImgCopy = this.deleteImg;
-            fileUtil.getImageFiles(picUrls, function (files) {
+            fileUtil.getImageFiles(picUrls, (files) => {
               data.append('deleteImg', deleteImgCopy);
               deepCopyPro.advise = deepCopyPro.advice;
               delete deepCopyPro['advice'];
@@ -630,19 +627,19 @@
               files.forEach((image) => {
                 data.append('images', image);
               });
-              problemApi.updateProblem(data).then((res) => {});
+              problemApi.updateProblem(data).then((res) => {
+                this.$emit('submit', false);
+              });
             });
-            this.$emit('submit', false);
           } else {
             const deepCopySubTask = useCloned(this.subtask).cloned.value;
-            const that = this;
-            fileUtil.getImageFiles(picUrls, function (files) {
+            fileUtil.getImageFiles(picUrls, (files) => {
               deepCopyPro.insGuid = deepCopySubTask.insGuid;
               delete deepCopyPro['description'];
               deepCopyPro.proName = deepCopyPro.problemname;
               delete deepCopyPro['problemname'];
-              deepCopyPro.ptGuid = that.findProTypeByGuid(
-                that.currProTypeGuid
+              deepCopyPro.ptGuid = this.findProTypeByGuid(
+                this.currProTypeGuid
               ).guid;
               deepCopyPro.locationId = deepCopyPro.locationid;
               delete deepCopyPro['locationid'];
@@ -652,9 +649,10 @@
               files.forEach((image) => {
                 data.append('images', image);
               });
-              problemApi.newProblem(data).then((res) => {});
+              problemApi.newProblem(data).then((res) => {
+                this.$emit('submit', true);
+              });
             });
-            this.$emit('submit', true);
           }
         }
       });

--
Gitblit v1.9.3