diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
index 8861dedb8..222c5821e 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
@@ -738,20 +738,18 @@ function getRatioByMoney(e){
var firstPayment = getItemValue(0,0,"FIRST_PAYMENT");//首付款
//计算总价款
var allMoney = Number(equipAmt) + Number(getItemValue(0, 0, "INSURANCE_PREMIUM")) + Number(getItemValue(0, 0, "OTHER_MONEY"));
- if(e.id == "FIRST_PAYMENT_RATIO_0") {
- if(e.value) {
- var calcMoney = 0;
- if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "EquipEndAmt"){//比例参照项
- calcMoney = cleanLeaseMoney;
- }else if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "TOTAL_ALL"){//比例参照项
- calcMoney = allMoney;
- }else{
- calcMoney = equipAmt;
- }
- firstPayment = Number(e.value) / 100 * Number(calcMoney);
- } else {
- firstPayment = 0;
+ if(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0")) {
+ var calcMoney = 0;
+ if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "EquipEndAmt"){//比例参照项
+ calcMoney = cleanLeaseMoney;
+ }else if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "TOTAL_ALL"){//比例参照项
+ calcMoney = allMoney;
+ }else{
+ calcMoney = equipAmt;
}
+ firstPayment = Number(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0")) / 100 * Number(calcMoney);
+ } else {
+ firstPayment = 0;
}
//计算融资额
setItemValue(0, 0, "TOTAL_ALL", allMoney + "");
diff --git a/WebContent/Accounting/LoanSimulation/RentPlanList.jsp b/WebContent/Accounting/LoanSimulation/RentPlanList.jsp
index 28bf1f7d2..4047c81f4 100644
--- a/WebContent/Accounting/LoanSimulation/RentPlanList.jsp
+++ b/WebContent/Accounting/LoanSimulation/RentPlanList.jsp
@@ -75,7 +75,7 @@
{width:"350px",height:"40px",title:"上传租金计划"},function(sreturn){
if(sreturn=="true"){
var param="FlowUnid=<%=flowunid%>&calType=<%=calType%>&plannumber=<%=plannumber%>";
- window.parent.parent.AsControl.OpenView("/Accounting/LoanSimulation/LoanBasicInfo.jsp",param, "_self");
+ window.parent.parent.AsControl.OpenView("/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp",param, "_self");
}
});
}else{
diff --git a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
index 646f58174..6623ce349 100644
--- a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
+++ b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
@@ -9,7 +9,17 @@
String productID = CurPage.getParameter("ProductID");
String PG_TITLE = "产品规格详情";
BusinessObject inputParameter=SystemHelper.getPageComponentParameters(CurPage);
- ASObjectWindow dwTemp =ObjectWindowHelper.createObjectWindow_Info("PRD_ProductSpecificInfo"+productType1, inputParameter, CurPage, request);
+ ASObjectWindow dwTemp = ObjectWindowHelper.createObjectWindow_Info("PRD_ProductSpecificInfo"+productType1, inputParameter, CurPage, request);
+ if("business_product".equals(productType2)) {
+ dwTemp.getDataObject().setVisible("LeasForm", false);
+ dwTemp.getDataObject().setVisible("equip_type", false);
+ dwTemp.getDataObject().setVisible("IS_ALL_DEALER", false);
+ dwTemp.getDataObject().setVisible("IS_ALL_CAR", false);
+ dwTemp.getDataObject().setRequired("LeasForm", false);
+ dwTemp.getDataObject().setRequired("equip_type", false);
+ dwTemp.getDataObject().setRequired("IS_ALL_DEALER", false);
+ dwTemp.getDataObject().setRequired("IS_ALL_CAR", false);
+ }
ASDataObject doTemp=dwTemp.getDataObject();
//将ParaID作为参数传给显示模板
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 36fdf165e..c3d15d53d 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1105,4 +1105,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 0be5e7c3b..f59c087bf 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -2737,6 +2737,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2745,35 +2761,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -4549,6 +4537,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
index 98851aa90..c53d8ac59 100644
--- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
+++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
@@ -156,7 +156,11 @@ public class FundFundPlanExecutor {
Map cleanLeaseMoney = new HashMap();
cleanLeaseMoney.put("CostType01", "pay_type_out");
cleanLeaseMoney.put("CostType02", "PaymentTime1");
- map.put("CLEAN_LEASE_MONEY", cleanLeaseMoney);
+ if(!"business_product".equals(tcb.getProductType())) {
+ map.put("CLEAN_LEASE_MONEY", cleanLeaseMoney);
+ } else {
+ map.put("EQUIP_AMT", cleanLeaseMoney);
+ }
String custid="";
if("quoted_price".equals(tcb.getCalType())){
custid=tcb.getDocId();