From ae201b3d0ef3045227675e9c0fe34b92321de657 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 25 Apr 2025 17:35:34 +0800 Subject: [PATCH] =?UTF-8?q?2025-04-25=20=E5=B7=A5=E5=BA=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=EF=BC=8C=E4=BA=BA=E5=91=98=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8E=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=B8=80=E8=87=B4=20=E9=AB=98=E4=BA=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=85=A5=E7=BC=96=E7=A0=81=E8=83=BD=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BA=EF=BC=88Routing=20Tools=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=92=8C=E5=B7=A5=E5=85=B7=EF=BC=89=20Routin?= =?UTF-8?q?g=20Tools=E7=95=8C=E9=9D=A2=E5=A4=B1=E7=9C=9F=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B5=81=E8=BD=AC=E4=BF=A1=E6=81=AF=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=AF=E5=AE=A1=E6=89=B9=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/part/routingManagement.js | 5 ++ .../modules/changeManagement/changeRecord.vue | 4 -- src/views/modules/part/routingManagement.vue | 53 +++++++++++++++++-- .../processManagement/processFlowInfo.vue | 42 ++++++++++++--- 4 files changed, 88 insertions(+), 16 deletions(-) diff --git a/src/api/part/routingManagement.js b/src/api/part/routingManagement.js index c33d80c..a7b953d 100644 --- a/src/api/part/routingManagement.js +++ b/src/api/part/routingManagement.js @@ -156,3 +156,8 @@ export const queryPartListRouting = data => createAPI(`/plm/routingManagement/qu * 获取工具集合 */ export const queryToolList = data => createAPI(`/plm/routingManagement/queryToolList`,'post',data) + +/** + * 通过加工中心查人员等级 + */ +export const queryLaborClassByWorkCenterNo = data => createAPI(`/plm/routingManagement/queryLaborClassByWorkCenterNo`,'post',data) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index a006c77..a67f705 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -2771,8 +2771,6 @@ } else { this.currentRow = {} } - // 加载当前的页签的table - this.refreshCurrentTabTable() } }) } else { @@ -3291,8 +3289,6 @@ } else { this.currentRow = {} } - // 加载当前的页签的table - this.refreshCurrentTabTable() } }) }, diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 1c410ea..b28fa8d 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -412,7 +412,7 @@ - +
@@ -426,7 +426,7 @@
@@ -573,7 +574,7 @@ 工序 工序 - + @@ -981,6 +982,7 @@ import { toBecomeOfficialRouting, // 转正式Routing queryMaxOperationNo, // 查询最大工序号 queryToolList, // 获取工具集合 + queryLaborClassByWorkCenterNo, // 通过加工中心查人员等级 } from '@/api/part/routingManagement.js' import { routingSearchAlternative, // routing 替代列表查询 @@ -3611,7 +3613,30 @@ export default { }) }, - // 安全代码输入校验 + // 工序输入校验 + routingToolOperationBlur () { + let tempData = { + site: this.routingToolData.site, + partNo: this.routingToolData.partNo, + routingRevision: this.routingToolData.routingRevision, + routingType: this.routingToolData.routingType, + alternativeNo: this.routingToolData.alternativeNo, + operationNo: this.routingToolData.operationNo + } + queryOperationListByAlternative(tempData).then(({data}) => { + if (data && data.code === 0) { + if (data.rows.length > 0) { + this.routingToolData.operationId = data.rows[0].operationId + this.routingToolData.operationNo = data.rows[0].operationNo + this.routingToolData.operationName = data.rows[0].operationName + } else { + this.routingToolData.operationName = '' + } + } + }) + }, + + // 工具输入校验 routingToolBlur (tagNo) { let tempData = { tagno: tagNo, @@ -4659,6 +4684,7 @@ export default { this.componentData.workCenterNo = val.work_center_no this.componentData.workCenterDesc = val.work_center_desc this.componentData.workCenterType = val.work_center_type + this.getLaborClassByWorkCenter() } if (this.tagNo === 122) { this.routingToolData.toolId = val.tool_id @@ -4666,6 +4692,24 @@ export default { } }, + // 通过加工中心查人员等级 + getLaborClassByWorkCenter () { + let tempData = { + site: this.$store.state.user.site, + levelId: this.componentData.workCenterNo + } + queryLaborClassByWorkCenterNo(tempData).then(({data}) => { + if (data && data.code === 0) { + if (data.rows.length > 0) { + this.componentData.laborClassNo = data.rows[0].levelId + this.componentData.laborClassDesc = data.rows[0].levelDesc + this.componentData.setupLaborClassNo = data.rows[0].levelId + this.componentData.setupLaborClassDesc = data.rows[0].levelDesc + } + } + }) + }, + // 机器调机时间改变 changeMachSetupTime () { this.componentData.laborSetupTime = this.componentData.machSetupTime @@ -4689,6 +4733,7 @@ export default { this.componentData.workCenterNo = data.baseListData[0].work_center_no this.componentData.workCenterDesc = data.baseListData[0].work_center_desc this.componentData.workCenterType = data.baseListData[0].work_center_type + this.getLaborClassByWorkCenter() return } } diff --git a/src/views/modules/processManagement/processFlowInfo.vue b/src/views/modules/processManagement/processFlowInfo.vue index c775929..7dd23bd 100644 --- a/src/views/modules/processManagement/processFlowInfo.vue +++ b/src/views/modules/processManagement/processFlowInfo.vue @@ -2,25 +2,32 @@
- + - + - + - + - + - + + + + + + + + 查询 @@ -124,6 +131,7 @@ export default { nodeId: '', nodeName: '', documentNo: '', + documentStatus: '审批中', page: 1, limit: 10 }, @@ -153,6 +161,24 @@ export default { fixed: '', columnWidth: 120 }, + { + userId: this.$store.state.user.name, + functionId: 109002, + serialNumber: '109002Table1DocumentStatus', + tableId: "109002Table1", + tableName: "流程流转信息表", + columnProp: 'documentStatus', + headerAlign: "center", + align: "center", + columnLabel: '单据状态', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 90 + }, { userId: this.$store.state.user.name, functionId: 109002, @@ -161,7 +187,7 @@ export default { tableName: "流程流转信息表", columnProp: 'workflowId', headerAlign: "center", - align: "left", + align: "right", columnLabel: '流程ID', columnHidden: false, columnImage: false, @@ -196,7 +222,7 @@ export default { tableName: '流程流转信息表', columnProp: 'nodeId', headerAlign: 'center', - align: 'left', + align: 'right', columnLabel: '当前节点ID', columnHidden: false, columnImage: false,