diff --git a/src/api/mes/ticketManagement/index.ts b/src/api/mes/ticketManagement/index.ts index f5451d1e..08612481 100644 --- a/src/api/mes/ticketManagement/index.ts +++ b/src/api/mes/ticketManagement/index.ts @@ -13,6 +13,7 @@ export interface TicketManagementVO { jobUser?: string taskTime?: string taskEndTime?: string + cancelReason?: string remark?: string creator?: string createTime?: string @@ -41,7 +42,7 @@ export const TicketManagementApi = { return await request.download({ url: `/mes/ticket-management/export-excel`, params }) }, - batchUpdateTicketStatus: async (data: { ids: string; jobStatus: string | number }) => { + batchUpdateTicketStatus: async (data: { ids: string; jobStatus: string | number; cancelReason?: string }) => { return await request.put({ url: `/mes/ticket-management/batchUpdateStatus`, data }) }, diff --git a/src/api/mes/zjtask/index.ts b/src/api/mes/zjtask/index.ts index 184030d1..be4b5192 100644 --- a/src/api/mes/zjtask/index.ts +++ b/src/api/mes/zjtask/index.ts @@ -15,6 +15,7 @@ export interface ZjTaskVO { executorId: string executorName: string status: string + cancelReason?: string result: string createTime: string roleIds?: number[] @@ -54,6 +55,10 @@ export const ZjTaskApi = { return await request.download({ url: `/mes/zj-task/export-excel`, params }) }, + batchUpdateZjTaskStatus: async (data: { ids: string; status: string | number; cancelReason?: string }) => { + return await request.put({ url: `/mes/zj-task/batchUpdateStatus`, data }) + }, + getZjTaskResultPage: async (params: any) => { return await request.get({ url: `/mes/zj-task-results/page`, params }) }, diff --git a/src/api/mold/ticketManagement/index.ts b/src/api/mold/ticketManagement/index.ts index ebb4137d..96666854 100644 --- a/src/api/mold/ticketManagement/index.ts +++ b/src/api/mold/ticketManagement/index.ts @@ -13,6 +13,7 @@ export interface TicketManagementVO { jobUser?: string taskTime?: string taskEndTime?: string + cancelReason?: string remark?: string creator?: string createTime?: string @@ -37,7 +38,7 @@ export const TicketManagementApi = { return await request.get({ url: `/mes/mold-ticket-management/page`, params }) }, - batchUpdateTicketStatus: async (data: { ids: string; jobStatus: string | number }) => { + batchUpdateTicketStatus: async (data: { ids: string; jobStatus: string | number; cancelReason?: string }) => { return await request.put({ url: `/mes/mold-ticket-management/batchUpdateStatus`, data }) }, diff --git a/src/locales/en.ts b/src/locales/en.ts index 3866d75a..694c713e 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -2178,6 +2178,8 @@ export default { createTime: 'Create Time', operate: 'Operate', inspect: 'Inspect', + cancelTask: 'Cancel Task', + cancelSuccess: 'Cancel task successfully', exportFilename: 'Quality-InspectionTask.xls', placeholderCode: 'Please input code', placeholderType: 'Please select inspection category', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 6057349c..1dfd18f5 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1761,6 +1761,8 @@ export default { createTime: '创建时间', operate: '操作', inspect: '检验', + cancelTask: '取消任务', + cancelSuccess: '取消任务成功', exportFilename: '质量管理-检验任务.xls', placeholderCode: '请输入单号', placeholderType: '请选择质检分类', diff --git a/src/views/mes/workOrderManagement/components/TicketResultDialog.vue b/src/views/mes/workOrderManagement/components/TicketResultDialog.vue index 8b79e93c..ff3adde0 100644 --- a/src/views/mes/workOrderManagement/components/TicketResultDialog.vue +++ b/src/views/mes/workOrderManagement/components/TicketResultDialog.vue @@ -102,6 +102,13 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange" /> +