diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index 0863a0e..2263884 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -3110,6 +3110,8 @@ export default { this.modalData.partDesc = row.partDesc this.modalData.printUnit = row.printUnit this.modalData.printUnitName = row.printUnitName + this.modalData.processUnit = row.printUnit + this.modalData.processUnitName = row.printUnitName this.modalData.shrinkageFactor = new Decimal(100).sub(new Decimal(row.yieldRate)).toNumber() // 获取物料的routing版本号 getBomEngChgLevel(this.modalData).then(({data}) => { diff --git a/src/views/modules/part/bom_create.vue b/src/views/modules/part/bom_create.vue index aabaaa0..0e5ddc4 100644 --- a/src/views/modules/part/bom_create.vue +++ b/src/views/modules/part/bom_create.vue @@ -1087,43 +1087,43 @@ export default { fixed: '', columnWidth: 300 }, - ], - columnSubDetailList2: [ { userId: this.$store.state.user.name, functionId: 601002, - serialNumber: '601002Table2ConsumptionItem', + serialNumber: '601002Table2PrintUnit', tableId: '601002Table2', tableName: 'BOM子物料表', - columnProp: 'consumptionItem', + columnProp: 'printUnitName', headerAlign: 'center', align: 'center', - columnLabel: '消耗项目', + columnLabel: '物料单位', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 60 }, + ], + columnSubDetailList2: [ { userId: this.$store.state.user.name, functionId: 601002, - serialNumber: '601002Table2PrintUnit', + serialNumber: '601002Table2ConsumptionItem', tableId: '601002Table2', tableName: 'BOM子物料表', - columnProp: 'printUnitName', + columnProp: 'consumptionItem', headerAlign: 'center', align: 'center', - columnLabel: '物料单位', + columnLabel: '消耗项目', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 60 + columnWidth: 80 }, { userId: this.$store.state.user.name, @@ -1452,8 +1452,8 @@ export default { printUnitName: row.printUnitName, yieldRate: '', shrinkageFactor: row.shrinkageFactor, - processUnit: '', - processUnitName: '' + processUnit: row.printUnit, + processUnitName: row.printUnitName } this.detailData = { site: row.site, diff --git a/src/views/modules/part/quicklyCreateBom.vue b/src/views/modules/part/quicklyCreateBom.vue index cf1cdc1..103e02a 100644 --- a/src/views/modules/part/quicklyCreateBom.vue +++ b/src/views/modules/part/quicklyCreateBom.vue @@ -25,9 +25,9 @@ -
+
- 刷新 + 刷新 批量Build