From 36dde396306027e37f1bb2e5ee16dfe79c814625 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Mon, 15 Dec 2025 09:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/processManagement/bathRefineTask.js | 4 +- src/api/processManagement/planClass.js | 17 + src/router/page/index.js | 10 + src/views/aaaaaaaaaaaaa/checkDialog.vue | 128 ++++---- .../bathRefine/accumulateClass.vue | 90 +----- .../bathRefine/addQuantity.vue | 165 ++++------ .../bathRefine/bathRefineTask.vue | 129 ++++---- ...Class.vue => addAccumulateClassDialog.vue} | 111 ++++--- ...Class.vue => addPeriodicalClassDialog.vue} | 0 .../components/addQuantityDialog.vue | 304 ++++++++++++++++++ .../components/auditBatchDialog.vue | 90 ++++++ .../bathRefine/components/auditDialog.vue | 150 ++++----- .../components/maintainBathDialog.vue | 87 +++++ .../bathRefine/components/maintainDialog.vue | 134 ++++---- .../bathRefine/components/planCheckDialog.vue | 150 +++++---- .../bathRefine/periodicalClass.vue | 4 +- .../bathRefine/planClass.vue | 21 +- .../processManagement/inPlantProcess.vue | 4 +- .../statisticalAnalysis/index.vue | 175 ++++++++++ 19 files changed, 1189 insertions(+), 584 deletions(-) rename src/views/processManagement/bathRefine/components/{addAccumulateClass.vue => addAccumulateClassDialog.vue} (82%) rename src/views/processManagement/bathRefine/components/{addPeriodicalClass.vue => addPeriodicalClassDialog.vue} (100%) create mode 100644 src/views/processManagement/bathRefine/components/addQuantityDialog.vue create mode 100644 src/views/processManagement/bathRefine/components/auditBatchDialog.vue create mode 100644 src/views/processManagement/bathRefine/components/maintainBathDialog.vue create mode 100644 src/views/productionSchedulingPlan/statisticalAnalysis/index.vue diff --git a/src/api/processManagement/bathRefineTask.js b/src/api/processManagement/bathRefineTask.js index c396c3a..13d0ba7 100644 --- a/src/api/processManagement/bathRefineTask.js +++ b/src/api/processManagement/bathRefineTask.js @@ -16,7 +16,7 @@ export const getList = (current, size, params) => { // 批量维护 export const dsBatchTask = row => { return request({ - url: '/blade-desk/dsBatchPreserveTask/update', + url: '/blade-desk/dsBatchPreserveTask/batchMaintain', method: 'post', data: row, }); @@ -24,7 +24,7 @@ export const dsBatchTask = row => { // 批量审核 export const dsBatchReview = row => { return request({ - url: '/blade-desk/dsBatchPreserveTask/update', + url: '/blade-desk/dsBatchPreserveTask/batchApproval', method: 'post', data: row, }); diff --git a/src/api/processManagement/planClass.js b/src/api/processManagement/planClass.js index 606fd5d..1fe3226 100644 --- a/src/api/processManagement/planClass.js +++ b/src/api/processManagement/planClass.js @@ -42,4 +42,21 @@ export const remove = ids => { ids, }, }); +}; + +// 计划类 主任审批 +export const directorApproval = row => { + return request({ + url: '/blade-desk/dsBatchPreservePlan/directorApproval', + method: 'post', + data:row + }); +}; +// 计划类 主任审批 +export const factoryApproval = row => { + return request({ + url: '/blade-desk/dsBatchPreservePlan/factoryApproval', + method: 'post', + data:row + }); }; \ No newline at end of file diff --git a/src/router/page/index.js b/src/router/page/index.js index 60e5c91..9b9d33a 100644 --- a/src/router/page/index.js +++ b/src/router/page/index.js @@ -90,4 +90,14 @@ export default [ isAuth: false, }, }, + { + path: '/SCHEDULING_ANALYSIS', + component: () => import(/* webpackChunkName: "page" */ '@/views/productionSchedulingPlan/statisticalAnalysis/index.vue'), + name: '排产统计分析', + meta: { + keepAlive: true, + isTab: false, + isAuth: false, + }, + }, ]; diff --git a/src/views/aaaaaaaaaaaaa/checkDialog.vue b/src/views/aaaaaaaaaaaaa/checkDialog.vue index 9861517..e05d865 100644 --- a/src/views/aaaaaaaaaaaaa/checkDialog.vue +++ b/src/views/aaaaaaaaaaaaa/checkDialog.vue @@ -1,73 +1,71 @@ - \ No newline at end of file + diff --git a/src/views/processManagement/bathRefine/accumulateClass.vue b/src/views/processManagement/bathRefine/accumulateClass.vue index 457df28..f942886 100644 --- a/src/views/processManagement/bathRefine/accumulateClass.vue +++ b/src/views/processManagement/bathRefine/accumulateClass.vue @@ -20,95 +20,11 @@ > - - - + + diff --git a/src/views/processManagement/bathRefine/components/auditBatchDialog.vue b/src/views/processManagement/bathRefine/components/auditBatchDialog.vue new file mode 100644 index 0000000..b11f812 --- /dev/null +++ b/src/views/processManagement/bathRefine/components/auditBatchDialog.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/views/processManagement/bathRefine/components/auditDialog.vue b/src/views/processManagement/bathRefine/components/auditDialog.vue index f962b12..0cb6d00 100644 --- a/src/views/processManagement/bathRefine/components/auditDialog.vue +++ b/src/views/processManagement/bathRefine/components/auditDialog.vue @@ -1,84 +1,84 @@ + + + + + - - \ No newline at end of file + diff --git a/src/views/processManagement/bathRefine/components/maintainBathDialog.vue b/src/views/processManagement/bathRefine/components/maintainBathDialog.vue new file mode 100644 index 0000000..2855fea --- /dev/null +++ b/src/views/processManagement/bathRefine/components/maintainBathDialog.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/src/views/processManagement/bathRefine/components/maintainDialog.vue b/src/views/processManagement/bathRefine/components/maintainDialog.vue index 173129b..daac124 100644 --- a/src/views/processManagement/bathRefine/components/maintainDialog.vue +++ b/src/views/processManagement/bathRefine/components/maintainDialog.vue @@ -1,70 +1,82 @@ + + + + + - - \ No newline at end of file + diff --git a/src/views/processManagement/bathRefine/components/planCheckDialog.vue b/src/views/processManagement/bathRefine/components/planCheckDialog.vue index 9861517..bbb479b 100644 --- a/src/views/processManagement/bathRefine/components/planCheckDialog.vue +++ b/src/views/processManagement/bathRefine/components/planCheckDialog.vue @@ -1,73 +1,97 @@ - \ No newline at end of file + diff --git a/src/views/processManagement/bathRefine/periodicalClass.vue b/src/views/processManagement/bathRefine/periodicalClass.vue index 7154b9b..67ff118 100644 --- a/src/views/processManagement/bathRefine/periodicalClass.vue +++ b/src/views/processManagement/bathRefine/periodicalClass.vue @@ -7,12 +7,12 @@ - +