Explorar o código

优化质检工单样品清单更新逻辑,修复质检状态列固定和

yusheng hai 9 meses
pai
achega
5703078b70

+ 0 - 1
src/views/inspectionWork/components/baseInfo.vue

@@ -233,7 +233,6 @@
               placeholder="请选择"
               style="width: 100%"
               :disabled="showArrange == '0'"
-              @change="selectResult"
             >
               <el-option label="合格" :value="1" />
               <el-option label="不合格" :value="2" />

+ 4 - 0
src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -276,6 +276,8 @@
             label="质检状态"
             prop="qualityStatus"
             align="center"
+            fixed="right"
+
             :show-overflow-tooltip="true"
           >
             <template slot-scope="scope">
@@ -855,6 +857,8 @@
           let data = JSON.parse(JSON.stringify(this.sampleList[0]));
           data['measureQuantity'] = 1;
           data['qualityResults'] = 2;
+          data['qualityStatus'] = 1;
+          
           data['id'] = '';
           data['weight'] = parseFloat(weight).toFixed(2);
           arr.push(data);

+ 19 - 5
src/views/inspectionWork/edit.vue

@@ -1250,6 +1250,8 @@
             }
           });
         }
+        console.log(selectedData,'selectedData')
+        
 
         this.$refs.detailRef.openDia(
           index,
@@ -1261,7 +1263,9 @@
         );
       },
       sampleListChange(sampleList) {
-        this.sampleList = sampleList;
+        this.$set(this, 'sampleList', sampleList);
+
+        // this.sampleList = sampleList;
       },
       inputWeight(row, index) {
         // 计算所有样本的总重量
@@ -1434,8 +1438,10 @@
             return;
           }
         } else {
-          // this.$set(this.sampleList, null, list);
-          this.sampleList = list;
+          this.$set(this, 'sampleList', list);
+          // console.log(this.sampleList, 'this.sampleList');
+          // return
+          // this.sampleList = list;
           this.calculate(this.sampleList);
         }
         this.activeName = '2';
@@ -1462,12 +1468,20 @@
         }
 
         if (this.schemeList.length != 0) {
-          this.sampleList.forEach((item) => {
+          // alert(1)
+
+          this.sampleList.forEach((item, index) => {
             if (item.qualitySampleTemplateList.length == 0) {
-              item.qualitySampleTemplateList.push(...this.schemeList);
+              let arr=JSON.parse(JSON.stringify(this.schemeList))
+              arr.forEach((el) => {
+                el.qualityResults = item.qualityResults;
+              });
+           console.log(arr,'aaa')
+              this.$set(this.sampleList[index], 'qualitySampleTemplateList', arr);
             }
           });
         }
+  
         this.$refs.detailRef.openDia(
           null,
           null,