From 7c0672662f19aad19540be64ba3793ef21225827 Mon Sep 17 00:00:00 2001 From: user Date: Sat, 30 Jun 2018 15:24:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=8A=9F=E8=83=BD=E7=BB=99=E5=AE=A1=E6=89=B9,?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E9=98=B6=E6=AE=B5=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessProjectTempInfo.jsp | 2 +- .../BusinessApplication/CustomerInfo.jsp | 21 ++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 88db16077..aa614ecd3 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -44,7 +44,7 @@ dwTemp.Style = "2";//freeform dwTemp.setGroupHidden("0020"); dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); - dwTemp.replaceColumn("customer_info", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("customer_info", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { {"ReadOnly".equals(rightType)?"false":"true","","Button","保存","保存","save()","","","","btn_icon_saveNew",""} }; diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index b4911ebe2..51c355c6e 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -9,13 +9,15 @@ Date curdate = new Date(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd"); String dateString = formatter.format(curdate); - + + String sPhaseNo=CurPage.getParameter("sPhaseNo"); + System.out.print("==============="+sPhaseNo); + String flowunid = CurPage.getParameter("FlowUnid"); String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'"); String sTempletNo = "BusinessCustomerInfo";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); String custname=CurPage.getParameter("custname"); - System.out.print(custname+"====================="); doTemp.setHtmlEvent("CERTID","onChange","changeCertid"); doTemp.setHtmlEvent("MARRIAGE","onChange","changeChildrensNumber"); doTemp.setHtmlEvent("Mailing_Address","onChange","checkMailingAddress"); @@ -37,9 +39,12 @@ //自然人标识 String person = "person"; dwTemp.replaceColumn("family", "", CurPage.getObjectWindowOutput()); + String sButtons[][] = { - {"true","","Button","身份校验","身份校验","identityVerification()","","","","btn_icon_check",""} + {"true","","Button","身份校验","身份校验","identityVerification()","","","","btn_icon_check",""} }; + + %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Apzl/Fivelevelclassification/LM_GRADE_CLASSIFICATIONList.jsp b/WebContent/Tenwa/Apzl/Fivelevelclassification/LM_GRADE_CLASSIFICATIONList.jsp new file mode 100644 index 000000000..caf8e7451 --- /dev/null +++ b/WebContent/Tenwa/Apzl/Fivelevelclassification/LM_GRADE_CLASSIFICATIONList.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-06-29 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("LM_GRADE_CLASSIFICATIONList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Apzl/Fivelevelclassification/LM_GRADE_CLASSIFICATIONinfo.jsp b/WebContent/Tenwa/Apzl/Fivelevelclassification/LM_GRADE_CLASSIFICATIONinfo.jsp new file mode 100644 index 000000000..ca9193052 --- /dev/null +++ b/WebContent/Tenwa/Apzl/Fivelevelclassification/LM_GRADE_CLASSIFICATIONinfo.jsp @@ -0,0 +1,35 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2018-06-30 + Content: 示例详情页面 + History Log: + */ + String sPrevUrl = CurPage.getParameter("PrevUrl"); + if(sPrevUrl == null) sPrevUrl = "/Tenwa/Apzl/Fivelevelclassification/LM_GRADE_CLASSIFICATIONList.jsp"; + + String sTempletNo = "LM_GRADE_CLASSIFICATIONinfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + //doTemp.setColTips("", "测试"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); + + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","save()","","","",""}, + {"true","","Button","返回","返回","returnList()","","","","btn_icon_return"} + /* {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} */ + }; + sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp index 2b8882024..374810d82 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp @@ -20,22 +20,22 @@ if(sFlowUnid == null) sFlowUnid=""; String sTempletNo = CurPage.getParameter("TempletNo");//模板号 if(sTempletNo == null) sTempletNo = "LDistributorAccountList"; - if("DealerDepositReturnApply".equals(sFlowName)){ + if("DealerDepositReturnApply".equals(sFlowName)||"DealerDepositChargeApply".equals(sFlowName)){ sTempletNo = "LDistributorAccountListS"; + sFlowUnid=disno; } ASObjectModel doTemp = new ASObjectModel(sTempletNo); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- //dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(20); - dwTemp.genHTMLObjectWindow(disno); - + dwTemp.genHTMLObjectWindow(sFlowUnid); String sButtons[][] =null; if("DealerDepositReturnApply".equals(sFlowName)||"DealerDepositChargeApply".equals(sFlowName)){ sButtons=new String[][] { //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, /* //{"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""}, */ //{"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, */ }; diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 209c1b9c8..c414e8348 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -661,6 +661,7 @@ + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 1cb4bb97b..81e714c5c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -2720,5 +2720,19 @@ + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index af7796d69..05db31fdc 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -1105,6 +1105,9 @@ + + + From 24f52838a219b23dd206edfa59d021d577952bb4 Mon Sep 17 00:00:00 2001 From: liuz Date: Sat, 30 Jun 2018 19:04:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp | 4 +++- WebContent/WEB-INF/etc/jbo/jbo_comm.xml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp index 4fab2112e..19b1dc6e1 100644 --- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp +++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp @@ -27,7 +27,7 @@ diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index c414e8348..5eb6f7f7a 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -662,6 +662,8 @@ + + From d6ea10a743cdf1b5aba20bab9eb490d2e3e364e7 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Sat, 30 Jun 2018 19:28:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E6=B5=8B=E7=AE=97=E9=A1=B5=E9=9D=A2=E3=80=82=202.=E6=95=B4?= =?UTF-8?q?=E7=90=86=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LoanBasicInfo.jsp | 18 ++++++++++-- .../etc/app/component/component-config.xml | 26 ++++++++--------- .../component/component-parameter-config.xml | 6 ++-- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 29 ++++++++++--------- .../reckon/product/ProductCondition.java | 26 ++++++++++++++++- .../product/ProductConditionService.java | 1 + 6 files changed, 73 insertions(+), 33 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 3d979c1c7..45f37746d 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -17,6 +17,7 @@ String flowunid = CurPage.getParameter("FlowUnid"); String plannumber=CurPage.getParameter("plannumber"); String productId=CurPage.getParameter("ProductId"); + String productName = CurPage.getParameter("ProductName"); String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); String RightType= CurPage.getParameter("RightType"); @@ -165,12 +166,16 @@ var adjustType; var count = 0; $(function(){ hideItem(0,'IRR'); + var productName="<%=productName%>"; + setItemValue(0,0,"PRODUCT_NAME",productName); + isFina(); //document.getElementById('div_my0').innerHTML = '
'+document.getElementById('div_my0').innerHTML+'
'; if("ReadOnly"!="<%=RightType%>"){ rentOrRateOption=$("#RENT_OR_RATE").children(); incomeNumberYear=$("#INCOME_NUMBER_YEAR").children(); adjustType=$("#ADJUST_TYPE").children(); console.info(calcRules); + var fundRules=calcRules["fund"]; for(var key in fundRules){ $("#"+key).bind("change",function(){ @@ -194,7 +199,16 @@ $(function(){ changeSettleMethod3(); } }); - +function isFina(){ + var fundRules=calcRules["fund"]; + for(var key in fundRules){ + var flag = getItemValue(0,0,key+"_FINA"); + if(flag=="finatype01"){ + setItemValue(0,0,key+"_FIRST_PAYMENT_RATIO",""); + setItemValue(0,0,key+"_FINANCE",""); + } + } +} function importCustomerQuot(){ AsDialog.OpenSelector("SelectCustomerQuot","flowunid,<%=flowunid%>,productid,<%=productId%>","dialogWidth=800px;dialogHeight=500px", function(sReturn){ @@ -720,7 +734,7 @@ function changeRateType(){ //根据金额算比例 function getRatioByMoney(e){ - debugger; + var equipAmt=getItemValue(0,0,"EQUIP_AMT");//设备款 var cleanLeaseMoney=getItemValue(0,0,"CLEAN_LEASE_MONEY");//融资额 var fundRules=calcRules["fund"]; diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index f53476003..309f3429b 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -13,7 +13,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -1078,10 +1078,10 @@ - - - - + + + + @@ -1092,17 +1092,17 @@ - + - - - + + + - - - \ No newline at end of file + + + \ No newline at end of file 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 c34fab25a..9c677a393 100644 --- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml @@ -117,11 +117,11 @@ - + - + @@ -150,7 +150,7 @@ - + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index dd088a6d8..a45d1d9f2 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -2831,7 +2831,8 @@ - + + @@ -2843,8 +2844,8 @@ - - + + @@ -2943,23 +2944,23 @@ - + - + - - - + + + - - + + - - - - + + + + diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 3833ca8bc..925b3d42e 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -204,11 +204,18 @@ public class ProductCondition { String col=fee.getAttribute("relativecode").getString();//费用项在表中的字段 String colName=fee.getAttribute("itemname").getString();//费用名称 String isFina=fee.getAttribute("attribute2").getString();//是否参与融资 + String fina = ProductParamUtil.getProductParameterValue(productId, "PRD0315",col,"FINAN"); + if("Y".equals(fina)){ + fina = "finatype02"; + }else if("N".equals(fina)){ + fina = "finatype01"; + } if(fee.getAttribute("itemno").getString().equals("feetype10")){ rule=prodSer.getEquipRule(doTemp, map,col,vali); }else{ if(map.containsKey(col)){//产品配置了该费用项 rule=prodSer.getFeeRule(doTemp, map, col,colName,vali); + doTemp.setDefaultValue(col+"_FINA",fina); /*if("FINA".equals(isFina)){ doTemp.setRequired(col, true); doTemp.setRequired(col+"_"+isFina, true); @@ -329,6 +336,8 @@ public class ProductCondition { doTemp.setColumnAttribute("ADJUST_STYLE","colvisible", "0"); doTemp.setColumnAttribute("ADJUST_TYPE","colvisible", "0"); }else if("Y".equals(rule.get("ISADJUST_INTEREST"))){ + doTemp.setColumnAttribute("ADJUST_STYLE","colvisible", "1"); + doTemp.setColumnAttribute("ADJUST_TYPE","colvisible", "1"); //调息生效节点 doTemp.setColumnAttribute("ADJUST_STYLE","coleditsource","jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='adjust_style' and itemno in ("+this.getSqlWhere(rule.get("adjust_style"))+") order by sortno"); //调息方式 @@ -420,11 +429,26 @@ public class ProductCondition { } return s; } - //获取保证金比例 + public void getCautionRatio(ASObjectModel doTemp,String productId) throws Exception{ String caution_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","CAUTION_MONEY","CostType09"); + String handle_charge_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","HANDLING_CHARGE_MONEY","CostType09"); String INCOME_NUMBER = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","INCOME_NUMBER"); + String CAR_FIRST_PAYMENT_RATIO = ProductParamUtil.getProductParameterValue(productId, "PRD0315","FIRST_PAYMENT","CostType09"); doTemp.setDefaultValue("CAUTION_MONEY_RATIO",caution_money); + doTemp.setDefaultValue("HANDLING_CHARGE_MONEY_RATIO",handle_charge_money); doTemp.setDefaultValue("INCOME_NUMBER",INCOME_NUMBER); + doTemp.setDefaultValue("CAR_FIRST_PAYMENT_RATIO",CAR_FIRST_PAYMENT_RATIO); + String ProductType = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductType"); + String isReadOnly = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductRateReadOnly"); + String YEAR_RATE = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductRate"); + //利率为0，费率为1 + if("1".equals(ProductType)){ + doTemp.setColumnAttribute("YEAR_RATE","colheader","测算费率"); + } + if("Y".equals(isReadOnly)){ + doTemp.setColumnAttribute("YEAR_RATE","colreadyonly","1"); + } + doTemp.setDefaultValue("YEAR_RATE",YEAR_RATE); } } diff --git a/calc/com/tenwa/reckon/product/ProductConditionService.java b/calc/com/tenwa/reckon/product/ProductConditionService.java index e14cb3b7a..c130513e7 100644 --- a/calc/com/tenwa/reckon/product/ProductConditionService.java +++ b/calc/com/tenwa/reckon/product/ProductConditionService.java @@ -115,6 +115,7 @@ public class ProductConditionService { if(defaultValue.length()>0){ doTemp.setDefaultValue(col, defaultValue); doTemp.setColumnAttribute(col,"colreadonly", "1"); + doTemp.setColumnAttribute(col+"_FINA","colreadonly", "1"); } if("N".equals(isShowRatio)){ doTemp.setColumnAttribute(col,"colfilterrefid", "");//不显示比例 From f1b8750ec4ef66070c1797bc28bf8fd1a1546ee2 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Sun, 1 Jul 2018 10:50:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Group/Subcompany/DistributorCustomerGroupRelationList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Customer/Group/Subcompany/DistributorCustomerGroupRelationList.jsp b/WebContent/Tenwa/Customer/Group/Subcompany/DistributorCustomerGroupRelationList.jsp index 1ab81c9be..997e87b7e 100644 --- a/WebContent/Tenwa/Customer/Group/Subcompany/DistributorCustomerGroupRelationList.jsp +++ b/WebContent/Tenwa/Customer/Group/Subcompany/DistributorCustomerGroupRelationList.jsp @@ -26,10 +26,10 @@ function newgo(){ function newRecord(){ var sUrl = "/Tenwa/Customer/Group/Subcompany/DistributorCustomerGroupRelation.jsp"; AsDialog.PopView(sUrl,"group_id=<%=group_id%>","resizable=yes;dialogWidth=600px;dialogHeight=250px;center:yes;status:no;statusbar:no",function(){ + window.location.reload(); //reloadSelf(); },"新增集团下属公司信息"); //reloadSelf(); - window.location.reload(); } //修改 function viewAndEdit(){