anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.产品规格增加产品适用所有车辆。

Browse Source 
2.带出合同起租商务条件中产品名称。
3.临时解决租金测算。
This commit is contained in:
zhangbb 2018-07-04 11:11:09 +08:00
parent d374583324
commit 5477fce051
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
View File

@ -10,6 +10,10 @@
<%@ page import="java.util.Vector" %>
<%@ page import="com.amarsoft.awe.dw.ui.validator.ValidateRule" %>
<%@ page import="com.tenwa.reckon.product.ASObjectWindowCalc" %>
<%@page import="com.amarsoft.are.jbo.BizObject"%>
<%@page import="com.amarsoft.are.jbo.JBOException"%>
<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
<%
@ -17,7 +21,6 @@
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");
@ -152,6 +155,10 @@
dwTemp.replaceColumn("even_subsection", "<iframe type='iframe' id='frame_even_break' name=\"frame_even_subsection\" width=\"100%\" height=\"300px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/subsection/LCCalcSubsectionList.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput());
dwTemp.replaceColumn("knowing_config", "<iframe type='iframe' id='frame_list_knowing' name=\"frame_list_knowing\" width=\"100%\" height=\"400px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/KnowConfigList.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"NodeNo="+nodeNo+"&RightType="+RightType+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput());
String businessDate = DateHelper.getBusinessDate();
//»ñÈ¡²úÆ·Ãû³Æ
BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID")
.setParameter("productID", productId).getSingleResult(false);
String productName = bo.getAttribute("typename").getString();
String sButtons[][] = {
//{"true","All","Button","ÖØÖÃ","ÖØÖÃ","reloadSelf()","","","",""},
{"true","","Button","×â½ð²âËã","×â½ð²âËã","saveRecord()","","","","btn_icon_save"},
@ -170,6 +177,7 @@ $(function(){
isFina();
//document.getElementById('div_my0').innerHTML = '<div style="width:1160px;overflow: scroll;">'+document.getElementById('div_my0').innerHTML+'</div>';
if("ReadOnly"!="<%=RightType%>"){
debugger;
rentOrRateOption=$("#RENT_OR_RATE").children();
incomeNumberYear=$("#INCOME_NUMBER_YEAR").children();
adjustType=$("#ADJUST_TYPE").children();
@ -194,9 +202,9 @@ $(function(){
CalcControl.RentOrRateView();
count++;
}else{
}else{
changeSettleMethod3();
}
}
});
function isFina(){
var fundRules=calcRules["fund"];

4
WebContent/Accounting/LoanSimulation/condition_plan.jsp
View File

@ -13,8 +13,8 @@
//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
String sTabStrip[][] = {
{"true", "租金计划", "/Accounting/LoanSimulation/RentPlanList.jsp",params, "", "", "false"},
//{"true", "资金计划", "/Accounting/LoanSimulation/FundPlanList.jsp",params, "", "", "false"},
//{"true", "现金流", "/Accounting/LoanSimulation/CashFlowList.jsp",params, "", "", "false"},
{"true", "资金计划", "/Accounting/LoanSimulation/FundPlanList.jsp",params, "", "", "false"},
{"true", "现金流", "/Accounting/LoanSimulation/CashFlowList.jsp",params, "", "", "false"},
};
%>
<%@ include file="/Resources/CodeParts/Tab01.jsp"%>

1
WebContent/WEB-INF/etc/jbo/jbo_prd.xml
View File

@ -77,6 +77,7 @@
<attribute name="IS_ALL_DEALER" label="产品适用所有经销商" type="STRING" length="10"/>
<attribute name="IS_ALL_DEALER_GROUP" label="产品适用所经销商集团" type="STRING" length="10"/>
<attribute name="IS_ALL_AREA" label="产品适用所有区域" type="STRING" length="10"/>
<attribute name="IS_ALL_CAR" label="产品适用所有车辆" type="STRING" length="10"/>
</attributes>
<manager>
<managerProperties>

4
calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
View File

@ -94,8 +94,8 @@ public class FundFundPlanExecutor {
ffcp.setPayCust(custid);
}
fundPlanBeans.add(ffcp);
if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资
if(con.getAttribute(entry.getKey().split("_")[0]+"_FINAN").getString().equals("N"))
if(StringUtil.nullToString(param.get("FINA")).equals("Y")){//需要判断是否融资
if(con.getAttribute(entry.getKey()).getString().equals("N"))
{
FundPlanBean ffcp2 = new FundPlanBean();
ffcp2.setFeeType(item.getAttribute("itemno").getString());//费用类型