From 75865f417c0eee82f20843e2446e200a2cca2c1f Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Wed, 15 Apr 2026 15:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=BB=BB=E5=8A=A1=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=92=8C=E8=BF=94=E5=B7=A5=E8=AE=A2=E5=8D=95=E3=80=81?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/productionManagement/WIPChange.js | 3 +- src/api/productionManagement/reworkOrder.js | 9 + src/api/productionManagement/reworkPlan.js | 25 ++ src/api/system/role.js | 10 + .../WIPChange/components/assignDaialog.vue | 20 +- .../WIPChange/components/taskHandleDialog.vue | 8 +- .../components/taskHandleQuality.vue | 46 ++-- .../productionManagement/WIPChange/index.vue | 1 - .../productionMonitoring/index.vue | 2 + .../reworkOrder/components/reworkDetails.vue | 245 ++++++++++++++++++ .../reworkOrder/index.vue | 64 ++++- .../productionManagement/reworkPlan/index.vue | 119 +++++++-- 12 files changed, 495 insertions(+), 57 deletions(-) create mode 100644 src/api/productionManagement/reworkPlan.js create mode 100644 src/views/productionManagement/reworkOrder/components/reworkDetails.vue diff --git a/src/api/productionManagement/WIPChange.js b/src/api/productionManagement/WIPChange.js index 4a009f1..f85cd2a 100644 --- a/src/api/productionManagement/WIPChange.js +++ b/src/api/productionManagement/WIPChange.js @@ -37,4 +37,5 @@ export const taskCompleteOrder = (data) => { method: 'post', data }); -}; \ No newline at end of file +}; + diff --git a/src/api/productionManagement/reworkOrder.js b/src/api/productionManagement/reworkOrder.js index 59759e3..e929d2a 100644 --- a/src/api/productionManagement/reworkOrder.js +++ b/src/api/productionManagement/reworkOrder.js @@ -37,4 +37,13 @@ export const completeOrder = (params) => { method: 'post', data: params, }); +}; + +// 质量任务处理 dispatchMan +export const taskCompleteOrder = (data) => { + return request({ + url: '/blade-desk/disTasking/taskCompleteOrder', + method: 'post', + data + }); }; \ No newline at end of file diff --git a/src/api/productionManagement/reworkPlan.js b/src/api/productionManagement/reworkPlan.js new file mode 100644 index 0000000..513d2f8 --- /dev/null +++ b/src/api/productionManagement/reworkPlan.js @@ -0,0 +1,25 @@ +import request from '@/axios'; + +// 返工计划列表数据 /ReworkProcess/loadReworkPlan +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/ReworkProcess/loadReworkPlan', + method: 'get', + params: { + current, + size, + ...params, + }, + }); +}; + +// 返工计划详情 +export const getDetail = (params) => { + return request({ + url: '/blade-desk/ReworkProcess/reviewFormMess', + method: 'get', + params: { + ...params, + }, + }); +}; \ No newline at end of file diff --git a/src/api/system/role.js b/src/api/system/role.js index 22dfe54..b5ab12d 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -94,3 +94,13 @@ export const getRoleAlias = () => { params: {}, }); }; + + +// 按照角色别名查询数据 +export const getUserByRoleAlias = (params) => { + return request({ + url: '/blade-system/user/list-all-by-role-alias', + method: 'get', + params, + }); +}; diff --git a/src/views/productionManagement/WIPChange/components/assignDaialog.vue b/src/views/productionManagement/WIPChange/components/assignDaialog.vue index 90dc9cf..c854c15 100644 --- a/src/views/productionManagement/WIPChange/components/assignDaialog.vue +++ b/src/views/productionManagement/WIPChange/components/assignDaialog.vue @@ -3,7 +3,7 @@ - + - + @@ -37,6 +37,8 @@ import { setDispatch, getRoleUserList } from '@/api/processManagement/taskDispatch'; import { disTechnician } from '@/api/productionManagement/WIPChange.js'; +import { getUserByRoleAlias } from '@/api/system/role'; + export default { props: { @@ -55,7 +57,9 @@ export default { openShow: false, formData: { disAssignMan: null, resolution: null, ddtIdList: [] }, rules: { - disAssignMan: [{ required: true }], + disAssignMan: [ + { required: true, message: '请选择调度员', trigger: ['change', 'submit'] } + ], }, options: [], }; @@ -66,8 +70,11 @@ export default { }, methods: { getRoleUserList() { - getRoleUserList({ current: 1, size: 9999999 }).then(res => { - this.options = res.data.data.records; + // getRoleUserList({ current: 1, size: 9999999 }).then(res => { + // this.options = res.data.data.records; + // }); + getUserByRoleAlias({roleAlias:'diaodu'}).then(res => { + this.options = res.data.data; }); }, submit() { @@ -76,7 +83,8 @@ export default { let query = { ddtIdList: [this.rowItem.id], resolution: this.formData.resolution, - disAssignMan: this.formData.disAssignMan, + // disAssignMan: this.formData.disAssignMan, + dispatchMan: this.formData.disAssignMan, }; disTechnician(query).then(res => { this.$message.success('操作成功'); diff --git a/src/views/productionManagement/WIPChange/components/taskHandleDialog.vue b/src/views/productionManagement/WIPChange/components/taskHandleDialog.vue index e993e6c..33d6d10 100644 --- a/src/views/productionManagement/WIPChange/components/taskHandleDialog.vue +++ b/src/views/productionManagement/WIPChange/components/taskHandleDialog.vue @@ -9,14 +9,14 @@ > - + - + @@ -51,8 +51,8 @@ export default { openShow: false, formData: {}, rules: { - rsCode: [{ required: true }], - handleResult: [{ required: true }], + rsCode: [{ required: true, message: '请输入审理单号', trigger: ['change', 'submit'] }], + handleResult: [{ required: true, message: '请输入审理意见', trigger: ['change', 'submit'] }], }, }; }, diff --git a/src/views/productionManagement/WIPChange/components/taskHandleQuality.vue b/src/views/productionManagement/WIPChange/components/taskHandleQuality.vue index ed079c5..b0296e8 100644 --- a/src/views/productionManagement/WIPChange/components/taskHandleQuality.vue +++ b/src/views/productionManagement/WIPChange/components/taskHandleQuality.vue @@ -6,27 +6,27 @@ width="30%" @close="closeDialog" > - - + + - - + + - + + diff --git a/src/views/productionManagement/reworkOrder/index.vue b/src/views/productionManagement/reworkOrder/index.vue index ef8c2a7..c6a232f 100644 --- a/src/views/productionManagement/reworkOrder/index.vue +++ b/src/views/productionManagement/reworkOrder/index.vue @@ -13,13 +13,24 @@ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" - @on-load="onLoad" > + + @@ -30,15 +41,25 @@ @close="updateMakeQtyClose" :itemData="itemData" > + + +