From e71e7134589f3e9c592a531e72e00a26d748bbad Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 7 Aug 2024 10:48:55 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/production/generateReport.vue | 2 +-
 src/views/modules/production/reworkRecord.vue   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 {
           <el-option value="检验返工" label="检验返工"></el-option>
           <el-option value="包装返工" label="包装返工"></el-option>
           <el-option value="外协返工" label="外协返工"></el-option>
+          <el-option value="加工返工" label="加工返工"></el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -546,6 +547,7 @@ export default {
               <el-option value="检验返工" label="检验返工"></el-option>
               <el-option value="包装返工" label="包装返工"></el-option>
               <el-option value="外协返工" label="外协返工"></el-option>
+              <el-option value="加工返工" label="加工返工"></el-option>
             </el-select>
           </el-form-item>
         </el-col>