|
|
@@ -1250,8 +1250,7 @@
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- console.log(selectedData,'selectedData')
|
|
|
-
|
|
|
+ console.log(selectedData, 'selectedData');
|
|
|
|
|
|
this.$refs.detailRef.openDia(
|
|
|
index,
|
|
|
@@ -1439,15 +1438,20 @@
|
|
|
}
|
|
|
} else {
|
|
|
this.$set(this, 'sampleList', list);
|
|
|
+
|
|
|
// console.log(this.sampleList, 'this.sampleList');
|
|
|
// return
|
|
|
// this.sampleList = list;
|
|
|
this.calculate(this.sampleList);
|
|
|
+ console.log(this.sampleList, 'this.sampleList');
|
|
|
}
|
|
|
this.activeName = '2';
|
|
|
// *** 选完批量质检调用
|
|
|
// this.countQualityResults();
|
|
|
- this.$refs.baseInfoRefs.quantityCalculation('noQualifiedNumber');
|
|
|
+ this.$refs.baseInfoRefs.quantityCalculation(
|
|
|
+ 'noQualifiedNumber',
|
|
|
+ 'noSetSampleList'
|
|
|
+ );
|
|
|
console.log('质检没有 2');
|
|
|
},
|
|
|
// 批量质检
|
|
|
@@ -1468,20 +1472,23 @@
|
|
|
}
|
|
|
|
|
|
if (this.schemeList.length != 0) {
|
|
|
- // alert(1)
|
|
|
-
|
|
|
this.sampleList.forEach((item, index) => {
|
|
|
if (item.qualitySampleTemplateList.length == 0) {
|
|
|
- let arr=JSON.parse(JSON.stringify(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.$set(
|
|
|
+ this.sampleList[index],
|
|
|
+ 'qualitySampleTemplateList',
|
|
|
+ arr
|
|
|
+ );
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
+ console.log(this.sampleList, 'dsds');
|
|
|
+
|
|
|
this.$refs.detailRef.openDia(
|
|
|
null,
|
|
|
null,
|