From 785724e6ba8ff36873c3bd70fbdad014c8665a5e Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 21 Sep 2018 11:31:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E7=BB=84=E5=90=8E=E5=B7=A1=E8=A7=86?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=8E=B0=E5=AE=9E=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 91 ++++++++++++++++-------- 1 file changed, 62 insertions(+), 29 deletions(-) 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d4d5e65b928849f9d6f1ece90c80c2c756a43540 Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Fri, 21 Sep 2018 14:16:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=87=AA=E6=94=B9=E8=9E=8D=E8=B5=84?= =?UTF-8?q?=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=B1=BB=E5=9E=8B=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LoanBasicInfoBusiness.jsp | 24 +++++++++---------- .../etc/app/component/component-config.xml | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) 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/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 From 28aea98a9d35a5cec10e16bb6db292992ea82cb7 Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Fri, 21 Sep 2018 14:38:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=B8=8D=E8=A7=84=E5=88=99=E6=B5=8B=E7=AE=97=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/RentPlanList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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{ From ff3ecd57abf7668218c8a556023c4d0c83f71b93 Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Fri, 21 Sep 2018 14:48:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=A0=E7=BB=9F=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E8=AE=BE=E5=A4=87=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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(); From abfbe7529d9baaa17f61af64fdb3105914c1d4fa Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Fri, 21 Sep 2018 15:23:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=A0=E7=BB=9F=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductConfig/ProductSpecificInfo.jsp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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Ϊʾģ