全检不拆分

src/views/inspectionPlan/components/baseInfo.vue

@@ -471,7 +471,7 @@ export default {
       const data = await getDetailInfo(val)
       this.categoryInfo = data.category
 
-      this.$emit('getCategoryInfo', this.categoryInfo)
+      this.$emit('getCategoryInfo', data)
     },
     getsampleMeasureUnit(val) {
       this.$set(this.form, 'sampleMeasureUnit', val);

src/views/inspectionPlan/components/edit.vue

@@ -504,7 +504,7 @@ export default {
           if (resData.qualityControl != 2) {
             this.isCheck = false;
             res = [resData];
-            console.log('this.isCheck=false', this.isCheck)
+            console.log('this.isCheck=false')
           } else {
             res = []
             this.$message.error('此数据已质检，无需再次质检！');
@@ -544,17 +544,20 @@ export default {
       //全检时
       if (this.baseForm.qualityMode == 1) {
         this.sampleList = [];
-        console.log(this.baseForm.isUnpack, '---isUnpack---')
+        console.log(this.baseForm, '---isUnpack---')
         if (this.baseForm.isUnpack != null && this.baseForm.isUnpack != undefined && this.baseForm.isUnpack != '') {
           //拆包
-          if (this.baseForm.isUnpack == 2) {
-            await this.handleUnpackCase(packingList);
-          } else if (this.baseForm.isUnpack == 1) {
+          if (this.baseForm.isUnpack == 1) {
+            await this.updatePackingList(packingList);
+            // await this.handleUnpackCase(packingList);
+          } else if (this.baseForm.isUnpack == 0) {
             await this.updatePackingList(packingList);
           }
         } else {
+          console.log(this.isCheck, 'this.isCheck')
           if (!this.isCheck) {
-            await this.handleUnpackCase(packingList);
+            await this.updatePackingList(packingList);
+            // await this.handleUnpackCase(packingList);
           } else {
             await this.updatePackingList(packingList);
           }
@@ -563,6 +566,7 @@ export default {
         this.sampleList = [];
       }
     },
+    //拆包处理样品清单数据
     async handleUnpackCase(packingList) {
       const num = Number(this.baseForm.productNumber || 0);
       if (num) {
@@ -726,7 +730,9 @@ export default {
       }
     },
     getCategoryInfo(val) {
-      this.isConsumable = val.isConsumable;
+      this.baseForm.isUnpack = val.categoryWms.isUnpack;
+
+      this.isConsumable = val.category.isConsumable;
     },
     changeSamUnit(val) {
       this.$refs.baseInfoRefs.getsampleMeasureUnit(val);