diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index b8824c272..2193c7f9d 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -1012,25 +1012,25 @@ function saveRecord(sPostEvents){ //贷款比例不能大于产品配置 var cleanLeaseMoney=eval(getItemValue(0,0,"CLEAN_LEASE_MONEY"));//融资额 var EQUIP_AMT=eval(getItemValue(0,0,"EQUIP_AMT")); - var LeaseMoneyRatio = Number(cleanLeaseMoney/EQUIP_AMT).toFixed(6); + var LeaseMoneyRatio = Number(cleanLeaseMoney/EQUIP_AMT*100).toFixed(6); if(calcRules["fund"]["CLEAN_LEASE_MONEY"]){ var productCleanLeaseMoneyRatioMax = eval(calcRules["fund"]["CLEAN_LEASE_MONEY"]["LeaseMoneyRatio"]["max"]);//贷款比例上限 var productCleanLeaseMoneyRatioMin = eval(calcRules["fund"]["CLEAN_LEASE_MONEY"]["LeaseMoneyRatio"]["min"]);//贷款比例下限 var productCleanLeaseMoneyMax = eval(calcRules["fund"]["CLEAN_LEASE_MONEY"]["max"]);//融资额上限 var productCleanLeaseMoneyMin = eval(calcRules["fund"]["CLEAN_LEASE_MONEY"]["min"]);//融资额下限 - if(LeaseMoneyRatioproductCleanLeaseMoneyRatioMax){ + if(LeaseMoneyRatio=>productCleanLeaseMoneyRatioMax){ AsDebug.showMessage("提示","综合融资额比例不能大于"+productCleanLeaseMoneyRatioMax+"%","","",true); return ; } - if(cleanLeaseMoneyproductCleanLeaseMoneyMax){ + if(cleanLeaseMoney=>productCleanLeaseMoneyMax){ AsDebug.showMessage("提示","融资额不能大于"+productCleanLeaseMoneyMax,"","",true); return ; } diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 48a27fd02..0c6fbe7be 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -1102,7 +1102,7 @@ - + diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 428abd4a4..041967437 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -488,6 +488,10 @@ public class ProductCondition { sb.append("'"+key.toUpperCase()+"':"+rule+""); } } + Map cleanLeaseMoney = ProductParamUtil.getProductComponentAllParameters(productId, "PRD0350", "MoneyLimits"); + if(cleanLeaseMoney.size()>0){ + sb.append(",'CLEAN_LEASE_MONEY':{'max':'"+cleanLeaseMoney.get("MoneyUpLimits")+"','min':'"+cleanLeaseMoney.get("MoneyLowLimits")+"','LeaseMoneyRatio':{'max':'"+cleanLeaseMoney.get("LeaseMoneyRatio-MAX")+"','min':'"+cleanLeaseMoney.get("LeaseMoneyRatio-MIN")+"'}}"); + } sb.append("}"); return sb.toString(); }