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;*/
}
}