diff --git a/pages/index/Neworder.vue b/pages/index/Neworder.vue index 390a27d..7d14d99 100644 --- a/pages/index/Neworder.vue +++ b/pages/index/Neworder.vue @@ -32,6 +32,17 @@ + + + + 行驶证照片 + + + + + + + @@ -264,6 +275,7 @@ export default { buyPhone: '', userAddress: '', carNum: '', + baseImageUrl: this.$baseImageUrl, carStatus: '', carIdNo: '', radioValue: '0', @@ -312,6 +324,7 @@ export default { customerData: [], inspectionWorkNodeStr: "", leadManId: undefined, + driverLicenesImg: undefined, meetManId: undefined, leadManList: [], meetManList: [], @@ -489,6 +502,9 @@ export default { this.carIdNo = res.data.carIdNo //skuid this.skuId = res.data.skuId + //行驶证照片 + this.driverLicenesImg = res.data.driverLicenesImg == null ? undefined : [this.baseImageUrl + '/' + res.data.driverLicenesImg] + console.log('照片', this.driverLicenesImg) //goodsId this.goodsId = res.data.goodsId this.goodstext = this.findItemById(this.columnData, this.skuId).label @@ -636,6 +652,8 @@ export default { startTime: this.recordTime, otherPhone: this.otherPhone, carRegisterDate: this.carRegisterDate, + meetManId: this.meetManId, + appointmentId: this.appointmentId, } let res = await request({ @@ -679,6 +697,7 @@ export default { leadManId: this.leadManId, carRegisterDate: this.carRegisterDate, status: '2', + meetManId: this.meetManId, } let res = await request({ diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue index e786011..0d8d98b 100644 --- a/pages/index/newindex.vue +++ b/pages/index/newindex.vue @@ -157,6 +157,9 @@ 客户来源 自来客户 + + 查看行驶证 + @@ -287,6 +290,14 @@ export default { }) this.clearMyInterval() }, + previewImage(imgUrl) { + uni.previewImage({ + urls: [this.baseImageUrl + imgUrl], // 图片数组,可以预览多张 + current: this.baseImageUrl + imgUrl, // 当前要显示的图片 + indicator: "default", // 显示指示点 + loop: true // 是否可循环预览 + }); + }, goAddOrder(data){ uni.navigateTo({ url: `/pages/index/Neworder?appointmentId=${data.id}` diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue index 310fcb7..91263e3 100644 --- a/pages/index/orderdetails.vue +++ b/pages/index/orderdetails.vue @@ -61,7 +61,7 @@ 更换引车员 - + 客户信息 {{ detailData.buyUserName }} {{ detailData.buyUserPhone }} @@ -317,6 +317,7 @@ export default { hge: false, roleSelect: '', orImages: false, + isShowClient:true, show: false, xling: false, leadManList: [], @@ -383,6 +384,9 @@ export default { this.roleSelect = res.data } }) + if (option.type == 'staff') { + this.isShowClient = false + } }, onShow() { }, diff --git a/pages/order/reservationlist.vue b/pages/order/reservationlist.vue index 082a866..5e49164 100644 --- a/pages/order/reservationlist.vue +++ b/pages/order/reservationlist.vue @@ -21,7 +21,15 @@ - {{item.goodsTitle}} + + {{item.goodsTitle}} + + + + + + + 预约时间 {{item.appointmentDay}} 上午 @@ -30,17 +38,13 @@ 预约人:{{item.buyName}} 电话:{{item.buyPhoneNum}} - 车辆信息:{{item.carBrand || ''}} - 车辆号码:{{item.carNo || ''}} - 车辆性质:{{item.carNature || ''}} + + 车辆号码:{{item.carNo || ''}} + - - - - - - - + + 转订单 + @@ -110,6 +114,11 @@ phoneNumber: e //仅为示例 }); }, + goAddOrder(data){ + uni.navigateTo({ + url: `/pages/index/Neworder?appointmentId=${data.id}` + }) + }, async getindex(){ // 首页信息 let data = { diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue index 83f0346..1fdb81d 100644 --- a/pages/staff/staff.vue +++ b/pages/staff/staff.vue @@ -53,7 +53,7 @@ 检测类型:{{ item.skuName }} - + @@ -366,7 +366,7 @@ export default { }, godetails(item) { uni.navigateTo({ - url: "/pages/index/orderdetails?inspectionInfoId=" + item.id + "&workNodeId=" + item.workNodeId + "&workNodeStatus=" + item.workNodeStatus + url: `/pages/index/orderdetails?inspectionInfoId=${item.id}&workNodeId=${item.workNodeId}&workNodeStatus=${item.workNodeStatus}&type=staff` }) }, orderTaking(data) { @@ -419,6 +419,9 @@ export default { tapqh(index) { //如果是待接车 if (this.tapList[index].value == '6') { + this.isShowClient = true + } else { + this.isShowClient = false } this.tapValue = this.tapList[index].value this.tapindex = index