diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
index 84eef7ff3..d48d75542 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
@@ -180,16 +180,17 @@ $(function(){
});
}
}
+ CalcControl.InitLsaseTerm();
CalcControl.PeriodTypeView();
CalcControl.SettleMethodView();
changeSettleMethod2();
changeRateType();
CalcControl.RentOrRateView();
+
count++;
}else{
changeSettleMethod3();
}
-
});
function importCustomerQuot(){
@@ -717,11 +718,13 @@ function changeRateType(){
//根据金额算比例
function getRatioByMoney(e){
+ debugger;
var equipAmt=getItemValue(0,0,"EQUIP_AMT");//设备款
var cleanLeaseMoney=getItemValue(0,0,"CLEAN_LEASE_MONEY");//融资额
var fundRules=calcRules["fund"];
var firstPayment=getItemValue(0,0,"FIRST_PAYMENT");//首付款
- cleanLeaseMoney=Number(equipAmt)-Number(firstPayment);
+ var finalPayment=getItemValue(0,0,"FINAL_PAYMENT");//尾付款
+ cleanLeaseMoney=Number(equipAmt)-Number(firstPayment)-Number(finalPayment);
if("<%=productType%>" == "2"){
setItemValue(0,0,"CLEAN_LEASE_MONEY",cleanLeaseMoney);
if(!getItemValue(0,getRow(),"CLEAN_LEASE_MONEY")){
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index e0cc863c3..8c4d7cff9 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -27,7 +27,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -1080,7 +1080,7 @@
-
+
@@ -1095,10 +1095,13 @@
-
+
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
index 7f92a0718..3847a095d 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -167,7 +167,7 @@
-
+
diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
index f26963aa5..22425a72e 100644
--- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
@@ -1,4 +1,6 @@
+
+
@@ -6,23 +8,18 @@
-
-
-
-
-
@@ -58,4 +55,7 @@
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
index 745c5c90a..96176c8d8 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
@@ -1643,6 +1643,8 @@
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index ca9643a29..c31a50a28 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -2820,7 +2820,6 @@
-
@@ -2944,7 +2943,9 @@
-
+
+
+
diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java
index 799c52b6b..7f5f3e22c 100644
--- a/calc/com/tenwa/reckon/product/ProductCondition.java
+++ b/calc/com/tenwa/reckon/product/ProductCondition.java
@@ -39,6 +39,7 @@ public class ProductCondition {
this.getProductAdjustRules(doTemp, productId);//调息
this.getGrossRules(doTemp, productId);//
//this.setDateRule(doTemp, productId);//日期
+ this.getCautionRatio(doTemp, productId);//保证金比例
return sb.toString();
}
@@ -409,7 +410,6 @@ public class ProductCondition {
}
}
}
-
}
public String getSqlWhere(String condition){
String[] conds=condition.split(",");
@@ -420,5 +420,11 @@ public class ProductCondition {
}
return s;
}
-
+ //获取保证金比例
+ public void getCautionRatio(ASObjectModel doTemp,String productId) throws Exception{
+ String caution_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","CAUTION_MONEY","CostType09");
+ String INCOME_NUMBER = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","INCOME_NUMBER");
+ doTemp.setDefaultValue("CAUTION_MONEY_RATIO",caution_money);
+ doTemp.setDefaultValue("INCOME_NUMBER",INCOME_NUMBER);
+ }
}