Merge branch 'dev' into test

src/api/produce/workOrder.js

@@ -25,7 +25,7 @@ export async function workorderPage(data) {
 
 // 工单列表 
 export async function workorderPage2(data) {
-  const res = await request.post('/mes/workorder/taskReportPage', data);
+  const res = await request.post('/mes/workorder/taskReportPage2', data);
   if (res.data.code == 0) {
     return res.data.data;
   }

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

@@ -57,6 +57,13 @@
             }}
         </template>
       </el-table-column>
+      <el-table-column 
+        v-if="workInfo.singleReport == 1"
+       label="刻码" type="engrave">
+        <template slot-scope="{ row, $index }">
+          {{ row.extInfo.engrave }}
+        </template>
+      </el-table-column>
 
       <el-table-column label="型号" type="modelType">
         <template slot-scope="{ row, $index }">
@@ -107,13 +114,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column 
-        v-if="workInfo.singleReport == 1"
-       label="刻码" type="engrave">
-        <template slot-scope="{ row, $index }">
-          {{ row.extInfo.engrave }}
-        </template>
-      </el-table-column>
+      
 
       <el-table-column
        v-if="workInfo.singleReport == 1"

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

@@ -12,7 +12,7 @@
             @change="handleCreate">
           </el-date-picker>
         </div>
-        <el-button type="primary" size="mini" @click="save(2, 'all')">一键投料(报工)</el-button>
+        <el-button type="primary" size="mini" :loading="loadingBtn"  @click="save(2, 'all')">一键投料(报工)</el-button>
         <el-button type="primary" size="mini" @click="removeCacheFn('all')">清空缓存</el-button>
         <el-button type="primary" size="mini" @click="save(1, 'all')">缓存</el-button>
       </div>
