From d4d05739b82c3e44a3f61d2d4113919f4160ee26 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 18 Mar 2024 18:14:05 +0800 Subject: [PATCH 1/2] plm BM --- src/views/modules/tooling/toolingInfo.vue | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue index b107087..64b95e6 100644 --- a/src/views/modules/tooling/toolingInfo.vue +++ b/src/views/modules/tooling/toolingInfo.vue @@ -282,7 +282,7 @@ @@ -698,7 +698,14 @@ }; this.visible=true; }, - changeSum(){ + changeSum(row){ + if(row.applyQty!=null&&row.applyQty!==''&& row.toolQuantity Date: Tue, 19 Mar 2024 14:40:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2024-03-19=20=E6=9B=B4=E6=96=B01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/part/bomManagement.vue | 103 ++++++++++++++++-- src/views/modules/part/routingManagement.vue | 11 +- .../com_bm_routing.vue | 12 +- 3 files changed, 106 insertions(+), 20 deletions(-) diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index e604f1a..cb7e51c 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -141,8 +141,8 @@ - 保存 - Copy + 保存 + Copy @@ -419,11 +419,24 @@ - +
- - + + + + + + + + + + + + + + + 查询 @@ -826,6 +839,10 @@ export default { operationData: { site: this.$store.state.user.site, partNo: '', + routingRevision: '', + routingType: '', + alternativeNo: '', + operationNo: '', operationName: '', }, copyBomData: { @@ -1389,6 +1406,61 @@ export default { }, ], operationDetailList: [ + { + columnProp: 'routingRevision', + headerAlign: "center", + align: "center", + columnLabel: 'Routing版本号', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'routingType', + headerAlign: "center", + align: "center", + columnLabel: '工艺类型', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'alternativeNo', + headerAlign: "center", + align: "center", + columnLabel: '替代编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 80 + }, + { + columnProp: 'alternativeDescription', + headerAlign: "center", + align: "center", + columnLabel: '替代名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'status', + headerAlign: "center", + align: "center", + columnLabel: '替代状态', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 80 + }, { columnProp: 'operationNo', headerAlign: "center", @@ -1396,10 +1468,9 @@ export default { columnLabel: '工序编码', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', + columnWidth: 80 }, { columnProp: 'operationName', @@ -1408,10 +1479,9 @@ export default { columnLabel: '工序名称', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', + columnWidth: 100 } ], columnBomDetailList: [ @@ -1577,7 +1647,8 @@ export default { componentDisableFlag: false, operationModelFlag: false, copyBomModelFlag: false, - copyAlternativeModelFlag: false + copyAlternativeModelFlag: false, + headerSaveFlag: false } }, @@ -1732,6 +1803,7 @@ export default { } this.detailDataList = [] this.subDetailList = [] + this.headerSaveFlag = true this.modalDisableFlag = false this.modalFlag = true }, @@ -2237,6 +2309,7 @@ export default { */ getRowOperationData (row) { this.componentData.operationId = row.operationId + this.componentData.operationName = row.operationName this.operationModelFlag = false }, @@ -2508,6 +2581,7 @@ export default { this.detailData = data.rows.detailData this.subDetailList = [] this.modalDisableFlag = true + this.headerSaveFlag = false this.$message({ message: '操作成功', type: 'success', @@ -2914,6 +2988,15 @@ export default { queryOperationList(this.operationData).then(({data}) => { if (data && data.code === 0) { this.operationList = data.rows + this.operationData = { + site: this.$store.state.user.site, + partNo: this.modalData.partNo, + routingRevision: '', + routingType: '', + alternativeNo: '', + operationNo: '', + operationName: '', + } this.operationModelFlag = true } else { this.$alert(data.msg, '错误', { diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 60adf9a..03f7fcb 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -132,8 +132,8 @@ - 保存 - Copy + 保存 + Copy @@ -303,7 +303,7 @@ - +
@@ -2256,7 +2256,8 @@ export default { copyAlternativeModelFlag: false, queryWorkGuidelineModal: false, saveWorkGuidelineModal: false, - workGuidelineDisableModal: false + workGuidelineDisableModal: false, + headerSaveFlag: false } }, @@ -2427,6 +2428,7 @@ export default { } this.detailDataList = [] this.subDetailList = [] + this.headerSaveFlag = true this.modalDisableFlag = false this.modalFlag = true }, @@ -3226,6 +3228,7 @@ export default { this.detailDataList = data.rows.detailDataList this.detailData = data.rows.detailData this.subDetailList = [] + this.headerSaveFlag = false this.modalDisableFlag = true this.$message({ message: '操作成功', diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index f1135b2..6e70d47 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -549,7 +549,7 @@ columnProp: 'efficiencyFactor', headerAlign: 'center', align: 'right', - columnLabel: '机器效率', + columnLabel: '效率', columnHidden: false, columnImage: false, columnSortable: false, @@ -585,7 +585,7 @@ columnProp: 'machSetupTime', headerAlign: 'center', align: 'right', - columnLabel: '调机时长', + columnLabel: '机器调机时长', columnHidden: false, columnImage: false, columnSortable: false, @@ -621,7 +621,7 @@ columnProp: 'laborRunFactor', headerAlign: 'center', align: 'right', - columnLabel: '人工效率', + columnLabel: '人工生产速度', columnHidden: false, columnImage: false, columnSortable: false, @@ -639,7 +639,7 @@ columnProp: 'laborSetupTime', headerAlign: 'center', align: 'right', - columnLabel: '人工生产速度', + columnLabel: '人工调机时长', columnHidden: false, columnImage: false, columnSortable: false, @@ -657,7 +657,7 @@ columnProp: 'crewSize', headerAlign: 'center', align: 'right', - columnLabel: '生产过程人数', + columnLabel: '生产过程中人数', columnHidden: false, columnImage: false, columnSortable: false, @@ -675,7 +675,7 @@ columnProp: 'setupCrewSize', headerAlign: 'center', align: 'right', - columnLabel: '调机过程人数', + columnLabel: '调机过程中人数', columnHidden: false, columnImage: false, columnSortable: false,