From a79c5c6dc614d178fb40e0a3ed372e9595efb9d1 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Thu, 14 Nov 2024 10:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=A1=B9=E7=9B=AE=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=EF=BC=8C=E5=85=88=E6=8F=90=E7=A4=BA=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E7=A7=BB=E4=BA=A4=E6=80=BB=E6=A3=80=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repair/tickets/form/UpdateRecord.vue      | 51 +++++++++++++++----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/views/repair/tickets/form/UpdateRecord.vue b/src/views/repair/tickets/form/UpdateRecord.vue
index 8221ced..ef19449 100644
--- a/src/views/repair/tickets/form/UpdateRecord.vue
+++ b/src/views/repair/tickets/form/UpdateRecord.vue
@@ -47,25 +47,47 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="formData.recordType !== 'sgwczj' && projectList.length > 0" type="primary" @click="doUpdate(null)">确
+        <el-button v-if="formData.recordType !== 'sgwczj' && projectList.length > 0" type="primary"
+                   @click="doUpdate(null)">确
           定
         </el-button>
-        <el-button v-if="formData.recordType === 'sgwczj' && projectList.length !== 0" type="primary" @click="doUpdate(null)">
+        <el-button v-if="formData.recordType === 'sgwczj' && projectList.length !== 0" type="primary"
+                   @click="doUpdate(null)">
           部分完成
         </el-button>
-        <el-button v-if="formData.recordType === 'sgwczj' && projectList.length !== 0" type="primary" @click="doFinish(true)">
-          完成并移交下一班组
-        </el-button>
-        <el-button v-if="formData.recordType === 'sgwczj' && !isNext && projectList.length !== 0" type="primary"
-                   @click="doFinish(false)">
-          {{ isEndCheck ? "完成并移交总检" : "完成工单" }}
+        <el-button v-if="formData.recordType === 'sgwczj' && projectList.length !== 0" type="primary"
+                   @click="handleFinish">
+          完成
         </el-button>
+        <!--        <el-button v-if="formData.recordType === 'sgwczj' && projectList.length !== 0" type="primary" @click="doFinish(true)">-->
+        <!--          完成并移交下一班组-->
+        <!--        </el-button>-->
+        <!--        <el-button v-if="formData.recordType === 'sgwczj' && !isNext && projectList.length !== 0" type="primary"-->
+        <!--                   @click="doFinish(false)">-->
+        <!--          {{ isEndCheck ? "完成并移交总检" : "完成工单" }}-->
+        <!--        </el-button>-->
         <!--        <el-button v-if="formData.recordType === 'sgwczj'" type="success" @click="doFinish">-->
         <!--          {{isNext ? "整体完成并指派下一项目" : (isEndCheck ? "整体完成并移交总检" : "整体完成")}}-->
         <!--        </el-button>-->
       </div>
     </el-dialog>
 
+    <el-dialog
+      title="选择"
+      :visible.sync="chooseVisible"
+      width="30%">
+      <span>{{isEndCheck ? '这个工单需要总检，' : '这个工单不需要总检,'}}请选择完成方式</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button type="primary" v-if="formData.recordType === 'sgwczj' && projectList.length !== 0"
+               @click="doFinish(true)">完成并移交下一班组</el-button>
+    <el-button v-if="formData.recordType === 'sgwczj' && !isNext && projectList.length !== 0" type="primary"
+               @click="doFinish(false)">
+                  {{ isEndCheck ? "完成并移交总检" : "完成工单" }}
+                </el-button>
+    <el-button @click="chooseVisible = false">取 消</el-button>
+  </span>
+    </el-dialog>
+
     <UpdateRepair ref="updateRepair" @success="doUpdate"/>
   </div>
 </template>
@@ -104,10 +126,14 @@ export default {
       isNext: false,
       // 是否需要总检
       isEndCheck: true,
-      clickRow: null
+      clickRow: null,
+      chooseVisible: false,
     }
   },
   methods: {
+    handleFinish() {
+      this.chooseVisible = true
+    },
     init() {
       this.formData = {
         // 主表信息
@@ -162,7 +188,7 @@ export default {
     },
     async doUpdate(nextName = null) {
       try {
-        if (nextName){
+        if (nextName) {
           this.formData['nextName'] = nextName
         }
         if (this.formData.recordType === 'zj') {
@@ -177,6 +203,7 @@ export default {
             this.$modal.msgSuccess("操作成功")
           }
           this.dialogVisible = false
+          this.chooseVisible = false
           this.$emit("success")
         } else {
           this.formLoading = true
@@ -185,6 +212,7 @@ export default {
             this.$modal.msgSuccess("操作成功")
           }
           this.dialogVisible = false
+          this.chooseVisible = false
           this.$emit("success")
         }
       } catch {
@@ -192,6 +220,9 @@ export default {
     },
     async doFinish(flag) {
       try {
+        if (!this.formData.item.id){
+          this.$modal.msgError("请先选择要完成的项目")
+        }
         await this.$refs.formRef.validate()
         this.formLoading = true
         // 不论是什么按钮，这个工单子项是完了的