diff --git a/src/api/labManagement/repair.js b/src/api/labManagement/repair.js index 6d74d34..004deb8 100644 --- a/src/api/labManagement/repair.js +++ b/src/api/labManagement/repair.js @@ -69,4 +69,39 @@ export const servicemanSubmit = (data) =>{ method:'post', data }) -} \ No newline at end of file +} + +// 客户确认完成 +export const customerConfirmFinish = (data) =>{ + return request({ + url:'/api/lab-ops/maintenance/repair-customer-confirm-finish', + method:'post', + data + }) +} +// 客户确认未完成 +export const customerRefuseFinish = (data) =>{ + return request({ + url:'/api/lab-ops/maintenance/repair-customer-refuse-finish', + method:'post', + data + }) +} + +//确认付款完成 +export const repairServiceConfirm = (data) =>{ + return request({ + url:'/api/lab-ops/maintenance/repair-service-confirm', + method:'post', + data + }) +} + +// 客服确认开发票 +export const repairConfirmConfirm = (data) =>{ + return request({ + url:'/api/lab-ops/maintenance/repair-service-confirm-invoice', + method:'post', + data + }) +} diff --git a/src/api/labManagement/task.js b/src/api/labManagement/task.js index 002999f..0beee6c 100644 --- a/src/api/labManagement/task.js +++ b/src/api/labManagement/task.js @@ -86,3 +86,4 @@ export const customerRefuse = (data) =>{ data }) } + diff --git a/src/views/businessManagement/inspection/repair.vue b/src/views/businessManagement/inspection/repair.vue index 0d9343f..3cf22dc 100644 --- a/src/views/businessManagement/inspection/repair.vue +++ b/src/views/businessManagement/inspection/repair.vue @@ -1,581 +1,862 @@ - \ No newline at end of file + diff --git a/src/views/businessManagement/inspection/task.vue b/src/views/businessManagement/inspection/task.vue index 450bad2..63966b6 100644 --- a/src/views/businessManagement/inspection/task.vue +++ b/src/views/businessManagement/inspection/task.vue @@ -25,8 +25,8 @@ {{ - role_id == '1839537055389515777' && row.taskStatus == 0 ? '待指派' - : role_id == '1839537055389515777' && row.taskStatus == 1 ? '待巡检' + role_id == '1839537055389515777' && row.taskStatus == 0 ? '待指派' + : role_id == '1839537055389515777' && row.taskStatus == 1 ? '待巡检' : role_id == '1839537055389515777' && (row.taskStatus == 2 || row.taskStatus == 3) ? '巡检中' : row.taskStatus == 4 ? '已完成' : role_id == '1839552581620793346' && row.taskStatus == 1 ? '待接单' @@ -440,7 +440,7 @@ - + - + \ No newline at end of file + diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue index 221adc0..8cb6ca4 100644 --- a/src/views/businessManagement/ordinary.vue +++ b/src/views/businessManagement/ordinary.vue @@ -19,42 +19,42 @@ 维修负责人1839537055389515777:1-待接单 2,3-待维修 4-维修完成 5-待评价 6-已完成 维修人:2-待确认 3-待维修 4-维修完成 5-待评价 6-已完成 领导:4-待审批 5-待评价 6-已完成 --> - - {{ row.status == 0 ? '待接单' - : (row.status == 1 || row.status == 2 || row.status == 3 || row.status == 4) ? '待维修' - : row.status == 5 ? '维修中' : row.status == 6 ? '维修完成' : row.status == '7' ? '待付款' - : (row.status == 8 && row.totalPrice < 0) ? '已完成' - : (row.status == 8 && row.totalPrice > 0) ? '待开发票' + {{ row.status == 0 ? '待接单' + : (row.status == 1 || row.status == 2 || row.status == 3 || row.status == 4) ? '待维修' + : row.status == 5 ? '维修中' : row.status == 6 ? '维修完成' : row.status == '7' ? '待付款' + : (row.status == 8 && row.totalPrice < 0) ? '已完成' + : (row.status == 8 && row.totalPrice > 0) ? '待开发票' : row.status == 9 ? '已开发票' : '' }} - - {{row.status == 0 ? '已驳回' : row.status == 1 ? '待确认' : row.status == 2 ? '待提交' - : (row.status == 3 || row.status == 4) ? '待审批' - : row.status == 5 ? '维修中' + {{row.status == 0 ? '已驳回' : row.status == 1 ? '待确认' : row.status == 2 ? '待提交' + : (row.status == 3 || row.status == 4) ? '待审批' + : row.status == 5 ? '维修中' : (row.status == 6 || row.status == 7 || row.status == 8 || row.status == 9) ? '维修完成' : '' }} - - {{ row.status == 2 ? '已驳回' : row.status == 3 ? '待审批' : row.status == 4 ? '已通过' : row.status == 5 ? '维修中' : row.status == 6 ? '维修完成' : row.status == 7 ? '待付款' - : (row.status == 8 && row.totalPrice < 0) ? '已完成' - : (row.status == 8 && row.totalPrice > 0) ? '待开发票' - : row.status == 9 ? '已开发票' : '' }} + {{ row.status == 2 ? '已驳回' : row.status == 3 ? '待审批' : row.status == 4 ? '已通过' : row.status == 5 ? '维修中' : row.status == 6 ? '维修完成' : row.status == 7 ? '待付款' + : (row.status == 8 && row.totalPrice < 0) ? '已完成' + : (row.status == 8 && row.totalPrice > 0) ? '待开发票' + : row.status == 9 ? '已开发票' : '' }}