dianliang/lanan-repair-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	pages-order/addOrder/addOrder.vue
#	pages/myCar/carDetail.vue
This commit is contained in:
许允枞 2024-10-30 15:59:25 +08:00
commit 0d562e92cd
6 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
App.vue
View File

@ -28,4 +28,7 @@
* {
box-sizing: border-box;
}
.image-view-img{
background: white;
}
</style>

25
components/orderCard.vue
View File

@ -42,10 +42,15 @@
</view>
</view>
<view class="footer">
<view @click="projectDis" v-if="order.ticketsStatus == '04' && roleCanPg" class="btn pg">
<view @click="projectDis" v-if="order.ticketsStatus == '04' && (userInfo.roleCodes.includes('service_advisor') || userInfo.roleCodes.includes('general_inspection'))" class="btn pg">
项目派工
</view>
<view @click="projectDis" v-if="order.ticketsStatus == '05' && roleCanPg" class="btn pg">
<view @click="projectDis" v-if="order.ticketsStatus == '05' && userInfo.roleCodes.includes('repair_staff') && ifLeader && order.canOperate" class="btn pg">
<!--维修班组长且当前施工人是本班组内的人，可以重新派工-->
重新派工
</view>
<view @click="projectDis" v-if="order.ticketsStatus == '05' && (userInfo.roleCodes.includes('service_advisor') || userInfo.roleCodes.includes('general_inspection'))" class="btn pg">
<!--服务顾问和总检，可以重新派工-->
重新派工
</view>
<view @click="receiveOrder(order.id)" v-if="order.ticketsStatus == '05' && order.ticketsWorkStatus=='01' && roleCanJd" class="btn qc">
@ -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
}

8
pages-home/service/todoDetail.vue
View File

@ -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
}
})

8
pages-order/orderDetail/orderDetail.vue
View File

@ -553,14 +553,14 @@ 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 ("05" == this.ticketInfo.ticketsStatus && this.ticketInfo.nowRepairId == this.loginUser.id) {
//订单状态处于维修中 ，且自己就是施工人
if ("02" == this.ticketInfo.ticketsWorkStatus) {
//当前正在施工，可以随时上传图片、也可以结束施工
//当前正在施工且可以随时上传图片、也可以结束施工
this.content.push({
text: '拍照上传', active: false, code: "working"
})

9
pages-repair/signature/signature.vue
View File

@ -1,10 +1,10 @@
<template>
<view class="page">
<VNavigationBar background-color="rgba(0,0,0,0)" title="签名" title-color="#333"></VNavigationBar>
<VNavigationBar background-color="rgba(0,0,0,0)" title="客户签名" title-color="#333"></VNavigationBar>
<view class="container">
<!-- <view class="instruction">-->
<!-- 确定维修项目无误后请签名-->
<!-- </view>-->
<view class="instruction">
确定维修项目无误后请客户签字确认
</view>
<canvas
canvas-id="signatureCanvas"
class="canvas"
@ -38,6 +38,7 @@ export default {
onLoad(data) {
// 获取 canvas 上下文
this.context = uni.createCanvasContext("signatureCanvas", this);
this.context.fillStyle = "white";
if (data.data){
console.log('传递过来的内容', JSON.parse(data.data))
this.data = JSON.parse(data.data)

18
pages.json
View File

@ -67,8 +67,7 @@
{
"path": "pages/project/project",
"style": {
"navigationBarTitleText": "新增维修项目",
"enablePullDownRefresh": true
"navigationBarTitleText": "新增维修项目"
}
}
],
@ -94,29 +93,25 @@
{
"path": "choosePeople/choosePeople",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": true
"navigationBarTitleText": ""
}
},
{
"path": "chooseImg/chooseImg",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": true
"navigationBarTitleText": ""
}
},
{
"path": "reviewList/reviewList",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": true
"navigationBarTitleText": ""
}
},
{
"path": "inWare/inWare",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": true
"navigationBarTitleText": ""
}
}
]
@ -204,8 +199,7 @@
{
"path": "signature/signature",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": true
"navigationBarTitleText": ""
}
}
]