From df7e58304f2eeeb39ae294edbb6619be3a9f31cb Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 28 Jun 2018 17:41:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8E=BB=E9=99=A4=E4=BA=A7=E5=93=81=E8=A6=81?= =?UTF-8?q?=E7=B4=A0=E9=80=89=E9=A1=B9=E3=80=82=202.=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=AE=BE=E7=BD=AE=E3=80=82=203.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=BD=A6=E4=BB=B7=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LoanBasicInfo.jsp | 10 +- .../ProductManage/ProductManageMain.jsp | 2 +- .../etc/app/component/component-config.xml | 112 +++++++++--------- .../component/component-parameter-config.xml | 2 +- .../app/component/componenttype-config.xml | 2 +- 5 files changed, 65 insertions(+), 63 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index f68a1840a..3d979c1c7 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -42,13 +42,14 @@ plannumber=condtion.getAttribute(planCName).getString(); } }else{ - String planType=ProductParamUtil.getProductParameterValue(productId, "PRD0314", "planinformation"); - if("SinglePlan".equals(planType)){ + //安鹏只有多方案，没有单方案。（产品配置中方案信息prd0314停用） + // String planType=ProductParamUtil.getProductParameterValue(productId, "PRD0314", "planinformation"); + // if("SinglePlan".equals(planType)){ BizObject condtion=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); if(condtion!=null){ plannumber=condtion.getAttribute(planCName).getString(); } - } + // } } } //新增数据 自动生成方案编号 @@ -106,7 +107,7 @@ doTemp.setVisible("CORPUS_RATIO", true); doTemp.setVisible("CORPUS", true); doTemp.setRequired("CORPUS_RATIO", true); - } + } if("quoted_price".equals(calType)){//客户报价 流程号存的是客户主键 doTemp.setDefaultValue("cust_id", flowunid); } @@ -163,6 +164,7 @@ var incomeNumberYear; var adjustType; var count = 0; $(function(){ + hideItem(0,'IRR'); //document.getElementById('div_my0').innerHTML = '
'+document.getElementById('div_my0').innerHTML+'
'; if("ReadOnly"!="<%=RightType%>"){ rentOrRateOption=$("#RENT_OR_RATE").children(); diff --git a/WebContent/ProductManage/ProductManageMain.jsp b/WebContent/ProductManage/ProductManageMain.jsp index 22888fa1d..9872a7cb7 100644 --- a/WebContent/ProductManage/ProductManageMain.jsp +++ b/WebContent/ProductManage/ProductManageMain.jsp @@ -13,7 +13,7 @@ int i = 0; //组件参数定义 tviTemp.insertPage("root","产品参数定义","OpenComp(\"ParameterConfigFrame\",\"/ProductManage/ParameterConfig/ParameterConfigFrame.jsp\",\"XMLFile={$ARE.PRD_HOME}/etc/app/component/component-parameter-config.xml&XMLTags=Parameter&Keys=ParameterID\",\"right\");",i++); - tviTemp.insertPage("root","额度产品要素定义","OpenComp(\"ElementLimitFrame\",\"/Tenwa/Core/CreditLimit/LALimitElementList.jsp\",\"\",\"right\");",i++); + //tviTemp.insertPage("root","额度产品要素定义","OpenComp(\"ElementLimitFrame\",\"/Tenwa/Core/CreditLimit/LALimitElementList.jsp\",\"\",\"right\");",i++); String p = tviTemp.insertFolder("root", "产品组件", "", i++); tviTemp.insertPage(p,"组件类型","OpenComp(\"ComponentTypeList\",\"/ProductManage/ComponentConfig/ComponentTypeList.jsp\",\"XMLFile={$ARE.PRD_HOME}/etc/app/component/componenttype-config.xml&XMLTags=ComponentType&Keys=ID\",\"right\");",i++); diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 1a4928968..f53476003 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -42,11 +42,11 @@ - - - + + + @@ -302,7 +302,7 @@ - + @@ -429,19 +429,19 @@ - @@ -887,44 +887,44 @@ - @@ -1085,7 +1085,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 9a91fb08e..c34fab25a 100644 --- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml @@ -178,7 +178,7 @@ - + diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml index 22425a72e..8371d93ce 100644 --- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml +++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml @@ -39,7 +39,7 @@ - +