diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 9bb8a02..49e1ab3 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -2139,7 +2139,7 @@ columnProp: 'textValue', headerAlign: "center", align: "left", - columnLabel: '实测值', + columnLabel: '属性值', columnHidden: false, columnImage: false, status: true, diff --git a/src/views/modules/test/testSoBom/testTable.vue b/src/views/modules/test/testSoBom/testTable.vue index 5561dce..a8aed30 100644 --- a/src/views/modules/test/testSoBom/testTable.vue +++ b/src/views/modules/test/testSoBom/testTable.vue @@ -113,16 +113,17 @@ export default { status: true, fixed: '', columnWidth: 50 - },{ + }, + { userId: this.$store.state.user.name, functionId: 102001, serialNumber: '102001Table3ComponentPartNo', tableId: '102001Table3', tableName: '测试物料结构', - columnProp: 'componentPartNo', + columnProp: 'plmPartNo', headerAlign: 'center', align: 'left', - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -130,7 +131,26 @@ export default { status: true, fixed: '', columnWidth: 100 - },{ + }, + { + userId: this.$store.state.user.name, + functionId: 102001, + serialNumber: '102001Table3ComponentPartNo', + tableId: '102001Table3', + tableName: '测试物料结构', + columnProp: 'ifsPartNo', + headerAlign: 'center', + align: 'left', + columnLabel: 'IFS物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + { userId: this.$store.state.user.name, functionId: 102001, serialNumber: '102001Table3PartDesc', diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 22e3c7e..f33e258 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -1214,53 +1214,53 @@ serialNumber: '106002Table2QuotationNo', tableId: '106002Table2', tableName: '工具申请明细', - columnProp: 'orderRef2', + columnProp: 'plmPartNo', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 70 + columnWidth: 100 }, { userId: this.$store.state.user.name, functionId: 106002, - serialNumber: '106002Table2PartDesc', + serialNumber: '106002Table2IfsPartNo', tableId: '106002Table2', tableName: '工具申请明细', - columnProp: 'partDesc', + columnProp: 'ifsPartNo', headerAlign: 'center', align: 'center', - columnLabel: '物料描述', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 100 }, { userId: this.$store.state.user.name, functionId: 106002, - serialNumber: '106002Table2IfsPartNo', + serialNumber: '106002Table2PartDesc', tableId: '106002Table2', tableName: '工具申请明细', - columnProp: 'ifsPartNo', + columnProp: 'partDesc', headerAlign: 'center', align: 'center', - columnLabel: 'IFS料号', + columnLabel: '物料描述', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 70 + columnWidth: 160 }, { userId: this.$store.state.user.name, diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue index 1726a68..c4ef8d0 100644 --- a/src/views/modules/tooling/toolingInfo.vue +++ b/src/views/modules/tooling/toolingInfo.vue @@ -164,32 +164,32 @@ ref="toolTable" v-loading="dataListLoading" style="width: 100%;"> - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + +