|
|
@@ -249,6 +249,7 @@
|
|
|
@handleSampleSubmit="handleSampleSubmit"
|
|
|
@getConditionType="getConditionType"
|
|
|
@countQualityResults="countQualityResults"
|
|
|
+ @getSampleQuantity="getSampleQuantity"
|
|
|
@setSchemeList="setSchemeList"
|
|
|
@sampleListChange="sampleListChange"
|
|
|
@inspectionProjectReport="inspectionProjectReport"
|
|
|
@@ -607,10 +608,11 @@
|
|
|
});
|
|
|
|
|
|
this.form.sampleNoQualificationRate =
|
|
|
- ((this.form.sampleNoQualifiedNumber / this.form.sampleQuantity) * 100).toFixed(
|
|
|
- 2
|
|
|
- ) + '%';
|
|
|
-
|
|
|
+ (
|
|
|
+ (this.form.sampleNoQualifiedNumber / this.form.sampleQuantity) *
|
|
|
+ 100
|
|
|
+ ).toFixed(2) + '%';
|
|
|
+
|
|
|
this.form.sampleQualificationRate =
|
|
|
(
|
|
|
(this.form.sampleQualifiedNumber / this.form.sampleQuantity) *
|
|
|
@@ -1063,7 +1065,7 @@
|
|
|
// data.remainingSampleCount - data.sampleQuantity;
|
|
|
this.form.taskMonadInfo = data;
|
|
|
this.form.hours = data.hours;
|
|
|
- this.getSampleQuantity()
|
|
|
+ this.getSampleQuantity();
|
|
|
console.log(this.schemeList, 'this.schemeList');
|
|
|
},
|
|
|
// 切换检验方式为全检后生成样品
|
|
|
@@ -1226,7 +1228,7 @@
|
|
|
return nowDate.year + '-' + nowDate.month + '-' + nowDate.strDate;
|
|
|
},
|
|
|
async getDetail() {
|
|
|
- getById(this.$route.query.id).then((res) => {
|
|
|
+ await getById(this.$route.query.id).then((res) => {
|
|
|
if (res.data.jobList?.length == 1) {
|
|
|
res.data.executeJobId = res.data.jobList[0].id;
|
|
|
res.data.executeJobName = res.data.jobList[0].name;
|
|
|
@@ -1290,6 +1292,7 @@
|
|
|
await this.queryQualitySamplContent();
|
|
|
// 来源清单
|
|
|
await this.getQueryQualityInventory();
|
|
|
+ console.log(this.form.recordingMethod, 'this.form.recordingMethod');
|
|
|
if (this.form.recordingMethod != 1) {
|
|
|
[
|
|
|
'retainedSampleQuantity',
|
|
|
@@ -1300,8 +1303,8 @@
|
|
|
this.form[key] =
|
|
|
this.form[key] || this.getSampleQuantityYp(key) || 0;
|
|
|
});
|
|
|
- }else{
|
|
|
- this.getSampleQuantity()
|
|
|
+ } else {
|
|
|
+ this.getSampleQuantity();
|
|
|
}
|
|
|
// this.getSampleQuantityYp()
|
|
|
},
|
