diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index 2276316..01a2214 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -2,8 +2,11 @@
- - + + + + + @@ -396,8 +399,11 @@
- - + + + + + @@ -448,8 +454,11 @@ - - + + + + + @@ -750,8 +759,11 @@ - - + + + + + @@ -992,9 +1004,11 @@ export default { searchData: { site: this.$store.state.user.site, partNo: '', + ifsPartNo: '', + plmPartNo: '', partDesc: '', - bomType:'', - engChgLevel:'', + bomType: '', + engChgLevel: '', page: 1, limit: 10 }, @@ -1080,6 +1094,8 @@ export default { partData: { site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', page: 1, limit: 10 @@ -1087,6 +1103,8 @@ export default { componentPartData: { site: this.$store.state.user.site, partNo: '', + ifsPartNo: '', + plmPartNo: '', partDesc: '', status: '', page: 1, @@ -1096,6 +1114,8 @@ export default { type: '', site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', page: 1, limit: 10 @@ -1189,13 +1209,31 @@ export default { { userId: this.$store.state.user.name, functionId: 104002001, - serialNumber: '104002001Table1PartNo', + serialNumber: '104002001Table1PlmPartNo', tableId: '104002001Table1', tableName: 'BOM信息表', - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 104002001, + serialNumber: '104002001Table1IfsPartNo', + tableId: '104002001Table1', + tableName: 'BOM信息表', + columnProp: 'ifsPartNo', + headerAlign: 'center', + align: 'center', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -1405,10 +1443,23 @@ export default { ], partColumnList: [ { - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: "center", align: "center", - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'ifsPartNo', + headerAlign: "center", + align: "center", + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -1486,10 +1537,21 @@ export default { ], componentPartColumnList: [ { - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: "center", align: "center", - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'ifsPartNo', + headerAlign: "center", + align: "center", + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, status: true, @@ -3932,6 +3994,8 @@ export default { type: '1', site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', page: 1, limit: 10 @@ -4003,6 +4067,8 @@ export default { type: '2', site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', page: 1, limit: 10 diff --git a/src/views/modules/part/bomSearch3.vue b/src/views/modules/part/bomSearch3.vue index a871c42..8b1a45f 100644 --- a/src/views/modules/part/bomSearch3.vue +++ b/src/views/modules/part/bomSearch3.vue @@ -2,8 +2,11 @@
- - + + + + + @@ -194,6 +197,8 @@ export default { searchData: { site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', bomType: '', engChgLevel: '', @@ -232,13 +237,31 @@ export default { { userId: this.$store.state.user.name, functionId: 104009, - serialNumber: '104009Table1PartNo', + serialNumber: '104009Table1PlmPartNo', tableId: '104009Table1', tableName: 'BOMHeader表', - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 104009, + serialNumber: '104009Table1IfsPartNo', + tableId: '104009Table1', + tableName: 'BOMHeader表', + columnProp: 'ifsPartNo', + headerAlign: 'center', + align: 'center', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 4ce1cf8..2a6ca86 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -2,8 +2,11 @@
- - + + + + + @@ -123,7 +126,7 @@ BOM Routing - 转正式物料 + 转正式物料 @@ -674,80 +677,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1751,6 +1680,7 @@ limit: 10, status: '', ifsPartNo: '', + plmPartNo: '', partType: '' }, // 其它 @@ -1861,7 +1791,10 @@ fixedLeadTimeHour: '', density: undefined, variableLeadTimeHour: '', - ifsPartNo: '' + ifsPartNo: '', + plmPartNo: '', + showInQueryFlag: '', + temporaryPartFlag: '', }, revisionData: { flag: '', @@ -1985,10 +1918,10 @@ serialNumber: '104001Table1PartNo', tableId: '104001Table1', tableName: '物料信息表', - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: 'center', align: 'left', - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', columnHidden: false, columnImage: false, status: true, @@ -2004,7 +1937,7 @@ columnProp: 'ifsPartNo', headerAlign: 'center', align: 'left', - columnLabel: 'IFS料号', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, status: true, @@ -2043,22 +1976,6 @@ fixed: '', columnWidth: 100 }, - // { - // userId: this.$store.state.user.name, - // functionId: 104001, - // serialNumber: '104001Table1Spec', - // tableId: '104001Table1', - // tableName: '物料信息表', - // columnProp: 'spec', - // headerAlign: 'center', - // align: 'left', - // columnLabel: '规格型号', - // columnHidden: false, - // columnImage: false, - // status: true, - // fixed: '', - // columnWidth: 120 - // }, { userId: this.$store.state.user.name, functionId: 104001, @@ -2299,22 +2216,6 @@ fixed: '', columnWidth: 150 }, - { - userId: this.$store.state.user.name, - functionId: 104001, - serialNumber: '104001Table1PlmPartNo', - tableId: '104001Table1', - tableName: '物料信息表', - columnProp: 'plmPartNo', - headerAlign: 'center', - align: 'center', - columnLabel: 'PLM料号', - columnHidden: false, - columnImage: false, - status: true, - fixed: '', - columnWidth: 120 - }, { userId: this.$store.state.user.name, functionId: 104001, @@ -4234,7 +4135,11 @@ fixedLeadTimeHour: 0, density: undefined, variableLeadTimeHour: 0, - partItemList: [] + partItemList: [], + ifsPartNo: '', + plmPartNo: '', + showInQueryFlag: 'Y', + temporaryPartFlag: 'Y', } this.partItemList = [] this.inventoryPartTable = 'General' @@ -4346,7 +4251,11 @@ density: row.density, variableLeadTimeHour: row.variableLeadTimeHour, createDate: row.createDate, - partItemList: [] + partItemList: [], + plmPartNo: row.plmPartNo, + ifsPartNo: row.ifsPartNo, + showInQueryFlag: row.showInQueryFlag, + temporaryPartFlag: row.temporaryPartFlag, } this.getPartCharacteristicList() this.inventoryPartTable = 'General' @@ -4455,8 +4364,11 @@ createDate: row.createDate, bomAlternativeList: [], routingAlternativeList: [], + partItemList: [], ifsPartNo: '', - partItemList: [] + plmPartNo: row.plmPartNo, + showInQueryFlag: row.showInQueryFlag, + temporaryPartFlag: row.temporaryPartFlag, } this.getPartCharacteristicList() // 查出该物料的BOM和routing的替代 @@ -5847,9 +5759,9 @@ toMenu (type, row) { let path = '' - if (type === 'Routing') { + if (type === 'Routing' ) { path = 'routing' - } else if (type === 'BOM' && row.partType === 'Manufactured') { + } else if (type === 'BOM' && row.partType !== 'Manufactured Recipe') { path = 'bom' } else if (type === 'BOM' && row.partType === 'Manufactured Recipe') { path = 'recipe' diff --git a/src/views/modules/part/recipeManagement.vue b/src/views/modules/part/recipeManagement.vue index 575bca2..b160ad5 100644 --- a/src/views/modules/part/recipeManagement.vue +++ b/src/views/modules/part/recipeManagement.vue @@ -2,8 +2,11 @@
- - + + + + + @@ -252,111 +255,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 保存 @@ -405,8 +303,11 @@
- - + + + + + @@ -457,8 +358,11 @@ - - + + + + + @@ -770,8 +674,11 @@ - - + + + + + @@ -1012,6 +919,8 @@ export default { searchData: { site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', bomType:'', engChgLevel:'', @@ -1121,6 +1030,8 @@ export default { partData: { site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', page: 1, limit: 10 @@ -1128,6 +1039,8 @@ export default { componentPartData: { site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', status: '', page: 1, @@ -1137,6 +1050,8 @@ export default { type: '', site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', page: 1, limit: 10 @@ -1233,13 +1148,31 @@ export default { { userId: this.$store.state.user.name, functionId: 104002003, - serialNumber: '104002003Table1PartNo', + serialNumber: '104002003Table1PlmPartNo', tableId: '104002003Table1', tableName: 'Recipe信息表', - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 104002003, + serialNumber: '104002003Table1IfsPartNo', + tableId: '104002003Table1', + tableName: 'Recipe信息表', + columnProp: 'ifsPartNo', + headerAlign: 'center', + align: 'center', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -1449,10 +1382,23 @@ export default { ], partColumnList: [ { - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: "center", align: "center", - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'IFSPartNo', + headerAlign: "center", + align: "center", + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -1530,10 +1476,21 @@ export default { ], componentPartColumnList: [ { - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: "center", align: "center", - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'ifsPartNo', + headerAlign: "center", + align: "center", + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, status: true, @@ -3960,6 +3917,8 @@ export default { type: '1', site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', page: 1, limit: 10 @@ -4031,6 +3990,8 @@ export default { type: '2', site: this.$store.state.user.site, partNo: '', + plmPartNo: '', + ifsPartNo: '', partDesc: '', page: 1, limit: 10 diff --git a/src/views/modules/part/routingAllInfoSearch.vue b/src/views/modules/part/routingAllInfoSearch.vue index fda22ba..ce8bed3 100644 --- a/src/views/modules/part/routingAllInfoSearch.vue +++ b/src/views/modules/part/routingAllInfoSearch.vue @@ -1,8 +1,11 @@