Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms into dengfei

src/views/inspectionWork/components/baseInfo.vue

@@ -472,7 +472,7 @@
             { required: true, message: '请选择质检人', trigger: 'change' }
           ],
           qualityResults: [
-            { required: true, message: '请选择质检结果', trigger: 'change' }
+            { required: true, message: '', trigger: 'change' }
           ],
           inspectionStandards: [
             { required: true, message: '请选择检验标准', trigger: 'change' }

src/views/inspectionWork/components/sampleListDialog.vue

@@ -282,7 +282,6 @@
         this.tableData = [];
         this.rowIndex = index;
         this.type = type;
-        console.log(list, 'list +++++++++');
         // console.log(list, 'lklllllllllllllllllkkkkkkkkkkkkkkkkkkkkk', list[0].qualityResults);
         //如果质检项qualitySampleTemplateList只有一条数据且质检结果是让步接收
         if (list[0].qualitySampleTemplateList.length == 1) {
@@ -293,6 +292,12 @@
               : 1;
           }
         }
+        // 默认合格
+        list.map((item)=>{
+          item.qualitySampleTemplateList && item.qualitySampleTemplateList.map((el)=>{
+            el.qualityResults = el.qualityResults ? el.qualityResults : 1
+          })
+        })
         this.tableData = JSON.parse(JSON.stringify(list));
         console.log(this.tableData, '33333333333333333');
 

src/views/inspectionWork/edit.vue

@@ -291,10 +291,14 @@
             sampleNoQualifiedNumber += el.measureQuantity - 0;
           }
         });
+        console.log(list,'list 3333')
         // 计算合格率和不合格率（百分比形式）
         let sampleQualificationRate = '';
         let sampleNoQualificationRate = '';
-        if (sampleQualifiedNumber || sampleQualifiedNumber == 0) {
+        if (
+          (sampleQualifiedNumber || sampleQualifiedNumber == 0) &&
+          sampleQuantity !== 0
+        ) {
           sampleQualificationRate =
             ((sampleQualifiedNumber / sampleQuantity) * 100).toFixed(2) || '';
           sampleNoQualificationRate =
@@ -440,10 +444,13 @@
       // 创建计量数量为1的样品清单函数，用于计数类型的
       async createSampleList(list) {
         if (this.form.qualityMode != null) {
+          this.$message.closeAll();
           this.$message('正在生成样品清单');
           const ProductSampleList = [];
+         
           for (const oldItem of list) {
-            const count = oldItem.measureQuantity;
+             console.log(oldItem,'oldItem 0000 进入循环')
+            const count = oldItem.measureQuantity ? oldItem.measureQuantity : 1;
             const newMeasureQuantity = oldItem.measureQuantity / count;
             const newWeight = parseFloat((oldItem.weight / count).toFixed(2));
 
@@ -455,11 +462,13 @@
               delete item.id;
             });
             delete oldItem.id;
+            console.log('----------------------------------',oldItem)
             if (
               oldItem.qualitySampleTemplateList == undefined ||
               oldItem.qualitySampleTemplateList == null ||
               oldItem.qualitySampleTemplateList.length == 0
             ) {
+              console.log('+++++++++++++++++++++++++')
               oldItem.qualitySampleTemplateList = JSON.parse(
                 JSON.stringify(this.schemeList)
               );
@@ -474,12 +483,14 @@
                   )
                 });
               }
+              console.log(ProductSampleList,'ProductSampleList 123');
               this.sampleList = ProductSampleList;
               const pNum = ProductSampleList.reduce((sum, item) => {
                 return sum + Number(item.weight || 0);
               }, 0);
               this.form.totalWeight = parseFloat(pNum.toFixed(2));
             } else {
+              console.log('没有质检方法')
               for (let i = 0; i < count; i++) {
                 ProductSampleList.push({
                   ...oldItem,
@@ -491,6 +502,7 @@
                   )
                 });
               }
+              console.log(ProductSampleList,'ProductSampleList 456');
               this.sampleList = ProductSampleList;
               const pNum = ProductSampleList.reduce((sum, item) => {
                 return sum + Number(item.weight || 0);
@@ -539,6 +551,7 @@
       },
       // 切换检验方式为全检后生成样品
       changeGetSampleList(list) {
+        this.$message.closeAll();
         this.$message('正在生成样品清单');
 
         // 计量类型1是数量，2是重量