diff --git a/src/views/modules/pad/padPart1.vue b/src/views/modules/pad/padPart1.vue index 9808d63..f430570 100644 --- a/src/views/modules/pad/padPart1.vue +++ b/src/views/modules/pad/padPart1.vue @@ -57,7 +57,7 @@ label="操作"> diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue index fc8a82a..38ae571 100644 --- a/src/views/modules/production/generateReport.vue +++ b/src/views/modules/production/generateReport.vue @@ -861,6 +861,8 @@ // this.search() let inList=[]; if(data.transData!=null){ + //他们要打印2张 + inList.push(data.transData) inList.push(data.transData) } if(data.badData!=null){ diff --git a/src/views/modules/production/shopOrderProductView.vue b/src/views/modules/production/shopOrderProductView.vue index 96b8ae8..cabebf2 100644 --- a/src/views/modules/production/shopOrderProductView.vue +++ b/src/views/modules/production/shopOrderProductView.vue @@ -162,6 +162,23 @@ serialNumber: null, columnType: null, align: 'right' + }, { + tableId: "orderView", + tableName: this.$route.meta.title, + columnProp: "firstReportDate", + columnLabel: "首次报工日期", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 60, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'center' }, { tableId: "orderView",