diff --git a/pages-order/choosePeople/choosePeople.vue b/pages-order/choosePeople/choosePeople.vue index 7da5748..cc74230 100644 --- a/pages-order/choosePeople/choosePeople.vue +++ b/pages-order/choosePeople/choosePeople.vue @@ -314,8 +314,7 @@ export default { const param = { id: this.ticketId, nowRepairId: this.checkedUserId, - nowRepairName: this.checkedUserName, - operateCode:"sgwczj" + nowRepairName: this.checkedUserName } if (type == '1'){ param.remark = this.remark diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue index a49a9e7..462680e 100644 --- a/pages-order/orderDetail/orderDetail.vue +++ b/pages-order/orderDetail/orderDetail.vue @@ -203,6 +203,30 @@ + + 维修进度记录表 + + + - 待维修 + ○ 维修中 + √ 已完成 + + + + 序号 + 维修项目 + 维修状态 + + + {{ index+1 }} + {{ item.itemName }} + - + + + + + + 维修记录 @@ -340,57 +364,12 @@ export default { carInfo: {}, userInfo: {}, loginUser:{}, - selectedProj: [ - // { - // projName: '清洗内饰', - // amount: '280', - // date: '2024-10-20 12:00', - // desc: '车辆已到维修厂,工作人员正准备开始维修', - // imageList: [{filePath: ''}, {filePath: ''}, {filePath: ''}, {filePath: ''}, {filePath: ''}], - // isSend: true, - // // 待审核部件 - // examinePart: [], - // id: 'projId1', - // // 销售 - // salesman: [ - // { - // name: '魏书豪', - // id: '11111' - // } - // ], - // // 施工 - // constructor: [] - // }, - // { - // projName: '清洗内饰', - // amount: '280', - // date: '2024-10-20 12:00', - // desc: '车辆已到维修厂,工作人员正准备开始维修', - // imageList: [{filePath: ''}, {filePath: ''}, {filePath: ''}, {filePath: ''}, {filePath: ''}], - // isSend: false, - // // 待审核部件 - // hasNoReviewPart: false, - // id: 'projId2', - // salesman: [], - // constructor: [] - // }, - // { - // projName: '清洗内饰', - // amount: '280', - // date: '2024-10-20 12:00', - // desc: '车辆已到维修厂,工作人员正准备开始维修', - // imageList: [], - // isSend: false, - // // 待审核部件 - // hasNoReviewPart: true, - // id: 'projId3', - // salesman: [], - // constructor: [] - // } - ], + selectedProj: [], submitData:[], //是否是通知客户取车操作,默认都不是 ifCallCus:false, + //维修项目进度记录表 + tableData:[], //通知客户取车联系人对象 callServiceInfo:{ name:"", @@ -413,6 +392,8 @@ export default { onShow(){ //获取订单详情 this.getOrderDetail() + //查维修进度记录 + this.getProjItem() //获取当前订单是否有审批的配件 this.waresByTicket() }, @@ -550,6 +531,9 @@ export default { }else if("done_half"==this.nowChooseOperate){ //阶段完成 const result = await saveTicketsRecords(this.ticketInfo.id, '03',this.nowRepair.repairItemId,"03","sgwczj","阶段完成",fileStr,"",""); + }else if("other"==this.nowChooseOperate){ + //项目完成 + 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",""); @@ -819,7 +803,20 @@ export default { }) }) }, - + /** + * 查看维修进度记录 + */ + getProjItem(){ + request({ + url: '/admin-api/repair/titem/getProjList', + method: 'get', + params:{ticketId:this.ticketId} + }).then((res)=>{ + if(res.code==200){ + this.tableData = res.data + } + }) + }, /** * 查看订单详情 */ @@ -1164,6 +1161,16 @@ export default { flex-direction: column; gap: 20rpx; + .tushi-box{ + display: flex; + align-items: center; + justify-content: center; + } + .tushi-item{ + padding: 0 20rpx; + color: #606266; + } + .projItem { background: #FFFFFF; border-radius: 4rpx 4rpx 4rpx 4rpx;