@@ -169,6 +169,7 @@ export default {
       executorTime: '',
       isLoad: false,
       isShow: true,
+      loadingBtn: false
     };
   },
   mounted(){
@@ -391,7 +392,9 @@ export default {
       if (!isCache) {
         return false;
       }
+      this.loadingBtn=true
       batchSave(this.List).then((res) => {
+        this.loadingBtn=false
         this.$message.success('投料成功');
         this.getList(this.idsList);
       });

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

@@ -173,6 +173,9 @@ export default {
       immediate: true,
       deep: true,
       handler(newVal) {
+        // if(this.taskObj.type == 6 ){
+        //   console.log('112334',newVal)
+        // }
         // let weightValue=parseFloat((newVal.workReportInfo.formedWeight).toFixed(2))
         // this.$set(this.item.workReportInfo,'formedWeight',weightValue)
       }

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

@@ -9,13 +9,13 @@
         <div class="material">
             <div class="content_table">
                 <div class="item rx-sc">
-                    <div class="rx ww33"
+                    <!-- <div class="rx ww33"
                         v-if="Object.prototype.hasOwnProperty.call(item, 'product') && clientEnvironmentId != 3">
                         <div class="lable rx-cc">投料数量</div>
                         <div class="content">
                             {{ item.product[0] && item.product[0].feedQuantity }}
                         </div>
-                    </div>
+                    </div> -->
 
                     <div class="rx ww33">
                         <div class="lable lable100 rx-cc">要求生产数量</div>

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

@@ -392,10 +392,10 @@ export default {
         if (newVal.length) {
           console.log(newVal);
           this.newList = newVal;
-          if(this.taskObj.type != 4){
+          // if(this.taskObj.type != 4){
              this.sumweight(newVal);
              this.sunTj();
-          }
+          // }
           
 
         }
@@ -519,7 +519,8 @@ export default {
 
     getTaskFn() {
       getTaskInstanceList(this.item.workOrderId).then((res) => {
-        this.stepsList = res;
+        // this.stepsList = res;
+        this.stepsList=res.filter(item=>{return item.taskId != -2})
       });
     },
     selectVal(e, item, idx) {

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

@@ -62,7 +62,7 @@
           <semiProductJobBomPL v-if="
             objData.semiProductList &&
             (objData.semiProductList.length != 0) &&
-            objData.singleReport == 0
+            objData.singleReport == 0 && !(taskType == 6 && clientEnvironmentId == 3)
           " :list="objData.semiProductList" :item="objData" :equipmentList="objData.equipmentList" :isDetails="true" :singleReport="objData.singleReport">
           </semiProductJobBomPL>
 

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

@@ -11,7 +11,7 @@
         </el-date-picker>
       </div>
 
-      <el-button type="primary" size="mini" @click="save(2, 'all')">一键报工</el-button>
+      <el-button type="primary" size="mini" :loading="loadingBtn" @click="save(2, 'all')">一键报工</el-button>
       <el-button type="primary" size="mini" @click="removeCacheFn('all')">清空缓存</el-button>
       <el-button v-if="taskObj.type == 1" type="primary" size="mini" @click="save(1, 'all')">缓存</el-button>
     </div>
@@ -105,7 +105,7 @@
         ></semiProductBom>
         
 
-
+        <!-- 产品信息 -->
         <oneJobQualityBomPL v-if="
           item.semiProductList &&
           item.semiProductList.length != 0 &&
@@ -240,7 +240,7 @@ export default {
       warehouseList: [],
 
       loading: null,
-      
+      loadingBtn: false
     };
   },
 
@@ -647,13 +647,16 @@ console.log('4444444444',this.List)
 
 
       console.log(this.List, 'this.List');
+      this.loadingBtn=true
       jobSave(this.List)
         .then((res) => {
+          this.loadingBtn=false
           this.loading.close();
           this.$message.success('报工成功');
           this.getList(this.idsList);
         })
         .catch(() => {
+          this.loadingBtn=false
           this.loading.close();
         })
         .finally(() => {

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

@@ -155,7 +155,7 @@
 
     <template slot="footer">
       <el-button size="mini" @click="handleClose">取 消</el-button>
-      <el-button size="mini" type="primary" @click="save()">确 定</el-button>
+      <el-button size="mini" type="primary" :loading="loadingBtn" @click="save()">确 定</el-button>
     </template>
 
     <pickingList isType="pick" ref="pickingListRef" @allSelection="allSelection"></pickingList>
@@ -192,7 +192,8 @@ export default {
 
       typeName,
 
-      tableRules: {}
+      tableRules: {},
+      loadingBtn:false
     };
   },
   computed: {
@@ -309,6 +310,7 @@ export default {
     },
 
     handleClose() {
+      this.loadingBtn=false
       this.$emit('close', false);
     },
 
@@ -395,13 +397,14 @@ export default {
           ...m
         };
       });
-
+      this.loadingBtn=true
       if(this.clientEnvironmentId==21){
         let param={
           workOrderId: this.workListIds[0],
           pickingCode: this.pickCode
         }
           znfindVoucherList(param).then((res) => {
+            this.loadingBtn=false
             this.$message.success('领料成功');
           });
       }
@@ -411,6 +414,7 @@ export default {
           pickCode: this.pickCode
         };
         batchSave(param).then((res) => {
+          this.loadingBtn=false
           this.$message.success('领料成功');
           this.$emit('close', true);
         });

src/views/produce/components/routings.vue

@@ -21,8 +21,12 @@
             :key="index"
             :title="item.taskTypeName"
             @click.native="handIdx(index, item)"
-            :description="desIndex == index ? '此处' : ''"
-          ></el-step>
+          >
+            <template v-slot:description>
+              <div>投:{{  item.feedExistNum || 0  }} 报:{{item.reportExistNum  || 0}}</div>
+              <div>{{ desIndex == index ? '此处' : '' }}</div>
+            </template>
+        </el-step>
         </el-steps>
         <el-tabs type="border-card">
           <el-tab-pane label="领料记录" >

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

@@ -15,6 +15,7 @@
 
         <workOrderBom :item="item" v-if="item"></workOrderBom>
 
+        
         <!-- 报工时间 -->
         <div>
           <div class="title_box rx-bc">
@@ -25,6 +26,10 @@
           </el-date-picker>
         </div>
 
+        <div>
+          <jobDdBom :item='item' ref='jobRef' :notFormed='item.notFormedList' :warehouseList="warehouseList"></jobDdBom>
+        </div>
+
         <div v-if="
           clientEnvironmentId == 3 &&
           item.toWarehouseList &&
@@ -85,9 +90,7 @@
           
         </div>
 
-        <div>
-          <jobDdBom :item='item' ref='jobRef' :notFormed='item.notFormedList' :warehouseList="warehouseList"></jobDdBom>
-        </div>
+        
 
         <!-- item.currentTaskDiagram.type == 4 ? item.pickOutInList : item.semiProductList -->
 

src/views/warehousing/components/tgDetails.vue

@@ -217,7 +217,8 @@ export default {
 
         {
           label: '包装内总数量',
-          slot: 'quantity'
+          slot: 'quantity',
+          prop: 'quantity'
         },
 
         {