diff --git a/src/api/eam/device/deviceInspectionMain/index.ts b/src/api/eam/device/deviceInspectionMain/index.ts index 084fee0..2330bb9 100644 --- a/src/api/eam/device/deviceInspectionMain/index.ts +++ b/src/api/eam/device/deviceInspectionMain/index.ts @@ -60,7 +60,7 @@ export const importTemplate = () => { // 检修完成 export const finishInspection = (id: number) => { - return request.get({ url: `/eam/device-inspection-job-main/onClick?id=` + id }) + return request.get({ url: `/eam/device-inspection-job-main/orderClickFinish?id=` + id }) } @@ -72,5 +72,5 @@ export const getDeviceInspectionMainNoPage = async (params) => { //验证 export const verifyOrder = async (id: number,verifyContent: string) => { - return await request.get({ url: `/eam/device-inspection-job-main/onVerify?id=`+id+`&verifyContent=` + verifyContent }) -} \ No newline at end of file + return await request.get({ url: `/eam/device-inspection-job-main/orderClickVerify?id=`+id+`&verifyContent=` + verifyContent }) +} diff --git a/src/api/eam/device/deviceMaintenanceMain/index.ts b/src/api/eam/device/deviceMaintenanceMain/index.ts index cbf5469..8684350 100644 --- a/src/api/eam/device/deviceMaintenanceMain/index.ts +++ b/src/api/eam/device/deviceMaintenanceMain/index.ts @@ -76,19 +76,19 @@ export const getDeviceMainTempList = async (type: String) => { // 完成维修工单 export const finishOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickFinish`, params}) } // 校验维修工单 export const verifyOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickVerify`, params}) } // 确认维修工单 export const confirmOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickConfirm`, params}) } diff --git a/src/api/eam/device/deviceRepair/index.ts b/src/api/eam/device/deviceRepair/index.ts index 149e64b..1751735 100644 --- a/src/api/eam/device/deviceRepair/index.ts +++ b/src/api/eam/device/deviceRepair/index.ts @@ -57,8 +57,8 @@ export const importTemplate = () => { } // 撤销申请 -export const rejected = (id: Number) => { - return request.delete({ url: '/eam/device-repair-request/rejected?id=' + id }) +export const cancel = (id: Number) => { + return request.delete({ url: '/eam/device-repair-request/cancel?id=' + id }) } diff --git a/src/api/eam/mold/moldRepair/index.ts b/src/api/eam/mold/moldRepair/index.ts index ee85c1d..e97a7d3 100644 --- a/src/api/eam/mold/moldRepair/index.ts +++ b/src/api/eam/mold/moldRepair/index.ts @@ -58,5 +58,5 @@ export const importTemplate = () => { // 撤销申请 export const rejected = (id: Number) => { - return request.delete({ url: '/eam/device-repair-request/rejected?id=' + id }) -} \ No newline at end of file + return request.delete({ url: '/eam/device-repair-request/cancel?id=' + id }) +} diff --git a/src/views/eam/device/deviceRepair/index.vue b/src/views/eam/device/deviceRepair/index.vue index 475a3f3..0ab12ff 100644 --- a/src/views/eam/device/deviceRepair/index.vue +++ b/src/views/eam/device/deviceRepair/index.vue @@ -153,7 +153,7 @@ const butttondata = (row) => { // defaultButtons.mainListEditBtn({hasPermi:'eam:deviceRepair:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:deviceRepair:delete' }), // 删除 - defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:rejected', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销 + defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:cancel', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销 ] } @@ -292,7 +292,7 @@ function handleBackout(row) { if (row.result != 'PENDING') { message.error('该报修单正在处理中,不能撤销!') } - DeviceRepairApi.rejected(row.id).then(res => { + DeviceRepairApi.cancel(row.id).then(res => { console.log("撤销成功!") getList() // 刷新当前列表 })