From 161567d6e7b2fd32127415541b1b14cf36cbb8d8 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Wed, 30 Oct 2024 15:37:26 +0800 Subject: [PATCH] 1 --- App.vue | 3 +++ components/orderCard.vue | 25 +++++++++++++++--------- pages-home/service/todoDetail.vue | 8 -------- pages-order/addOrder/addOrder.vue | 2 +- pages-order/orderDetail/orderDetail.vue | 26 ++++++++++++------------- pages-repair/signature/signature.vue | 9 +++++---- pages.json | 18 ++++++----------- pages/myCar/carDetail.vue | 10 +++++++++- 8 files changed, 53 insertions(+), 48 deletions(-) diff --git a/App.vue b/App.vue index 338d556..16f6ccc 100644 --- a/App.vue +++ b/App.vue @@ -28,4 +28,7 @@ * { box-sizing: border-box; } + .image-view-img{ + background: white; + } diff --git a/components/orderCard.vue b/components/orderCard.vue index bd1cdae..4de631d 100644 --- a/components/orderCard.vue +++ b/components/orderCard.vue @@ -42,10 +42,15 @@ - + 项目派工 - + + + 重新派工 + + + 重新派工 @@ -92,27 +97,29 @@ export default { }, data() { return { - //当前角色是否可以派工 - roleCanPg:false, //当前角色是否可以告知取车 roleCanQc:false, //当前角色是否可以接单 roleCanJd:false, //当前用户是否可以进行施工、施工过程、结束施工操作--- roleCanSg:false, + //当前用户 + userInfo:{}, + ifLeader:false, } }, mounted(){ - let userInfo = getUserInfo() - if(userInfo.roleCodes.includes("service_advisor") || userInfo.roleCodes.includes("general_inspection") || (userInfo.roleCodes.includes("repair_staff") && getStrData("ifLeader"))){ - //服务顾问、总检、维修班组长可以派工 + this.ifLeader = getStrData('ifLeader') + this.userInfo = getUserInfo() + if(this.userInfo.roleCodes.includes("service_advisor") || this.userInfo.roleCodes.includes("general_inspection") || (this.userInfo.roleCodes.includes("repair_staff") && getStrData("ifLeader"))){ + //服务顾问、总检可以派工,维修班组长需要判断是否可以派工 this.roleCanPg = true } - if(userInfo.roleCodes.includes("service_advisor")){ + if(this.userInfo.roleCodes.includes("service_advisor")){ //服务顾问可以告知取车 this.roleCanQc = true } - if(userInfo.roleCodes.includes("repair_staff") && this.order.nowRepairId==userInfo.id){ + if(this.userInfo.roleCodes.includes("repair_staff") && this.order.nowRepairId==userInfo.id){ //维修工角色,并且指派处理的人就是当前用户可以接单 this.roleCanJd = true } diff --git a/pages-home/service/todoDetail.vue b/pages-home/service/todoDetail.vue index b2ba71f..d61b00d 100644 --- a/pages-home/service/todoDetail.vue +++ b/pages-home/service/todoDetail.vue @@ -97,14 +97,6 @@ export default { params:params }).then((res) => { if (res.code == 200) { - res.data.map((item)=>{ - getDictTextByCodeAndValue("repair_unit",item.wares.unit).then(value => { - item.wares.unit = value - }).catch(error => { - item.wares.unit = "未知" - console.error(error); - }); - }) this.repairList = res.data } }) diff --git a/pages-order/addOrder/addOrder.vue b/pages-order/addOrder/addOrder.vue index 5abb48d..f864095 100644 --- a/pages-order/addOrder/addOrder.vue +++ b/pages-order/addOrder/addOrder.vue @@ -306,7 +306,7 @@ export default { }) } else { uni.showToast({ - title: '请输入手机号', + title: '请输入手机号码|车牌号|车架号', icon: 'none' }) } diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue index 4e510f0..d9c2df0 100644 --- a/pages-order/orderDetail/orderDetail.vue +++ b/pages-order/orderDetail/orderDetail.vue @@ -553,30 +553,30 @@ export default { } } if(this.loginUser.roleCodes.includes("repair_staff")){ - //维修工角色 - if(this.ticketInfo.nowRepairId==this.loginUser.id && "05"==this.ticketInfo.ticketsStatus){ - //当前用户就是施工人，,订单状态处于维修中 可以提交配件申请 - this.content.push({ - text: '配件申请', active: false,code:"apply" - }) - if("02"==this.ticketInfo.ticketsWorkStatus){ - //当前正在施工，可以随时上传图片、也可以结束施工 + //维修工角色，可以提交配件申请 + this.content.push({ + text: '配件申请', active: false, code: "apply" + }) + if ("05" == this.ticketInfo.ticketsStatus && this.ticketInfo.nowRepairId == this.loginUser.id) { + //订单状态处于维修中 ，且自己就是施工人 + if ("02" == this.ticketInfo.ticketsWorkStatus) { + //当前正在施工且可以随时上传图片、也可以结束施工 this.content.push({ - text: '拍照上传', active: false,code:"working" + text: '拍照上传', active: false, code: "working" }) this.content.push({ - text: '阶段完成', active: false,code:"done_half" + text: '阶段完成', active: false, code: "done_half" }) this.content.push({ - text: '项目完成', active: false,code:"other" + text: '项目完成', active: false, code: "other" }) this.content.push({ - text: '移交总检', active: false,code:"done" + text: '移交总检', active: false, code: "done" }) //查当前维修的项目 this.selectNowRepair() } - if("03"==this.ticketInfo.ticketsWorkStatus || "04"==this.ticketInfo.ticketsWorkStatus) { + if ("03" == this.ticketInfo.ticketsWorkStatus || "04" == this.ticketInfo.ticketsWorkStatus) { //当前子状态是已接单和已完成，可以开始施工 this.content.push({ text: '开始施工', active: false, code: "start" diff --git a/pages-repair/signature/signature.vue b/pages-repair/signature/signature.vue index 408f782..091c68d 100644 --- a/pages-repair/signature/signature.vue +++ b/pages-repair/signature/signature.vue @@ -1,10 +1,10 @@