diff --git a/api/api.js b/api/api.js index 7ec8359..7599637 100644 --- a/api/api.js +++ b/api/api.js @@ -379,8 +379,8 @@ const install = (Vue, vm) => { authorizations: true, isparams: false }) - // 更改消息状态 - let getMesseageTotal = (params) => http.get('/messeage/total', params, { + // 更改消息状态 + let getMesseageTotal = (params) => http.get('/messeage/total', params, { authorizations: true, isparams: false }) @@ -390,8 +390,24 @@ const install = (Vue, vm) => { isparams: false }) + // 维修查看流程进度 + let workOrderLog = (params) => http.get('/lab-ops/work-order-log/find-list-by-code', params, { + authorizations: true, + isparams: false + }) + + // 客户确认 驳回 + let urgentRepairReject = (params) => http.post('/lab-ops/work-order/customer-emergency-repair-reject', params, { + authorizations: true, + isparams: false + }) + // 客户确认 是 + let urgentRepairConfirm = (params) => http.post('/lab-ops/work-order/customer-emergency-repair-confirm', params, { + authorizations: true, + isparams: false + }) // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 - vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition,resetPwd,getNoticeList,updateSign,getMesseageList,getMesseageAll,updateMesseageStatus,getMesseageTotal,closeService}; + vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit, repairConfirmFinish, repairRefuseFinish, confirmPayment, getPosition, getRepairDetail, updatePosition, resetPwd, getNoticeList, updateSign, getMesseageList, getMesseageAll, updateMesseageStatus, getMesseageTotal, closeService, workOrderLog,urgentRepairConfirm,urgentRepairReject }; } export default { diff --git a/config/status.js b/config/status.js index 98e2186..add8c6c 100644 --- a/config/status.js +++ b/config/status.js @@ -13,6 +13,10 @@ export const tabList = { name: "待接单", key: "101", }, + { + name: "待确认", + key: "405", + }, { name: "待维修", key: "201,401,402", @@ -28,16 +32,24 @@ export const tabList = { }, { name: "维修中", - key: "103", + key: "103,404", + }, + { + name: "待提交", + key: "105", }, { name: "待评价", - key: "403,202", + key: "403,202,406", }, { name: "待付款", key: "104", }, + { + name: "待确认", + key: "104", + }, { name: "已完成", key: "202,203,204", @@ -62,11 +74,11 @@ export const tabList = { }, { name: "维修中", - key: "103", + key: "103,404", }, { name: "维修完成", - key: "403,202", + key: "403,202,405,105,406", }, { name: "待付款", @@ -88,7 +100,7 @@ export const tabList = { }, { name: "维修中", - key: "103", + key: "103,404", }, { name: "已通过", @@ -100,7 +112,7 @@ export const tabList = { }, { name: "维修完成", - key: "403,202", + key: "403,202,405,105,406", }, { name: "待付款", @@ -119,27 +131,27 @@ export const tabList = { }, { name: "待确认", - key: "201", + key: "201,405", }, { name: "待提交", - key: "401", + key: "401,105", }, { name: "待审批", key: "402,301", }, { - name: "已驳回", - key: "102,300,400", + name: "维修中", + key: "103,404", }, { - name: "维修中", - key: "103", + name: "已驳回", + key: "102,300,400", }, { - name: "维修完成", - key: "403,104,202,203,204", + name: "已完成", + key: "403,104,202,203,204,406", }, ] } diff --git a/pages.json b/pages.json index 6478957..62b1213 100644 --- a/pages.json +++ b/pages.json @@ -153,6 +153,15 @@ { "root": "pages/submission", "pages": [ + { + "path": "log", + "style": { + "navigationBarTitleText": "流程日志", + "enablePullDownRefresh": false, + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#F8F8F8" + } + }, { "path": "index", "style": { @@ -174,7 +183,7 @@ { "path": "records", "style": { - "navigationStyle": "custom", + "navigationStyle": "custom", "navigationBarTextStyle": "white" } }, diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue index 1cbe6a2..423079d 100644 --- a/pages/inspection/quest.vue +++ b/pages/inspection/quest.vue @@ -43,14 +43,14 @@ 确认 + @click.stop="openWorkOrder(item, 'task')" type="primary">确认 接单 + @click="openWorkOrder(item, 'task')" type="primary">接单 巡检 + @click="openWorkOrder(item, 'task')" type="primary">巡检 diff --git a/pages/inspection/questOrder.vue b/pages/inspection/questOrder.vue index 031beba..13b9710 100644 --- a/pages/inspection/questOrder.vue +++ b/pages/inspection/questOrder.vue @@ -134,13 +134,35 @@ + 申领物料： + + + 是 + 否 + + + + + 物料列表： + + {{ + s.detailGoodsList.length > 0 ? '修改' : '添加' }} + 查看 + + + + + 是否维修： @@ -156,7 +178,7 @@ - + + + + + + + + + + + + + + + + {{ item.name }} + {{ item.inventoryId }} + 库存数：{{ item.num }} + + 品牌：{{ item.brand }} + 型号：{{ item.xh }} + + 参数：{{ item.rule }} + + + + + + + + 取消 + 确认 + + + + \ No newline at end of file diff --git a/pages/submission/records.vue b/pages/submission/records.vue index b26e709..9b756a8 100644 --- a/pages/submission/records.vue +++ b/pages/submission/records.vue @@ -37,29 +37,32 @@ - 提报类型：{{ item.faultType }} + 维修类型：{{ item.repairTypeName }} - {{ item.faultDescribe }} + 故障描述：{{ item.faultDescribe }} 查看 - 下载 + + 日志 - - 提报 修改 确认方案 + + 确认 查看位置 - 评价 + 评价 @@ -86,13 +89,14 @@ - 确认 - 驳回 - 提交 - 确认 + 驳回 + 提交 + 维修完成 @@ -121,7 +125,7 @@ - + 请确认维修是否已经完成？ @@ -149,6 +153,11 @@ @cancel="detailsShow = false"> + + + 请确认当前工单是否维修完成？ + + @@ -195,8 +204,8 @@ export default { repairShow: false,//维修人员 去人维修完成弹框 - repairInfo:{ - closeReason:'' + repairInfo: { + closeReason: '' }, paymentShow: false,//客服确付款 @@ -207,7 +216,9 @@ export default { tabList: [],//tab状态 messageCount: 0,//消息总数展示 - requirementCode:'',//单号 + requirementCode: '',//单号 + repairTypeList: [],//维修类型列表 + repairConfirmShow: false,//客户确认维修效果弹框 }; }, computed: { @@ -238,21 +249,23 @@ export default { onLoad(options) { this.type = options.type ? options.type : '' this.requirementCode = options.requirementCode ? options.requirementCode : '' + }, + onShow() { this.$nextTick(() => { this.getMesseageTotal() if (this.type == '') { this.$refs.tabbarRef.getPermission(); } - if(this.requirementCode != ''){ + if (this.requirementCode != '') { this.current = 0 this.searchInfo.requirementCode = this.requirementCode - }else{ + } else { this.current = 1 this.changeTab(1) } - + this.getType() this.getRecordsList() }); }, @@ -275,8 +288,16 @@ export default { if (this.page.currentPage == 1) { this.orderData = []; } + newOrders.forEach(item => { + if (item.repairType < 0) { + item.repairType = '-' + } else { + let type_ = this.repairTypeList.filter(v => v.dictKey == item.repairType + '') + item.repairTypeName = type_.length <= 0 ? '' : type_[0].dictValue + } + }) - this.orderData = [...this.orderData, ...(res.data.records || [])]; + this.orderData = [...this.orderData, ...(newOrders || [])]; if (newOrders.length == 0) { this.loadingState = "nomore"; this.isNomore = true; @@ -404,6 +425,9 @@ export default { if (type == 'details') { this.detailsShow = true } + if (type == 'repairConfirm') { + this.repairConfirmShow = true + } this.rowInfo = item }, @@ -470,9 +494,10 @@ export default { repairFn() { let query = { id: this.rowInfo.id, + repairType: this.rowInfo.repairType, } - if(this.rowInfo.status==401){ - if(this.repairInfo.closeReason==''){ + if (this.rowInfo.status == 401) { + if (this.repairInfo.closeReason == '') { uni.showToast({ title: "请输入关闭原因", icon: "none" }); return false } @@ -491,8 +516,8 @@ export default { openEvaluate(item) { let param = { id: item.id, - status:item.status, - isRepair:1 + status: item.status, + isRepair: 1 } uni.navigateTo({ url: `/pages/submission/evaluate${this.$u.queryParams(param)}`, @@ -563,13 +588,64 @@ export default { }) }, goPage(item) { - uni.navigateTo({ url: item, }); - - }, + // 跳转流程日志 + openLog(item) { + let param = { + id: item.id, + status: item.status, + isRepair: 1, + requirementCode: item.requirementCode + } + uni.navigateTo({ + url: `/pages/submission/log${this.$u.queryParams(param)}`, + }); + }, + // 维修类型 + getType() { + let _params = { + current: 1, + size: 100, + parentId: "1869925082102702082", + }; + this.$u.api + .getChildList(_params) + .then((res) => { + this.repairTypeList = res.data + }) + .catch((err) => { }); + }, + // 客户确认维修效果 驳回 + repairCancelFn() { + let query={ + id: this.rowInfo.id, + repairType:this.rowInfo.repairType + } + this.$u.api.urgentRepairReject(query).then(res => { + if(res.code==200){ + uni.showToast({ title: "操作成功", icon: "none" }); + this.repairConfirmShow = false + this.getRecordsList() + } + }) + }, + // 客户确认维修效果 确认 + repairConfirmFn() { + let query={ + id: this.rowInfo.id, + repairType:this.rowInfo.repairType + } + this.$u.api.urgentRepairConfirm(query).then(res => { + if(res.code==200){ + uni.showToast({ title: "操作成功", icon: "none" }); + this.repairConfirmShow = false + this.getRecordsList() + } + }) + } }, }; diff --git a/pages/submission/sendOrders.vue b/pages/submission/sendOrders.vue index 97c36e9..dd7a23d 100644 --- a/pages/submission/sendOrders.vue +++ b/pages/submission/sendOrders.vue @@ -2,7 +2,7 @@ 提报信息 - + @@ -40,6 +40,13 @@ 派单信息 + + + + + @@ -83,25 +90,27 @@ - + 维修人员驳回 主管驳回 客户驳回 - + - - {{ detailForm.repaiRejectReason }} + + {{ detailForm.repaiRejectReason }} - {{ detailForm.approveRemark }} + {{ detailForm.approveRemark }} - + + v-if="(dataTypes == 4 && (detailForm.status == 401 || detailForm.status == 300 || detailForm.status == 105)) || (dataTypes == 3 && (detailForm.status == 402 || detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 301)"> 维修详情 @@ -111,7 +120,9 @@ class="sp-new-input-diabled" /> - + 型号：{{ item.xh }} 数量：{{ item.goodsNum }} 单位：{{ item.unit }} - 价格：{{ item.materialPrice}} + 价格：{{ item.materialPrice }} + v-if="(dataTypes == 3 && (detailForm.status == 402 || detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 301) && repairInfo.isMaterial == 1"> {{ approveInfo.totalPrice }} - 折 + 折 {{ approveInfo.discountPrice }} @@ -166,7 +178,7 @@ - + 主管审批 @@ -213,17 +225,20 @@ 确定派单 - + 取消 提交 - + 取消 提交 - + 取消 提交 @@ -284,9 +299,12 @@ - + + +