|
@@ -623,8 +623,9 @@
|
|
|
return false;
|
|
|
}
|
|
|
// const amount = (rowNum((Number(item.amount) || 0) - (Number(item.arrived) || 0))) < (Number(item.arriveAmount) || 0)
|
|
|
- console.log((Number(item.amount) || 0) - (Number(item.arrived) || 0))
|
|
|
- if ((Number(item.amount) || 0) - (Number(item.arrived) || 0) < (Number(item.arriveAmount) || 0)) {
|
|
|
+ console.log(Math.pow((Number(item.amount) || 0) , (Number(item.arrived) || 0)));
|
|
|
+ console.log((Number(item.amount) || 0),(Number(item.arrived) || 0))
|
|
|
+ if ( (Number(item.amount) || 0)*10 - (Number(item.arrived) || 0)*10 /10 < (Number(item.arriveAmount) || 0)) {
|
|
|
proxy.$modal.msgError("当前的" + item.taskTypeName + "本次收款金额超过待收款金额,不可提交,请联系财务人员。");
|
|
|
return false;
|
|
|
}
|
|
@@ -764,7 +765,7 @@
|
|
|
proxy.$modal.msgError("当前的" + item.taskTypeName + "收款申请总金额超过当前服务金额,不可提交,请联系财务人员。");
|
|
|
return false;
|
|
|
}
|
|
|
- if ((Number(item.amount) || 0) - (Number(item.arrived) || 0) < (Number(item.arriveAmount) || 0)) {
|
|
|
+ if ( (Number(item.amount) || 0)*10 - (Number(item.arrived) || 0)*10 /10 < (Number(item.arriveAmount) || 0)) {
|
|
|
proxy.$modal.msgError("当前的" + item.taskTypeName + "本次收款金额超过待收款金额,不可提交,请联系财务人员。");
|
|
|
return false;
|
|
|
}
|