From 5413a5062f32801b479d1e1b4fb3a11920092a3c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 9 Jul 2024 14:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E5=8D=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=8A=80=E5=B8=88=E4=B8=8A=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/applyList/technician.vue | 4 +- src/views/locality/locality.vue | 59 ++++++++++- src/views/orderCenter/orderCenter.vue | 140 +++++++++++++++++++++++++- 3 files changed, 197 insertions(+), 6 deletions(-) diff --git a/src/views/applyList/technician.vue b/src/views/applyList/technician.vue index d83f04d..05e4b21 100644 --- a/src/views/applyList/technician.vue +++ b/src/views/applyList/technician.vue @@ -219,10 +219,10 @@ >上线 休息 - + - + 删除 + 新增评论 + @@ -1802,6 +1809,23 @@ + + + + + + + + + + + + + + @@ -1899,6 +1923,7 @@ export default { dialogFormVisible9: false, dialogFormVisible10: false, dialogFormVisible11: false, + dialogSaveVisible: false, homeData: [], homeData1: [ { @@ -2080,9 +2105,41 @@ export default { materialId: "", materialPackageClassifyId: "", getMaterialPackageDataOfRow: {}, + + //新增评论内容 + saveForm:{ + massageTypeId: '', + content: '', + score: '' + }, + plmassageTypeId:'', }; }, methods: { + handleAddpl(record){ + this.dialogSaveVisible = true; + this.plmassageTypeId = record.massageTypeId; + this.saveForm = { + massageTypeId: '', + content: '', + score: '' + } + }, + //新增评论保存 + handelQueren(){ + this.$http({ + url: this.$http.adornUrl('takingComment/insertTaking'), + method: 'post', + params: this.$http.adornParams({ + 'content': this.saveForm.content, + 'score': this.saveForm.score, + 'massageTypeId': this.plmassageTypeId, + }) + }).then(({ data }) => { + this.dialogSaveVisible = false; + this.classSelect(); + }) + }, //翻译字典(手动) getDictLabel(val){ var list = this.materialPackageType; diff --git a/src/views/orderCenter/orderCenter.vue b/src/views/orderCenter/orderCenter.vue index 5360f87..dda62f3 100644 --- a/src/views/orderCenter/orderCenter.vue +++ b/src/views/orderCenter/orderCenter.vue @@ -135,12 +135,12 @@ - {{ scope.row.ordersMassageList[0].massageType.classifyName }} + {{ scope.row.ordersMassageList[0].massageType.classifyName }} - {{ scope.row.ordersMassageList[0].massageType.title }} + {{ scope.row.ordersMassageList[0].massageType.title }} @@ -309,6 +309,9 @@ 服务中 师傅出发 师傅到达 + 待确认 + 待补单 + 挂单 @@ -334,6 +337,11 @@ @click="deletes(scope.row)" style="margin:5px;">删除 部分退款 + + 转单 + + @@ -477,6 +485,50 @@ 确 定 + + + + + + 师傅名称: + + + + 手机号: + + + 查询 + + + + + + + + + {{ scope.row.phone ? scope.row.phone : "未绑定" }} + + + + + 确认 + + + + + + + + + @@ -871,7 +923,13 @@ }, ], times:'', - bili:0 + bili:0, + choicenData: [], + artificerVisible:false, + jishipage:1, + jishisize:10, + phoneT:'', + jszdOrderId:'', } }, methods: { @@ -931,7 +989,83 @@ magNotice() { this.dialogFormVisible2 = true }, + // 转单 + handleZhuandan(record){ + this.jszdOrderId = record.ordersId; + this.artificerVisible = true; + this.handleSelJishi(); + }, + //技师确认选择 + handleJsqueren(record){ + this.artificerVisible = false; + this.$http({ + url: this.$http.adornUrl(`artificer/jszd`), + method: "get", + params: this.$http.adornParams({ + artificerId: record.artificerId, + orderId: this.jszdOrderId, + }), + }).then(({ data }) => { + console.log(`🚀 ~ handleJsqueren ~ data:`, data) + if(data.code==200){ + this.$message({ + message: '转单成功', + type: 'success', + duration: 1500, + onClose: () => { + this.dataSelect() + } + }) + }else{ + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500, + onClose: () => { + } + }) + } + this.dataSelect(); + }); + + }, + + //技师列表更换页数 + handleSizeChange1(val) { + this.jishisize = val; + this.handleSelJishi(); + }, + //技师翻页 + handleCurrentChange1(val) { + this.jishipage = val; + this.handleSelJishi(); + }, + //技师查询 + handleSelJishi(){ + this.userId = this.$store.state.user.id; + this.$http({ + url: this.$http.adornUrl(`artificer/selectArtificerList`), + method: "get", + params: this.$http.adornParams({ + page: this.jishipage, + limit: this.jishisize, + artificerName: this.artificerName, + massageTypeId: "", + longitude: "", + latitude: "", + city: "", + classifyId: "", + phone: this.phoneT, + authentication: 2, + }), + }).then(({ data }) => { + this.tableDataLoading = false; + let returnData = data.data; + this.choicenData = returnData; + console.log(this.choicenData); + }); + }, // 获取数据列表 dataSelect() { var endTime=this.endTime