pages-home/service/todoDetail.vue

@@ -204,22 +204,12 @@ export default {
           method: 'get'
         })
         this.info = res.data
-        if (this.info.repairWork){
-          this.getWorkToText()
-        }
         await this.getTicketById(this.info.ticketId)
         if (this.info.images && this.info.images.length > 0) {
           this.getImageUrls(this.info.images)
         }
       }catch{}
     },
-    getWorkToText(){
-      getDictTextByCodeAndValue('repair_work_type', this.info.repairWork).then(value => {
-        this.info.repairWork = value
-      }).catch(() => {
-        this.info.repairWork = "未知"
-      })
-    },
     getImageUrls(val) {
       this.imageUrls = [...val.split(",").map(item => {
         return config.baseImageUrl + item

pages-order/orderDetail/orderDetail.vue

@@ -602,28 +602,7 @@ export default {
           const result = await saveTicketsRecords(this.ticketInfo.id, '03',this.nowRepair.repairItemId,"03","sgwczj","阶段完成",fileStr,"","");
         }else if("other"==this.nowChooseOperate){
           //项目完成
-          const result = await new Promise((resolve, reject) => {
-            uni.showModal({
-              title: '提示', // 对话框标题
-              content: '是否移交总检？', // 对话框内容
-              confirmText: '是', // 确认按钮文本
-              cancelText: '否', // 取消按钮文本
-              success: (res) => {
-                if (res.confirm) {
-                  // 用户点击了确定按钮
-                  resolve(saveTicketsRecords(this.ticketInfo.id, '03',this.nowRepair.repairItemId,"03","sgwczj","维修完成移交总检",fileStr,"02",""))
-                  this.nowChooseOperate = 'done'
-                } else if (res.cancel) {
-                  // 用户点击了取消按钮
-                  resolve(saveTicketsRecords(this.ticketInfo.id, '03',this.nowRepair.repairItemId,"03","sgwczj","维修完成移交下一班组维修",fileStr,"",""))
-                }
-              },
-              fail: (err) => {
-                console.error('我是是否移交总检的弹窗，我报错了', err);
-              }
-            });
-          })
-          // const result = await saveTicketsRecords(this.ticketInfo.id, '03',this.nowRepair.repairItemId,"03","sgwczj","维修完成移交下一班组维修",fileStr,"","");
+          const result = await saveTicketsRecords(this.ticketInfo.id, '03',this.nowRepair.repairItemId,"03","sgwczj","维修完成移交下一班组维修",fileStr,"","");
         }else if("done"==this.nowChooseOperate){
           //移交总检
           const result = await saveTicketsRecords(this.ticketInfo.id, '03',this.nowRepair.repairItemId,"03","sgwczj","维修完成移交总检",fileStr,"02","");