|
@@ -623,10 +623,10 @@
|
|
|
return false;
|
|
|
}
|
|
|
// const amount = (rowNum((Number(item.amount) || 0) - (Number(item.arrived) || 0))) < (Number(item.arriveAmount) || 0)
|
|
|
- console.log((Number(item.amount) || 0)*1000 - (Number(item.arrived) || 0)*1000 /1000)
|
|
|
const diff = (Number(item.amount) || 0)*1000 - (Number(item.arrived) || 0)*1000;
|
|
|
- if ( diff /1000 < (Number(item.arriveAmount) || 0)) {
|
|
|
- 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;
|
|
|
}
|
|
|
}
|
|
@@ -766,8 +766,9 @@
|
|
|
return false;
|
|
|
}
|
|
|
const diff = (Number(item.amount) || 0)*1000 - (Number(item.arrived) || 0)*1000;
|
|
|
- if ( diff /1000 < (Number(item.arriveAmount) || 0)) {
|
|
|
- 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;
|
|
|
}
|
|
|
}
|