diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue index b4d2b36..47ca20b 100644 --- a/src/views/modules/production/generateReport.vue +++ b/src/views/modules/production/generateReport.vue @@ -930,7 +930,7 @@ if(data.badData!=null){ inList.push(data.badData) } - if(data.reportData!=null){ + if(data.reportData!=null&&data.transData==null){ inList.push(data.reportData) } if(this.saveHeaderData.printQty>0){ diff --git a/src/views/modules/production/reworkRecord.vue b/src/views/modules/production/reworkRecord.vue index 761432f..fdb94cd 100644 --- a/src/views/modules/production/reworkRecord.vue +++ b/src/views/modules/production/reworkRecord.vue @@ -271,6 +271,7 @@ export default { + @@ -546,6 +547,7 @@ export default { +