Merge branch 'dev' into test

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

@@ -164,8 +164,8 @@ export default {
       immediate: true,
       deep: true,
       handler(newVal) {
-        let weightValue=parseFloat((newVal.workReportInfo.formedWeight).toFixed(2))
-        this.$set(this.item.workReportInfo,'formedWeight',weightValue)
+        // let weightValue=parseFloat((newVal.workReportInfo.formedWeight).toFixed(2))
+        // this.$set(this.item.workReportInfo,'formedWeight',weightValue)
       }
     },
   },

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

@@ -152,7 +152,6 @@ export default {
 
     watch: {
         item: {
-            immediate: true,
             deep: true,
             handler(newVal) {
                 console.log('jhsaighajighsag',newVal)
@@ -176,13 +175,10 @@ export default {
                     newVal.workReportInfo.formedNum = formedNum;
                     newVal.workReportInfo.notFormedNum = noFormingNum;
                     newVal.workReportInfo.formedWeight = parseFloat(formedWeight.toFixed(2))
-                    this.$set(this.item.workReportInfo,'formedWeight',formedWeight.toFixed(2))
+                    // this.$set(this.item.workReportInfo,'formedWeight',formedWeight.toFixed(2))
                     newVal.workReportInfo.notFormedWeight = parseFloat(notFormedWeight.toFixed(2))
-                     this.$set(this.item.workReportInfo,'notFormedWeight',notFormedWeight.toFixed(2))
+                    //  this.$set(this.item.workReportInfo,'notFormedWeight',notFormedWeight.toFixed(2))
                     this.$forceUpdate()
-                   
-
-
                 }
                 
             }

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

@@ -37,6 +37,11 @@
           {{ row.name }}
         </template>
       </el-table-column>
+      <el-table-column label="批次号" prop="batchNo" minWidth="90">
+        <template slot-scope="{ row, $index }">
+          {{ row.batchNo }}
+        </template>
+      </el-table-column>
 
       <el-table-column label="型号" prop="modelType">
         <template slot-scope="{ row, $index }">

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

@@ -378,6 +378,7 @@ export default {
       immediate: true,
       deep: true,
       handler(newVal) {
+        console.log('aaaaaa',newVal)
         if (newVal.length) {
           console.log(newVal);
           this.sumweight(newVal);

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

@@ -485,12 +485,12 @@ console.log('agasgasgs',this.taskObj.type)
         return this.$message.warning('请选择执行时间');
       }
 
-      if(this.taskObj.type !=6){
-        if(this.reportNeedFeed==1&&!(this.List[0].semiProductList.length>0||this.List[0].pickOutInList.length>0)){
-          this.loading.close();
-          return this.$message.warning('请先投料再报工');
-        }
-      }
+      // if(this.taskObj.type !=6){
+      //   if(this.reportNeedFeed==1&&!(this.List[0].semiProductList.length>0||this.List[0].pickOutInList.length>0)){
+      //     this.loading.close();
+      //     return this.$message.warning('请先投料再报工');
+      //   }
+      // }
       
 
       let bol2;

src/views/produceOrder/index.vue

@@ -491,6 +491,20 @@ export default {
             return obj && obj.label;
           }
         },
+        {
+          prop: 'deviceName',
+          slot: 'deviceName',
+          label: '设备名称',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'crewNames',
+          slot: 'crewNames',
+          label: '报工人员',
+          align: 'center',
+          showOverflowTooltip: true
+        },
 
         {
           prop: 'teamName',

src/views/warehousing/index.vue

@@ -109,6 +109,7 @@ export default {
           label: '名称',
           align: 'center'
         },
+        { label: '批次号', prop: 'batchNo', width: '90' },
         { label: '型号', prop: 'modelType', width: '150' },
         { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' },