diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue index e860ea7..0914ea6 100644 --- a/src/views/modules/changeManagement/changeRequest.vue +++ b/src/views/modules/changeManagement/changeRequest.vue @@ -4,7 +4,7 @@ - + {{ '导出' }} + Excel导入 @@ -797,13 +798,13 @@ { userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table4finalPartNo', + serialNumber: '101002001Table4TestPartNo', tableId: "101002001Table4", tableName: "项目物料", - columnProp: "finalPartNo", + columnProp: "buNo", headerAlign: "center", align: "center", - columnLabel: "IFS物料编码", + columnLabel: "BU", columnHidden: false, columnImage: false, status: true, @@ -813,34 +814,34 @@ { userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table4TestPartNo', + serialNumber: '101002001Table4finalPartNo', tableId: "101002001Table4", tableName: "项目物料", - columnProp: "testPartNo", + columnProp: "finalPartNo", headerAlign: "center", - align: "center", - columnLabel: "物料编码", + align: "left", + columnLabel: "IFS物料编码", columnHidden: false, columnImage: false, status: true, fixed: '', - columnWidth: 120 + columnWidth: 100 }, { userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table4PartDesc', + serialNumber: '101002001Table4CustomerPartNo', tableId: "101002001Table4", tableName: "项目物料", - columnProp: "partDesc", + columnProp: "customerPartNo", headerAlign: "center", align: "left", - columnLabel: "物料描述", + columnLabel: "客户料号", columnHidden: false, columnImage: false, status: true, fixed: '', - columnWidth: 300 + columnWidth: 120 }, { userId: this.$store.state.user.name, @@ -848,10 +849,10 @@ serialNumber: '101002001Table4TestPartNo', tableId: "101002001Table4", tableName: "项目物料", - columnProp: "buNo", + columnProp: "testPartNo", headerAlign: "center", - align: "center", - columnLabel: "BU", + align: "left", + columnLabel: "物料编码", columnHidden: false, columnImage: false, status: true, @@ -864,10 +865,10 @@ serialNumber: '101002001Table4PartDesc', tableId: "101002001Table4", tableName: "项目物料", - columnProp: "buDesc", + columnProp: "partDesc", headerAlign: "center", align: "left", - columnLabel: "BU Desc", + columnLabel: "物料描述", columnHidden: false, columnImage: false, status: true, @@ -1771,7 +1772,7 @@ customerPartNo: '', spec: '', partTypeDb: '', - partType: 'Purchased (raw)', + partType: 'Manufactured', familyId: '', familyName: '', groupId: '', diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue index 0c7aea9..0ef243f 100644 --- a/src/views/modules/project/projectPart/searchProjectPart.vue +++ b/src/views/modules/project/projectPart/searchProjectPart.vue @@ -1,11 +1,27 @@