|
@@ -595,8 +595,9 @@
|
|
|
}
|
|
|
for (let i = 0; i < form.value.details.length; i++) {
|
|
|
let item = form.value.details[i];
|
|
|
- if (item.arriveAmount != null && item.amount < item.arriveAmount) {
|
|
|
- proxy.$modal.msgError("当前的" + item.taskTypeName + "收款申请总金额超过当前服务金额,不可提交,请联系财务人员。");
|
|
|
+ const Amount = (Number(item.countAmount) || 0)*1000 - (Number(item.reviewAmount) || 0)*1000;
|
|
|
+ if ( item.arriveAmount + (Amount/1000) > (Number(item.amount) || 0)) {
|
|
|
+ proxy.$modal.msgError("当前的" + item.taskTypeName + "本次收款金额超过系统内存在的收款金额,不可提交,请联系财务人员。");
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
@@ -738,8 +739,9 @@
|
|
|
}
|
|
|
for (let i = 0; i < form.value.details.length; i++) {
|
|
|
let item = form.value.details[i];
|
|
|
- if (item.arriveAmount != null && item.amount < item.arriveAmount) {
|
|
|
- proxy.$modal.msgError("当前的" + item.taskTypeName + "收款申请总金额超过当前服务金额,不可提交,请联系财务人员。");
|
|
|
+ const Amount = (Number(item.countAmount) || 0)*1000 - (Number(item.reviewAmount) || 0)*1000;
|
|
|
+ if ( item.arriveAmount + (Amount/1000) > (Number(item.amount) || 0)) {
|
|
|
+ proxy.$modal.msgError("当前的" + item.taskTypeName + "本次收款金额超过系统内存在的收款金额,不可提交,请联系财务人员。");
|
|
|
return false;
|
|
|
}
|
|
|
}
|