diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
index 45f37746d..39be75602 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
@@ -103,7 +103,7 @@
//非车辆产品，融资额可编辑
String productType = Sqlca.getString(new SqlObject("select attribute2 from business_type where typeno='"+productId+"'"));
if("2".equals(productType)){
- doTemp.setReadOnly("CLEAN_LEASE_MONEY", false);
+ doTemp.setReadOnly("CLEAN_LEASE_MONEY", true);
}else{
doTemp.setVisible("CORPUS_RATIO", true);
doTemp.setVisible("CORPUS", true);
@@ -165,7 +165,6 @@ var incomeNumberYear;
var adjustType;
var count = 0;
$(function(){
- hideItem(0,'IRR');
var productName="<%=productName%>";
setItemValue(0,0,"PRODUCT_NAME",productName);
isFina();
@@ -203,7 +202,7 @@ function isFina(){
var fundRules=calcRules["fund"];
for(var key in fundRules){
var flag = getItemValue(0,0,key+"_FINA");
- if(flag=="finatype01"){
+ if(flag!="finatype02"){
setItemValue(0,0,key+"_FIRST_PAYMENT_RATIO","");
setItemValue(0,0,key+"_FINANCE","");
}
@@ -739,8 +738,7 @@ function getRatioByMoney(e){
var cleanLeaseMoney=getItemValue(0,0,"CLEAN_LEASE_MONEY");//融资额
var fundRules=calcRules["fund"];
var firstPayment=getItemValue(0,0,"FIRST_PAYMENT");//首付款
- var finalPayment=getItemValue(0,0,"FINAL_PAYMENT");//尾付款
- cleanLeaseMoney=Number(equipAmt)-Number(firstPayment)-Number(finalPayment);
+ cleanLeaseMoney=Number(equipAmt)-Number(firstPayment);
if("<%=productType%>" == "2"){
setItemValue(0,0,"CLEAN_LEASE_MONEY",cleanLeaseMoney);
if(!getItemValue(0,getRow(),"CLEAN_LEASE_MONEY")){
diff --git a/WebContent/Accounting/LoanSimulation/condition_plan.jsp b/WebContent/Accounting/LoanSimulation/condition_plan.jsp
index 5fa5ecfa4..51276fd61 100644
--- a/WebContent/Accounting/LoanSimulation/condition_plan.jsp
+++ b/WebContent/Accounting/LoanSimulation/condition_plan.jsp
@@ -13,8 +13,8 @@
//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
String sTabStrip[][] = {
{"true", "租金计划", "/Accounting/LoanSimulation/RentPlanList.jsp",params, "", "", "false"},
- {"true", "资金计划", "/Accounting/LoanSimulation/FundPlanList.jsp",params, "", "", "false"},
- {"true", "现金流", "/Accounting/LoanSimulation/CashFlowList.jsp",params, "", "", "false"},
+ //{"true", "资金计划", "/Accounting/LoanSimulation/FundPlanList.jsp",params, "", "", "false"},
+ //{"true", "现金流", "/Accounting/LoanSimulation/CashFlowList.jsp",params, "", "", "false"},
};
%>
<%@ include file="/Resources/CodeParts/Tab01.jsp"%>
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 309f3429b..ab6cabd08 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 @@
-
+
@@ -446,7 +446,7 @@
-
+
@@ -1079,9 +1079,9 @@
-
-
-
+
+
+
@@ -1095,14 +1095,14 @@
-
-
-
+
+
+
-
-
-
-
\ 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 9c677a393..54e597ee3 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -196,4 +196,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
index 8371d93ce..28d4d818e 100644
--- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index a45d1d9f2..e96f40a55 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -2960,7 +2960,10 @@
-
+
+
+
+
diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java
index 925b3d42e..1b4ef5332 100644
--- a/calc/com/tenwa/reckon/product/ProductCondition.java
+++ b/calc/com/tenwa/reckon/product/ProductCondition.java
@@ -207,7 +207,7 @@ public class ProductCondition {
String fina = ProductParamUtil.getProductParameterValue(productId, "PRD0315",col,"FINAN");
if("Y".equals(fina)){
fina = "finatype02";
- }else if("N".equals(fina)){
+ }else {
fina = "finatype01";
}
if(fee.getAttribute("itemno").getString().equals("feetype10")){
@@ -429,16 +429,26 @@ 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 handle_charge_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","HANDLING_CHARGE_MONEY","CostType09");
- String INCOME_NUMBER = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","INCOME_NUMBER");
+ //首付款比例
String CAR_FIRST_PAYMENT_RATIO = ProductParamUtil.getProductParameterValue(productId, "PRD0315","FIRST_PAYMENT","CostType09");
- doTemp.setDefaultValue("CAUTION_MONEY_RATIO",caution_money);
- doTemp.setDefaultValue("HANDLING_CHARGE_MONEY_RATIO",handle_charge_money);
- doTemp.setDefaultValue("INCOME_NUMBER",INCOME_NUMBER);
doTemp.setDefaultValue("CAR_FIRST_PAYMENT_RATIO",CAR_FIRST_PAYMENT_RATIO);
+ //保证金
+ String caution_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","CAUTION_MONEY","CostType09");
+ doTemp.setDefaultValue("CAUTION_MONEY_RATIO",caution_money);
+ //手续费
+ String handle_charge_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","HANDLING_CHARGE_MONEY","CostType09");
+ doTemp.setDefaultValue("HANDLING_CHARGE_MONEY_RATIO",handle_charge_money);
+
+ //期数
+ String INCOME_NUMBER = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","INCOME_NUMBER");
+ doTemp.setDefaultValue("INCOME_NUMBER",INCOME_NUMBER);
+ //期初/期末
+ String period_type = ProductParamUtil.getProductParameterValue(productId, "PRD0315","period_type","begin_end");
+ doTemp.setDefaultValue("PERIOD_TYPE",period_type);
+
+ //测算年利率字段
String ProductType = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductType");
String isReadOnly = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductRateReadOnly");
String YEAR_RATE = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductRate");