From 6899ba0bbb1d9a83c48837efe99f2d7fa746d8c6 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 1 Aug 2018 18:36:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=AA=E6=9C=89=E4=BF=A1=E5=AE=A1=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=89=8D=E8=83=BD=E7=9C=8B=E5=88=B0=E8=9E=8D=E7=A7=9F?= =?UTF-8?q?=E6=AF=94=202.=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE=E6=89=8B?= =?UTF-8?q?=E7=BB=AD=E8=B4=B9=E5=A2=9E=E5=8A=A0=E5=88=86=E6=91=8A=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=203.=E5=88=A0=E9=99=A4=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD=E6=8A=B5=E6=89=A3=E7=BB=8F?= =?UTF-8?q?=E9=94=80=E5=95=86=E8=B4=B4=E6=81=AF=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E6=96=B9=E6=B3=95=E8=BF=90=E7=AE=97=E4=B8=AD=E4=B9=9F?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Accounting/LoanSimulation/LoanBasicInfo.jsp | 7 ++----- .../WEB-INF/etc/app/component/component-config.xml | 2 +- .../app/component/component-parameter-config.xml | 2 +- .../fund/flowpayment/CopyFundPaymentToTemp.java | 5 +++-- .../tenwa/handler/LCFundPaymentTempInfoHandler.java | 13 ++++++------- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 63b3587e0..5b53386b1 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -134,19 +134,16 @@ v.add(p); /*设置页面属性*/ if(CurUser.hasRole("401")){ - doTemp.setVisible("RENT_RATIO",false); doTemp.setVisible("CAUTION_MONEY_METHOD",false); - }else{ - doTemp.setVisible("RENT_RATIO",false); } - if(CurUser.hasRole("401")){ doTemp.setVisible("DISCOUNT", false); // doTemp.setColumnAttribute("DISCOUNT","colvisible","0"); } if(CurUser.hasRole("800R00000013")||CurUser.hasRole("800R00000014")||CurUser.hasRole("800R00000015")){ doTemp.setVisible("YEAR_RATE", true); + doTemp.setVisible("RENT_RATIO",true); } ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); @@ -154,7 +151,7 @@ dwTemp.Style = "2";//freeform if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ - dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.ReadOnly = "1";//只读模式 isShowButton=false; }else{ isShowButton=true; diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index c8e360f21..fb13942f2 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -1079,7 +1079,7 @@ - + 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 14701ab64..5589ae27a 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/src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java index 19814cf24..83d6fb40b 100644 --- a/src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java +++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java @@ -50,11 +50,12 @@ public class CopyFundPaymentToTemp extends BaseBussiness{ } } } - if(fundList.length() > 0) { + //安鹏贴息不抵扣 + /*if(fundList.length() > 0) { fundList += ","; } - fundList += "'feetype27'"; + fundList += "'feetype27'";*/ ASUser user = ASUser.getUser(userId, Sqlca); FundPaymentCar fp = new FundPaymentCar(); diff --git a/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java b/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java index d045a2ac5..4ea1fcc3f 100644 --- a/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java +++ b/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java @@ -20,7 +20,7 @@ public class LCFundPaymentTempInfoHandler extends CommonHandler { String productId = this.asPage.getParameter("ProductId"); //获取坐扣项 - Map> params = ProductParamUtil.getProductComponentType(productId, "PRD0315"); + Map> params = ProductParamUtil.getProductComponentType(productId, "PRD0315"); List deductFeeType = new ArrayList(); for(Entry> feeTypes : params.entrySet()) { if(!feeTypes.getValue().containsKey("isBalance")) { @@ -45,12 +45,11 @@ public class LCFundPaymentTempInfoHandler extends CommonHandler { } } } - - if(fundList.length() > 0) { + //安鹏贴息不抵扣 + /*if(fundList.length() > 0) { fundList += ","; } - - fundList += "'feetype27'"; + fundList += "'feetype27'";*/ String flowunid = this.asPage.getParameter("ObjectNo"); @SuppressWarnings("unchecked") @@ -73,11 +72,11 @@ public class LCFundPaymentTempInfoHandler extends CommonHandler { bo.setAttributeValue("CAUTION_MONEY", factMoney); this.asDataObject.setVisible("CAUTION_MONEY", true); break; - case "feetype27": + /*case "feetype27": cleanLeaseMoney = cleanLeaseMoney.add(factMoney); bo.setAttributeValue("DEALER_DISCOUNT", factMoney); this.asDataObject.setVisible("DEALER_DISCOUNT", true); - break; + break;*/ } }