|
@@ -233,6 +233,7 @@
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
|
:disabled="showArrange == '0'"
|
|
:disabled="showArrange == '0'"
|
|
|
|
|
+ @change="selectResult"
|
|
|
>
|
|
>
|
|
|
<el-option label="合格" :value="1" />
|
|
<el-option label="合格" :value="1" />
|
|
|
<el-option label="不合格" :value="2" />
|
|
<el-option label="不合格" :value="2" />
|
|
@@ -515,8 +516,8 @@
|
|
|
this.form[val].replace(/[^\d]/g, '').replace(/^0+/, '') || '0';
|
|
this.form[val].replace(/[^\d]/g, '').replace(/^0+/, '') || '0';
|
|
|
},
|
|
},
|
|
|
// *** 计算合格数 不合格数
|
|
// *** 计算合格数 不合格数
|
|
|
- quantityCalculation(e,noSetSampleList) {
|
|
|
|
|
- console.log(this.form,'执行没有');
|
|
|
|
|
|
|
+ quantityCalculation(e, noSetSampleList) {
|
|
|
|
|
+ console.log(this.form, '执行没有');
|
|
|
// return
|
|
// return
|
|
|
// return
|
|
// return
|
|
|
let qualifiedNumber = this.form.qualifiedNumber - 0;
|
|
let qualifiedNumber = this.form.qualifiedNumber - 0;
|
|
@@ -543,7 +544,11 @@
|
|
|
let failureRate = ((noQualifiedNumber / total) * 100).toFixed(2);
|
|
let failureRate = ((noQualifiedNumber / total) * 100).toFixed(2);
|
|
|
this.form.qualificationRate = passRate + '%';
|
|
this.form.qualificationRate = passRate + '%';
|
|
|
this.form.noQualificationRate = failureRate + '%';
|
|
this.form.noQualificationRate = failureRate + '%';
|
|
|
- if (this.form.qualityMode == 1 && this.form.isUnpack == 2&&!noSetSampleList) {
|
|
|
|
|
|
|
+ if (
|
|
|
|
|
+ this.form.qualityMode == 1 &&
|
|
|
|
|
+ this.form.isUnpack == 2 &&
|
|
|
|
|
+ !noSetSampleList
|
|
|
|
|
+ ) {
|
|
|
this.$emit('quantityCalculation', qualifiedNumber);
|
|
this.$emit('quantityCalculation', qualifiedNumber);
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|
|
@@ -703,8 +708,12 @@
|
|
|
this.$emit('table2');
|
|
this.$emit('table2');
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
+ //抽检需要重新计算
|
|
|
selectResult() {
|
|
selectResult() {
|
|
|
- this.$emit('quantityAssignment');
|
|
|
|
|
|
|
+ console.log(this.form.qualityMode,'this.form.qualityMode')
|
|
|
|
|
+ if (this.form.qualityMode == 2) {
|
|
|
|
|
+ this.$emit('quantityAssignment');
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|