From 919483b1e6b007ed956c121f01b5b41dc939d7e0 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Wed, 13 Nov 2024 17:12:41 +0800
Subject: [PATCH] 1

---
 pages-order/orderDetail/orderDetail.vue | 27 +++++++++++++++++++++----
 utils/utils.js                          |  7 +++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index a36fbb8..57b2c01 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -610,14 +610,27 @@ export default {
             data:dataObj
           }).then((res) => {
           })
+        }else if("over"==this.nowChooseOperate){
+          //服务顾问交车
+          let dataObj = {
+            id: this.ticketInfo.id,
+            remark: "交车",
+            image: fileStr
+          }
+          request({
+            url: '/admin-api/repair/tickets/overOrder',
+            method: 'POST',
+            data:dataObj
+          }).then((res) => {
+          })
         }
         this.$refs.popup.close()
         uni.showToast({
           title: '操作成功',
           icon: 'none'
         })
-        if("done"==this.nowChooseOperate || "check"==this.nowChooseOperate || "callCus"==this.nowChooseOperate || "out"==this.nowChooseOperate){
-          //移交总检需要返回| 总检拍照后需要返回
+        if("done"==this.nowChooseOperate || "check"==this.nowChooseOperate || "callCus"==this.nowChooseOperate || "out"==this.nowChooseOperate || "over"==this.nowChooseOperate){
+          //移交总检需要返回| 总检拍照后需要返回 | 服务顾问交车后返回
           setTimeout(() => {
             uni.navigateBack()
           },500)
@@ -654,6 +667,12 @@ export default {
               text: '通知取车', active: false,code:"callCus"
             })
           }
+          if("06"==this.ticketInfo.ticketsStatus || "02"==this.ticketInfo.ticketsStatus ){
+            //工单状态是已结算或者挂账，可以交车
+            this.content.push({
+              text: '交车', active: false,code:"over"
+            })
+          }
         //设置服务顾问默认的姓名联系方式
         this.callServiceInfo.name = this.loginUser.nickname
         this.callServiceInfo.tel = this.loginUser.mobile
@@ -718,8 +737,8 @@ export default {
       console.log(e)
       this.content[e.index].active = !e.item.active
       this.nowChooseOperate = e.item.code
-      if("working"==e.item.code || "done_half"==e.item.code || "done"==e.item.code || "other"==e.item.code || "check"==e.item.code || "out"==e.item.code){
-        //维修过程中拍照上传、阶段完成、移交其他班组、移交总检、出厂检验
+      if("working"==e.item.code || "done_half"==e.item.code || "done"==e.item.code || "other"==e.item.code || "check"==e.item.code || "out"==e.item.code || "over"==e.item.code){
+        //维修过程中拍照上传、阶段完成、移交其他班组、移交总检、出厂检验、交车
         this.fileList=[]
         this.$refs.popup.open("bottom")
       }else if("start" == e.item.code){
diff --git a/utils/utils.js b/utils/utils.js
index ca7cca4..0a0535a 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -46,13 +46,16 @@ export function getOrderStatusText(ticketsStatus,workStatus){
 		str = "待取车结算"
 	}else if("06"==ticketsStatus){
 		//挂单/记账
-		str = "挂单/记账"
+		str = "已挂单/记账待交车"
 	}else if("07"==ticketsStatus){
 		//待通知客户取车
 		str = "待通知客户取车"
+	}else if("08"==ticketsStatus){
+		//已交车
+		str = "已交车"
 	}else if("02"==ticketsStatus){
 		//已结账
-		str = "已结账"
+		str = "已结账待交车"
 	}else if("03"==ticketsStatus){
 		//已作废
 		str = "已作废"