From 2ae75d60bdefa88f70d775f728353215c9f36308 Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Mon, 25 Jul 2022 18:26:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- commons/flying-monkey.css | 2 +- package-lock.json | 17 +++- package.json | 7 +- pages.json | 5 ++ pages/guide-page/guide-page.vue | 59 +++++++++---- pages/login/agreement.vue | 19 ++++- pages/tabbar/my/my.vue | 24 +++++- pages/tabbar/pagehome/pagehome.vue | 60 +++++++++---- pagesA/peopleManagement/peopleManagement.vue | 40 ++++++--- pagesA/workOrder/details.vue | 42 ++++----- pagesA/workOrder/workOrder.vue | 22 ++--- pagesA/workOrder/workOrderAudit.vue | 37 ++++---- pagesA/workOrder/workOrderLlsit.vue | 89 +++++++++++++++++--- pagesA/workOrder/workOrderThree.vue | 11 ++- pagesA/workOrder/workorderTwo.vue | 28 +++--- pagesB/my-account/my-account.vue | 48 +++++------ pagesB/set-up/set-up.vue | 86 +++++++++++-------- 18 files changed, 399 insertions(+), 199 deletions(-) diff --git a/App.vue b/App.vue index 6f30caf..38cf6f6 100644 --- a/App.vue +++ b/App.vue @@ -1,4 +1,4 @@ - diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue index 65a1ba4..c095df1 100644 --- a/pages/tabbar/pagehome/pagehome.vue +++ b/pages/tabbar/pagehome/pagehome.vue @@ -239,6 +239,10 @@ import footTabOne from '@/components/foot-tabs/foot-tab-one.vue'; import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; import {getPlanType} from '@/jsFile/public-api.js'; + // import io from '@hyoga/uni-socket.io'; + // const socket = io('http://7and5.cn:2120', { + // transports: [ 'websocket'] + // }); export default { components:{ pitera, @@ -294,7 +298,7 @@ workOrderList:[ {imgsrc:'/static/public/icon-home-abnormalSingle.png',title:'异常单',num:0,id:100}, {imgsrc:'/static/public/icon-home-overdueSingle.png',title:'逾期单',num:0,id:101}, - {imgsrc:'/static/public/icon-home-overtime.png',title:'超时单 ',num:0,id:0}, + // {imgsrc:'/static/public/icon-home-overtime.png',title:'超时单 ',num:0,id:0}, {imgsrc:'/static/public/icon-home-workOrderPool.png',title:'工单池',num:0,id:0}, ], // 结算情况 @@ -357,21 +361,40 @@ this.project_count = homeObj.project_count;//项目数量 this.project_error_count = homeObj.project_error_count;//实时工单数量 - this.projectRepairList[0].num = homeObj.pending_order_count; //待接单数量 - this.projectRepairList[1].num = homeObj.pending_count; //待执行数量 - this.projectRepairList[2].num = homeObj.under_repair_count; //维修中数量 - - this.workOrderList[0].num = homeObj.abnormal_order_count; //异常单数量 - this.workOrderList[1].num = homeObj.overdue_order_count; //逾期单数量 - this.workOrderList[2].num = homeObj.time_out_order_count; //超时单数量 - this.workOrderList[3].num = homeObj.work_order_count; //工单池数量 - - this.settlementList[0].num = homeObj.pending_payment_count; //待收款数量 - this.settlementList[1].num = homeObj.paid_for_count; //已收款数量 - - this.stayEventList[0].num = homeObj.approval_count; //待审批数量 - this.stayEventList[1].num = homeObj.pending_payment_count; //待收款数量 - + switch (this.role){ + // 业务员 || 客户 + case 1 || 2: + this.repairList[1].num = homeObj.upcoming_count; + break; + // 客服 + case 3: + // 待办工单 + this.stayWorkOrderList[1].num = homeObj.pending_designate_count; + this.stayWorkOrderList[2].num = homeObj.pending_repair_count; + this.stayWorkOrderList[3].num = homeObj.pending_return_visit_count; + // 待办事件 + this.stayEventList[0].num = homeObj.approval_count; + this.stayEventList[1].num = homeObj.pending_payment_count; + // 工单数据 + this.workOrderList[0].num = homeObj.abnormal_order_count; + this.workOrderList[1].num = homeObj.overdue_order_count; + this.workOrderList[2].num = homeObj.work_order_count; + break; + // 工程师 + case 4: + // 项目维保 + this.projectRepairList[0].num = homeObj.pending_order_count; //待接单数量 + this.projectRepairList[1].num = homeObj.pending_count; //待执行数量 + this.projectRepairList[2].num = homeObj.under_repair_count; //维修中数量 + // 工单数据 + this.workOrderList[0].num = homeObj.abnormal_order_count; //异常单数量 + this.workOrderList[1].num = homeObj.overdue_order_count; //逾期单数量 + this.workOrderList[2].num = homeObj.work_order_count; //工单池数量 + // 结算情况 + this.settlementList[0].num = homeObj.pending_payment_count; //待收款数量 + this.settlementList[1].num = homeObj.paid_for_count; //已收款数量 + break; + } // 重构公告列表 // if(homeObj.notice.length) { // homeObj.notice.forEach(item=>{ @@ -439,7 +462,10 @@ url:faultRepairUrls[index] }) } else { - this.$toolAll.tools.showToast('已催单成功') + // this.$toolAll.tools.showToast('已催单成功') + uni.navigateTo({ + url:`/pagesA/workOrder/workOrderLlsit` + }) } }, // 查询解决方案的推荐方案 diff --git a/pagesA/peopleManagement/peopleManagement.vue b/pagesA/peopleManagement/peopleManagement.vue index 3fe46b9..c8fd46c 100644 --- a/pagesA/peopleManagement/peopleManagement.vue +++ b/pagesA/peopleManagement/peopleManagement.vue @@ -11,11 +11,13 @@ - - - - - + + + + + + + {{item.name}}({{item.isJob ? '正在作业' : '空闲中'}}) @@ -23,13 +25,13 @@ {{['未审核','已审核'][item.is_check]}} - + 编号: {{item.number}} - + @@ -53,7 +55,7 @@ - + @@ -80,7 +82,8 @@ page:1, list_rows:20, total:0, - tianxuan:'' + tianxuan:'', + order_id:'',//工单id } }, onReachBottom() { @@ -89,7 +92,10 @@ this.checkList(); } }, - onLoad() { + onLoad(op) { + if(op.orderId){ + this.order_id = op.orderId; + } this.checkList(); }, methods: { @@ -128,6 +134,19 @@ } }) }, + // 派发工单事件 + sellEv(){ + this.$requst.post('/universal/api.order/dispatch',{order_id:this.order_id,uid:this.tianxuan}).then(res=>{ + if(res.code){ + this.$toolAll.tools.showToast('派单成功'); + setTimeout(()=>{ + uni.navigateBack({ + delta:1 + }) + },1000) + } + }) + }, // 调用查询事件 callEv() { this.page = 1; @@ -138,7 +157,6 @@ this.dataList.forEach(item1=>{item1.state = false}) item.state = !item.state; item.state ? this.tianxuan = item.id : ''; - console.log(this.tianxuan); } } } diff --git a/pagesA/workOrder/details.vue b/pagesA/workOrder/details.vue index 4a875de..c2b9f8b 100644 --- a/pagesA/workOrder/details.vue +++ b/pagesA/workOrder/details.vue @@ -17,34 +17,34 @@ 状态：{{statusText}} - + 工单编号： - + 项目编号： - + 项目名称： - + 产品类型： - + 安装位置： - + 维保类型： - + 紧急程度： @@ -62,20 +62,20 @@ - + 报 单 人： - + 报单时间： - + 服务方式： - + 定位地址： @@ -91,35 +91,35 @@ 状态：{{statusText}} - + 开始时间： - + 结束时间： - + 维保用时： - + 维保费用： - + 等待时长： - + 主维保人： - + 更换配件： @@ -151,12 +151,12 @@ - + 维保原因：