diff --git a/src/views/modules/purchasingManagement/searchOrderRoll.vue b/src/views/modules/purchasingManagement/searchOrderRoll.vue index 6739472..da66e2b 100644 --- a/src/views/modules/purchasingManagement/searchOrderRoll.vue +++ b/src/views/modules/purchasingManagement/searchOrderRoll.vue @@ -544,6 +544,24 @@ fixed: false, columnWidth: 120 }, + { + userId: this.$store.state.user.name, + functionId: 6035, + serialNumber: '6035Table2ExpiredDate', + tableId: "6035Table", + tableName: "查询订单卷信息明细表", + columnProp: "expiredDate", + headerAlign: "center", + align: "left", + columnLabel: "失效日期", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 120 + }, { userId: this.$store.state.user.name, functionId: 6035, diff --git a/src/views/modules/purchasingManagement/searchRollInformation.vue b/src/views/modules/purchasingManagement/searchRollInformation.vue index a398453..6337274 100644 --- a/src/views/modules/purchasingManagement/searchRollInformation.vue +++ b/src/views/modules/purchasingManagement/searchRollInformation.vue @@ -376,6 +376,24 @@ fixed: false, columnWidth: 120 }, + { + userId: this.$store.state.user.name, + functionId: 6008, + serialNumber: '6008TableExpiredDate', + tableId: "6008Table", + tableName: "查询卷信息表", + columnProp: "expiredDate", + headerAlign: "center", + align: "left", + columnLabel: "失效日期", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 120 + }, { userId: this.$store.state.user.name, functionId: 6008, diff --git a/src/views/modules/yieldReport/print_roll_label.js b/src/views/modules/yieldReport/print_roll_label.js index 8a6e0fa..013b47e 100644 --- a/src/views/modules/yieldReport/print_roll_label.js +++ b/src/views/modules/yieldReport/print_roll_label.js @@ -24,7 +24,7 @@ export function printMaterialLabel(printList) { LODOP.ADD_PRINT_LINE(205,5,204,255,0,1); LODOP.ADD_PRINT_LINE(220,5,221,255,0,1); LODOP.ADD_PRINT_LINE(220,5,5,6,0,1); - LODOP.ADD_PRINT_LINE(220,256,5,257,0,1); + LODOP.ADD_PRINT_LINE(220,254,5,255,0,1); LODOP.ADD_PRINT_LINE(220,65,25,66,0,1); LODOP.ADD_PRINT_LINE(120,135,136,136,0,1); LODOP.ADD_PRINT_LINE(120,174,136,175,0,1);