重量 取样质检 批次号

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

@@ -27,11 +27,11 @@
           {{ row.code }}
         </template>
       </el-table-column>
-      <!-- <el-table-column label="批次号" type="code" minWidth="110">
+      <el-table-column label="批次号" type="code" minWidth="110">
         <template slot-scope="{ row, $index }">
-          {{ row.code }}
+          {{ row.batchNo }}
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="序列号" type="productSequence" minWidth="110">
         <template slot-scope="{ row, $index }">
           {{ row.extInfo.productSequence }}

src/views/produce/components/footBtn.vue

@@ -171,7 +171,7 @@ export default {
           if( index !==-1){
             this.btnList2.splice(0, 1);
           }
-       }else if(v==0){
+       }else if(v==0 && this.clientEnvironmentId != 3){
          let arr= {
           name: '取样质检',
           type: 'inspection',

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

@@ -27,11 +27,11 @@
           {{ row.categoryCode }}
         </template>
       </el-table-column>
-      <!-- <el-table-column label="批次号" type="code" minWidth="110">
+      <el-table-column label="批次号" type="code" minWidth="110">
         <template slot-scope="{ row, $index }">
-          {{ row.code }}
+          {{ row.batchNo }}
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="序列号" type="productSequence" minWidth="110">
         <template slot-scope="{ row, $index }">
           {{ row.extInfo.productSequence }}

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

@@ -336,9 +336,10 @@ export default {
               });
             }
 
-            if (this.taskObj.type == 6 && obj.singleReport ==1 ) {
+            if ((this.taskObj.type == 6 && obj.singleReport ==1)|| (this.clientEnvironmentId == 3 && obj.singleReport ==0)) {
               obj.semiProductList = obj.pickOutInList;
               obj.pickOutInList=[]
+              console.log('赋值了')
             }
 
             if (
@@ -376,9 +377,12 @@ export default {
               );
             }
             obj.semiProductList = obj.semiProductList.map(item => {
-              if (item['extInfo']?.reportWeight) {
-                item['extInfo'].reportWeight = ''
+              if(this.taskObj.type != 6){
+                if (item['extInfo']?.reportWeight) {
+                  item['extInfo'].reportWeight = ''
+                }
               }
+              
               console.log(item, 'item')
               return item
             })