|
|
@@ -434,12 +434,12 @@
|
|
|
this.$set(
|
|
|
this.form,
|
|
|
'qualificationRate',
|
|
|
- ((qualifiedNumber / total) * 100).toFixed(2)+ '%'
|
|
|
+ ((qualifiedNumber / total) * 100).toFixed(2) + '%'
|
|
|
);
|
|
|
this.$set(
|
|
|
this.form,
|
|
|
'noQualificationRate',
|
|
|
- ((noQualifiedNumber / total) * 100).toFixed(2)+ '%'
|
|
|
+ ((noQualifiedNumber / total) * 100).toFixed(2) + '%'
|
|
|
);
|
|
|
},
|
|
|
//切换检验方式
|
|
|
@@ -1538,7 +1538,10 @@
|
|
|
this.sampleList = [];
|
|
|
this.$refs.tabsRef.tabsChange('1');
|
|
|
//检验标准 2计重 1计量
|
|
|
- if (this.form.inspectionStandards == 2 && this.form.qualityMode == 1) {
|
|
|
+ if (
|
|
|
+ [2, 3, 4, 5].includes(this.form.inspectionStandards) &&
|
|
|
+ this.form.qualityMode == 1
|
|
|
+ ) {
|
|
|
for (let i = 0; i < sData.length; i++) {
|
|
|
let qualitySampleTemplateList = [];
|
|
|
if (
|
|
|
@@ -1636,11 +1639,7 @@
|
|
|
sampleCode,
|
|
|
qualitySampleTemplateList
|
|
|
});
|
|
|
- } else if (
|
|
|
- this.form.conditionType == 2 &&
|
|
|
- (this.form.inspectionStandards == 1 ||
|
|
|
- this.form.inspectionStandards == 2)
|
|
|
- ) {
|
|
|
+ } else if (this.form.conditionType == 2) {
|
|
|
let weight = (item.weight / item.maxPossible).toFixed(2);
|
|
|
result.push({
|
|
|
...item,
|
|
|
@@ -1748,7 +1747,8 @@
|
|
|
isStandard1OrWeightSample() {
|
|
|
return (
|
|
|
this.form.inspectionStandards === 1 ||
|
|
|
- (this.form.inspectionStandards === 2 && this.form.conditionType == 2)
|
|
|
+ ([2, 3, 4, 5].includes(this.form.inspectionStandards) &&
|
|
|
+ this.form.conditionType == 2)
|
|
|
);
|
|
|
},
|
|
|
validateMeasureQuantity(measureQ, unit, sampleCount) {
|
|
|
@@ -1783,7 +1783,8 @@
|
|
|
|
|
|
isWeightStandardFullSample() {
|
|
|
return (
|
|
|
- this.form.inspectionStandards === 2 && this.form.conditionType == 1
|
|
|
+ [2, 3, 4, 5].includes(this.form.inspectionStandards) &&
|
|
|
+ this.form.conditionType == 1
|
|
|
);
|
|
|
},
|
|
|
|
