diff --git a/src/api/submitLog.ts b/src/api/submitLog.ts index d95368c..7d8c5c6 100644 --- a/src/api/submitLog.ts +++ b/src/api/submitLog.ts @@ -29,7 +29,7 @@ export interface SubmitLog { // 派工工单汇报记录 API export const submitLogApi = { // 分页查询 - page(params: { page: number; pageSize: number; assingStatus?: number }) { + page(params: { page: number; pageSize: number; submitStatus?: number }) { return request({ url: '/mes/report/page', method: 'get', params }) }, @@ -58,7 +58,7 @@ export const submitLogApi = { const p: Record = {} if (params?.ids?.length) p.ids = params.ids.join(',') if (params?.id !== undefined && params?.id !== null) p.id = params.id - return request({ url: `/biz/submitLog/export`, method: 'get', params: p, responseType: 'blob' }) + return request({ url: `/mes/report/export`, method: 'get', params: p, responseType: 'blob' }) }, // 导入 diff --git a/src/views/biz/orderProcessPlan/board.vue b/src/views/biz/orderProcessPlan/board.vue index 1c1161a..9a2871d 100644 --- a/src/views/biz/orderProcessPlan/board.vue +++ b/src/views/biz/orderProcessPlan/board.vue @@ -402,7 +402,7 @@ const dispatchLoading = ref(false) const dispatchformRef = ref() const dispatchform = reactive({ id: '', name: '', beginTime: '', endTime: '', quantity: '', - list: [{ sectionId:'',deviceList:'',userList: '', quantity: '' }], + list: [{ sectionId:'',deviceId:'',userList: '', quantity: '' }], }) const dispatchrules = {} @@ -608,11 +608,11 @@ function disphand(process: ProcessPlanItemVO, order?: OrderProcessPlanVO) { dispatchform.quantity = entity.quantity dispatchform.orderItemId = entity.orderItemId dispatchform.sort = entity.sort - dispatchform.list = [{ sectionId:'',deviceList:'',userList: '', quantity: '' }] + dispatchform.list = [{ sectionId:'',deviceId:'',userList: '', quantity: '' }] } function addpgnum() { - dispatchform.list.push({ sectionId:'',deviceList:'',userList: '', quantity: '' }) + dispatchform.list.push({ sectionId:'',deviceId:'',userList: '', quantity: '' }) } function deletenum(index: number) { diff --git a/src/views/biz/orderProcessPlan/pgitem.vue b/src/views/biz/orderProcessPlan/pgitem.vue index 93754c2..9a04db1 100644 --- a/src/views/biz/orderProcessPlan/pgitem.vue +++ b/src/views/biz/orderProcessPlan/pgitem.vue @@ -27,28 +27,19 @@
- + 汇报统计 -