Merge branch 'dev' into test

src/views/produce/components/feeding/components/semiProductBom.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column label="批次号" type="code" minWidth="90">
         <template slot-scope="{ row, $index }">
-          {{ row.batchNo }}
+          <el-input v-model="row.batchNo" size="mini" class="content_num" :disabled="isDetails" style="width: 100%"></el-input>
         </template>
       </el-table-column>
       <el-table-column label="序列号" type="productSequence" minWidth="110">

src/views/produce/components/jobBooking/components/packingTgBom.vue

@@ -39,7 +39,7 @@
       </el-table-column>
       <el-table-column label="批次号" prop="batchNo" minWidth="90">
         <template slot-scope="{ row, $index }">
-          {{ row.batchNo }}
+          <el-input v-model="row.batchNo" size="mini" class="content_num" :disabled="isDetails" style="width: 100%"></el-input>
         </template>
       </el-table-column>
 

src/views/produce/components/jobBooking/components/semiProductBom.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column label="批次号" type="code" minWidth="110">
         <template slot-scope="{ row, $index }">
-          {{ row.batchNo }}
+          <el-input v-model="row.batchNo" size="mini" class="content_num" :disabled="isDetails" style="width: 100%"></el-input>
         </template>
       </el-table-column>
       <el-table-column label="序列号" type="productSequence" minWidth="110">

src/views/produce/components/jobBooking/index.vue

@@ -605,7 +605,9 @@ console.log('4444444444',this.List)
               key: semi.code // 使用当前时间作为key，确保唯一性
             });
           },500)
-        }else{
+        }
+
+        if(semi.semiProductList.length==0 && semi.singleReport==0){
           semi.semiProductList.map((ditem)=>{
             if(ditem.extInfo.batchReportInfo){
               ditem.extInfo.batchReportInfo.map((baItem)=>{