0412 新看板

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){

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>