|
@@ -560,14 +560,16 @@ const handleSave = () => {
|
|
|
data.lotId = lotId.value;
|
|
|
|
|
|
const max = maxQuailifiedNum.value;
|
|
|
- //判断是否超过最大合格量
|
|
|
- if (form.value.qualifiedNum > max) {
|
|
|
+ let sunm =
|
|
|
+ detailInfo.value.totalQuailifiedNum + form.value.qualifiedNum; //计算总合格数
|
|
|
+
|
|
|
+ let num = sunm - form.value.prodNum; //多出来的数量
|
|
|
+ let percent = ((sunm / form.value.prodNum) * 100).toFixed(2); //合格率
|
|
|
+ console.log("sunm", sunm);
|
|
|
+ //判断是否超过投产量
|
|
|
+ if (sunm > form.value.prodNum) {
|
|
|
//判断是否为首序
|
|
|
if (detailInfo.value.firstProcessId == form.value.processId) {
|
|
|
- let sunm =
|
|
|
- detailInfo.value.totalQuailifiedNum + form.value.qualifiedNum; //计算总合格数
|
|
|
- let num = sunm - form.value.prodNum; //多出来的数量
|
|
|
- let percent = ((sunm / form.value.prodNum) * 100).toFixed(2); //合格率
|
|
|
// 弹出确认对话框
|
|
|
proxy.$modal
|
|
|
.confirm(
|
|
@@ -587,9 +589,13 @@ const handleSave = () => {
|
|
|
return;
|
|
|
});
|
|
|
} else {
|
|
|
- proxy.$modal.msgError(
|
|
|
- "合格数不能超过投产量的103%,最大合格数为" + max
|
|
|
- );
|
|
|
+ if (form.value.qualifiedNum < max) {
|
|
|
+ updateDayworkItem();
|
|
|
+ } else {
|
|
|
+ proxy.$modal.msgError(
|
|
|
+ "合格数不能超过投产量的103%,最大合格数为" + max
|
|
|
+ );
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
updateDayworkItem();
|