diff --git a/api/api.js b/api/api.js index 39a8252..5267865 100644 --- a/api/api.js +++ b/api/api.js @@ -317,23 +317,23 @@ const install = (Vue, vm) => { authorizations: true, isparams: false }) - // 客户 确认完成 lab-ops/maintenance/repair-custome-refuse-finish - let repairConfirmFinish = (params) => http.post('/lab-ops/maintenance/repair-custome-confirm-finish', params, { + // 客户 确认完成 + let repairConfirmFinish = (params) => http.post('/lab-ops/maintenance/repair-customer-confirm-finish', params, { authorizations: true, isparams: false }) - // 客户 确认未完成 - let repairRefuseFinish = (params) => http.post('/lab-ops/maintenance/repair-custome-refuse-finish', params, { + // 客户 确认未完成 + let repairRefuseFinish = (params) => http.post('/lab-ops/maintenance/repair-customer-refuse-finish', params, { authorizations: true, isparams: false }) - // 客服 确认付款 lab-ops/maintenance/repair-service-confirm-invoic - let confirmInvoic = (params) => http.post('/lab-ops/maintenance/repair-service-confirm-invoic', params, { + // 客服 确认付款 + let confirmPayment = (params) => http.post('/lab-ops/maintenance/repair-service-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 ,confirmInvoic}; + 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}; } export default { diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue index 271003f..d06af63 100644 --- a/pages/inspection/quest.vue +++ b/pages/inspection/quest.vue @@ -281,7 +281,7 @@ export default { type: 'view' } uni.navigateTo({ - url: `/pages/inspection/questOrder${this.$u.queryParams(param)}`, + url: `/pages/inspection/questDetails${this.$u.queryParams(param)}`, }); }, //跳转工单 @@ -359,7 +359,7 @@ export default { } this.BetLoading.show(); - this.$u.api.confirmInvoic(query).then(res => { + this.$u.api.confirmPayment(query).then(res => { this.paymentShow = false this.BetLoading.hide(); if (res.code == 200) { @@ -427,7 +427,7 @@ export default { if ((item == 5 && this.dataTypes == 3) || (item == 5 && this.dataTypes == 4)) { return '维修完成' } - if ((item == 6 && this.dataTypes == 3) || (item == 6 && this.dataTypes == 2)) { + if ((item == 6 && this.dataTypes == 3) || (item == 6 && this.dataTypes == 2)||(item == 6 && this.dataTypes == 1)) { return '待付款' } diff --git a/pages/inspection/questDetails.vue b/pages/inspection/questDetails.vue index 47f5fa2..8ec578c 100644 --- a/pages/inspection/questDetails.vue +++ b/pages/inspection/questDetails.vue @@ -34,10 +34,7 @@ 巡检任务 - - 保存 - 提交 - +