碳谷报工必填判断

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

@@ -1412,6 +1412,7 @@
 
         console.log(this.DispositionList, 'this.DispositionList');
         let packInfo = {};
+        console.log(this.warehouseId, this.DispositionList, 'this.isNewUnpack');
         if (this.isNewUnpack == 1) {
           if (this.DispositionList && this.DispositionList.length != 0) {
             packInfo = {
@@ -1471,6 +1472,7 @@
               };
             } else {
               packInfo = {
+                tier: 1,
                 isUnpack: this.objData.isUnpack
               };
             }
@@ -1511,6 +1513,7 @@
               }; // 总包装数量
             } else {
               packInfo = {
+                tier: 1,
                 isUnpack: this.objData.isUnpack
               };
             }

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

@@ -271,7 +271,7 @@
                 placeholder="请选择"
                 style="width: 160px"
                 :disabled="isDetails"
-                @change="qualityChange"
+                @change="changeQuality(row.extInfo.appearance, row)"
               >
                 <el-option
                   v-for="item in qualityList"
@@ -529,11 +529,11 @@
           {
             name: '不合格',
             value: 2
-          },
-          {
-            name: '让步接收',
-            value: 3
           }
+          // {
+          //   name: '让步接收',
+          //   value: 3
+          // }
         ],
         notTypeList: [
           {
@@ -593,6 +593,15 @@
         this.list.splice(idx, 1);
       },
 
+      changeQuality(type, item) {
+        // console.log(type, item, '质检结果');
+        if (type == 1) {
+          item.extInfo.notType = '';
+          item.extInfo.notReason = '';
+        }
+        this.qualityChange();
+      },
+
       qualityChange() {
         if (this.item.sampleQuality && this.item.sampleQuality.length != 0) {
           let formedNum = 0;

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

@@ -1033,7 +1033,7 @@
         await isJuRen().then((res) => {
           this.printStyle = res.data.printStyle;
           if (this.printStyle != 'notExist') {
-            this.getisJuRen();
+            this.getPrintData();
           }
         });
       },

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

@@ -1319,6 +1319,68 @@
         //   return false;
         // }
 
+        console.log(this.List, 'this.List1111');
+
+        if (this.clientEnvironmentId == 3) {
+          for (const item of this.List) {
+            if (item.singleReport == 0) {
+              if (item.currentTaskDiagram.type == 6) {
+                for (const it of item.sampleQuality) {
+                  const data = it.extInfo;
+                  if (data.batchReportInfo.length == 0) {
+                    if (!data.reportWeight) {
+                      this.loading.close();
+                      return this.$message.warning('报工重量不能为空');
+                    }
+                  } else if (data.batchReportInfo.length != 0) {
+                    for (const i of data.batchReportInfo) {
+                      if (i.allFeedQuantity) {
+                        if (!i.allReportWeight) {
+                          this.loading.close();
+                          return this.$message.warning('报工重量不能为空');
+                        }
+                      }
+                    }
+                  }
+                }
+              } else {
+                for (const it of item.semiProductList) {
+                  const data = it.extInfo;
+                  for (const i of data.batchReportInfo) {
+                    if (i.allFeedQuantity) {
+                      if (!i.allReportWeight) {
+                        this.loading.close();
+                        return this.$message.warning('报工重量不能为空');
+                      }
+                    }
+                  }
+
+                  for (const i of data.notBatchReportInfo) {
+                    if (i.allFeedQuantity) {
+                      if (!i.allReportWeight) {
+                        this.loading.close();
+                        return this.$message.warning('不合格品重量不能为空');
+                      }
+                    }
+                  }
+                }
+              }
+            } else {
+              if (item.currentTaskDiagram.type != 4) {
+                for (const it of item.semiProductList) {
+                  const data = it.extInfo;
+                  if (!data.reportWeight) {
+                    this.loading.close();
+                    return this.$message.warning('报工重量不能为空');
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        console.log('123456');
+
         if (this.clientEnvironmentId != 2) {
           for (let i = 0; i < this.List.length; i++) {
             for (let j = 0; j < this.List[i].productRecycleList.length; j++) {
@@ -1425,8 +1487,6 @@
 
         console.log(this.List, 'this.List');
 
-        // return;
-
         // this.List[0].product = this.List[0].semiProductList;
         this.loadingBtn = true;
         jobSave(this.List)

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

@@ -62,14 +62,14 @@
           </template>
 
           <!-- 操作列 -->
-          <!-- <template v-slot:action="{ row, $index }">
+          <template v-slot:action="{ row, $index }">
             <el-link
               type="text"
               @click="outboundDetails(row, $index)"
               v-if="dataObj.status == 2"
               >出库详情</el-link
             >
-          </template> -->
+          </template>
         </ele-pro-table>
       </div>
 
@@ -222,16 +222,16 @@
             label: '规格',
             align: 'center',
             showOverflowTooltip: true
+          },
+          {
+            prop: 'action',
+            label: '操作',
+            align: 'center',
+            fixed: 'right',
+            slot: 'action',
+            resizable: false,
+            showOverflowTooltip: true
           }
-          // {
-          //   prop: 'action',
-          //   label: '操作',
-          //   align: 'center',
-          //   fixed: 'right',
-          //   slot: 'action',
-          //   resizable: false,
-          //   showOverflowTooltip: true
-          // }
         ];
       },
 
@@ -356,7 +356,7 @@
 
       this.dataObj = obj;
 
-      // this.getOutboundDetailList();
+      this.getOutboundDetailList();
     }
   };
 </script>

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

@@ -1044,6 +1044,15 @@
         //     });
         // }
         else if (this.clientEnvironmentId == 3) {
+          for (const item of this.List) {
+            for (const it of item.semiProductList) {
+              const data = it.extInfo;
+              if (!data.reportWeight) {
+                return this.$message.warning('报工重量不能为空');
+              }
+            }
+          }
+
           let _arr = [];
 
           console.log(this.List, 'this.List');