From 73153ffad9eb28ca892a0e282e574de1cd1c7ac5 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Wed, 12 Jun 2024 17:11:05 +0800 Subject: [PATCH] add task and plan --- src/api/mes/task/index.ts | 17 +- .../mes/bom/components/BomDetailForm.vue | 6 +- .../components/ItemRequisitionDetailForm.vue | 6 +- src/views/mes/plan/PlanForm.vue | 75 +++-- src/views/mes/plan/index.vue | 54 +++- .../task/components/TaskAddSaleDetailForm.vue | 4 +- .../tasksummary/components/TaskDetailForm.vue | 210 ++++++++++++++ .../tasksummary/components/TaskDetailList.vue | 98 +++++++ src/views/mes/tasksummary/index.vue | 261 ++++++++++++++++++ 9 files changed, 685 insertions(+), 46 deletions(-) create mode 100644 src/views/mes/tasksummary/components/TaskDetailForm.vue create mode 100644 src/views/mes/tasksummary/components/TaskDetailList.vue create mode 100644 src/views/mes/tasksummary/index.vue diff --git a/src/api/mes/task/index.ts b/src/api/mes/task/index.ts index 5f9050d5..0965db3f 100644 --- a/src/api/mes/task/index.ts +++ b/src/api/mes/task/index.ts @@ -18,7 +18,10 @@ export const TaskApi = { getTaskPage: async (params: any) => { return await request.get({ url: `/mes/task/page`, params }) }, - + // 查询生产任务单分页 + getPlanTaskPage: async (params: any) => { + return await request.get({ url: `/mes/task/pagePlanTask`, params }) + }, // 查询生产任务单详情 getTask: async (id: number) => { return await request.get({ url: `/mes/task/get?id=` + id }) @@ -76,5 +79,17 @@ export const TaskApi = { getTaskDetailListByTaskId: async (taskId) => { return await request.get({ url: `/mes/task/task-detail/list-by-task-id?taskId=` + taskId }) }, +// 获得生产任务单明细汇总列表 + getTaskDetailSummaryListByTaskId: async (taskId) => { + return await request.get({ url: `/mes/task/task-detail/summary?taskId=` + taskId }) + }, + // 获得可查询计划的生产任务单列表 + getTaskList: async () => { + return await request.get({ url: `/mes/task/getTaskList`}) + }, + // 获得生产任务单明细 + getPlanTaskList: async (i) => { + return await request.get({ url: `/mes/task/getPlanTaskList`}) + }, } diff --git a/src/views/mes/bom/components/BomDetailForm.vue b/src/views/mes/bom/components/BomDetailForm.vue index 93ffffd9..19eae9b8 100644 --- a/src/views/mes/bom/components/BomDetailForm.vue +++ b/src/views/mes/bom/components/BomDetailForm.vue @@ -71,9 +71,9 @@ - + + + diff --git a/src/views/mes/itemrequisition/components/ItemRequisitionDetailForm.vue b/src/views/mes/itemrequisition/components/ItemRequisitionDetailForm.vue index 5372022d..19d75873 100644 --- a/src/views/mes/itemrequisition/components/ItemRequisitionDetailForm.vue +++ b/src/views/mes/itemrequisition/components/ItemRequisitionDetailForm.vue @@ -39,7 +39,9 @@ @@ -113,4 +115,4 @@ const getData = () => { } defineExpose({ validate, getData }) - \ No newline at end of file + diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue index 99064bea..66ad0e76 100644 --- a/src/views/mes/plan/PlanForm.vue +++ b/src/views/mes/plan/PlanForm.vue @@ -7,36 +7,45 @@ label-width="100px" v-loading="formLoading" > - - - - - - - - - + + + + + + + + + - - - - - - - {{ dict.label }} - - - + diff --git a/src/views/mes/task/components/TaskAddSaleDetailForm.vue b/src/views/mes/task/components/TaskAddSaleDetailForm.vue index d693d85b..c27a5667 100644 --- a/src/views/mes/task/components/TaskAddSaleDetailForm.vue +++ b/src/views/mes/task/components/TaskAddSaleDetailForm.vue @@ -137,7 +137,9 @@ diff --git a/src/views/mes/tasksummary/components/TaskDetailForm.vue b/src/views/mes/tasksummary/components/TaskDetailForm.vue new file mode 100644 index 00000000..364ef02d --- /dev/null +++ b/src/views/mes/tasksummary/components/TaskDetailForm.vue @@ -0,0 +1,210 @@ + + diff --git a/src/views/mes/tasksummary/components/TaskDetailList.vue b/src/views/mes/tasksummary/components/TaskDetailList.vue new file mode 100644 index 00000000..eecbe89c --- /dev/null +++ b/src/views/mes/tasksummary/components/TaskDetailList.vue @@ -0,0 +1,98 @@ + + diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue new file mode 100644 index 00000000..1942af22 --- /dev/null +++ b/src/views/mes/tasksummary/index.vue @@ -0,0 +1,261 @@ + + +