diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index e967582..440fa07 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -4052,12 +4052,23 @@ export default { saveFAISubDetailed(this.subDetailData) .then(({ data }) => { if (data && data.code === 0) { - if (data.count > 0) { - this.subDetailData.itemResult = 'N' - this.subDetailData.unqualifiedQuantity = data.count - } + // 该项目是否可自动判定合格(数值型且维护了上下限),与后端保持一致 + const canAutoJudge = + this.subDetailData.valueTypeDb === 'N' && + (this.subDetailData.maxValue != null || + this.subDetailData.minValue != null) if (this.subDetailData.subDetailValues.length > 0) { this.subDetailData.subDetailRecordNum = 1 + // 可自动判定的项目,结论完全由子明细推导:有不合格为N,全部合格为Y + if (canAutoJudge) { + if (data.count > 0) { + this.subDetailData.itemResult = 'N' + this.subDetailData.unqualifiedQuantity = data.count + } else { + this.subDetailData.itemResult = 'Y' + this.subDetailData.unqualifiedQuantity = 0 + } + } } else { this.subDetailData.subDetailRecordNum = -1 this.subDetailData.unqualifiedQuantity = 0 diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 82d6402..642ab51 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -3303,12 +3303,23 @@ this.subDetailVisiable = true saveIQCSubDetailed(this.subDetailData).then(({data}) => { if (data && data.code === 0) { - if (data.count > 0) { - this.subDetailData.itemResult = 'N' - this.subDetailData.unqualifiedQuantity = data.count - } + // 该项目是否可自动判定合格(数值型且维护了上下限),与后端保持一致 + const canAutoJudge = + this.subDetailData.valueTypeDb === 'N' && + (this.subDetailData.maxValue != null || + this.subDetailData.minValue != null) if (this.subDetailData.subDetailValues.length > 0) { this.subDetailData.subDetailRecordNum = 1 + // 可自动判定的项目,结论完全由子明细推导:有不合格为N,全部合格为Y + if (canAutoJudge) { + if (data.count > 0) { + this.subDetailData.itemResult = 'N' + this.subDetailData.unqualifiedQuantity = data.count + } else { + this.subDetailData.itemResult = 'Y' + this.subDetailData.unqualifiedQuantity = 0 + } + } } else { this.subDetailData.subDetailRecordNum = -1 this.subDetailData.unqualifiedQuantity = 0