diff --git a/WebContent/Accounting/LoanSimulation/CashFlowList.jsp b/WebContent/Accounting/LoanSimulation/CashFlowList.jsp index 5418fb21a..2fadaee0f 100644 --- a/WebContent/Accounting/LoanSimulation/CashFlowList.jsp +++ b/WebContent/Accounting/LoanSimulation/CashFlowList.jsp @@ -14,7 +14,8 @@ String nodeNo=CurPage.getParameter("NodeNo"); ASObjectModel doTemp = new ASObjectModel("LCCashFlowTemp"); doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'"); - if(null!=ishistory&&ishistory.equals("true")){ + String flowNo=CurPage.getParameter("FlowNo"); + if(null!=ishistory&&ishistory.equals("true") && !flowNo.equals("RentDormantFlow")){ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow"); } CurPage.setAttribute("modelno","cash"); diff --git a/WebContent/Accounting/LoanSimulation_change/FundPlanList.jsp b/WebContent/Accounting/LoanSimulation_change/FundPlanList.jsp index ea434a01c..2df547d29 100644 --- a/WebContent/Accounting/LoanSimulation_change/FundPlanList.jsp +++ b/WebContent/Accounting/LoanSimulation_change/FundPlanList.jsp @@ -12,7 +12,8 @@ String nodeNo=CurPage.getParameter("NodeNo"); ASObjectModel doTemp = new ASObjectModel("LCFundPlanChangeTemp"); doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'"); - if(null!=ishistory&&ishistory.equals("true")){ + String flowNo=CurPage.getParameter("FlowNo"); + if(null!=ishistory&&ishistory.equals("true") && !flowNo.equals("RentDormantFlow")){ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow"); } CurPage.setAttribute("modelno","fund"); diff --git a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp index cfc17e810..3ede6c350 100644 --- a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp @@ -86,6 +86,7 @@ // TODO: handle exception } initYearRate(); + financingCar(); }); function initYearRate(){ @@ -219,5 +220,10 @@ //setItemRequired(0,"ADDITIONAL_RATE",false); } } + + function financingCar(){ + var financingCar = getItemValue(0, 0, "EQUIP_AMT")-getItemValue(0, 0, "FIRST_PAYMENT"); + setItemValue(0, 0, "financing_car", financingCar); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Accounting/LoanSimulation_change/RentPlanList.jsp b/WebContent/Accounting/LoanSimulation_change/RentPlanList.jsp index 4044a3523..869e43bae 100644 --- a/WebContent/Accounting/LoanSimulation_change/RentPlanList.jsp +++ b/WebContent/Accounting/LoanSimulation_change/RentPlanList.jsp @@ -5,10 +5,11 @@ String sRightType= CurPage.getParameter("RightType");; String calType=CurPage.getParameter("calType"); String ishistory=CurPage.getParameter("IsHistory"); + String flowNo=CurPage.getParameter("FlowNo"); String nodeNo=CurPage.getParameter("NodeNo"); ASObjectModel doTemp = new ASObjectModel("LCRentPlanTempList"); doTemp.appendJboWhere(" and payment_number='"+plannumber+"'"); - if(null!=ishistory&&ishistory.equals("true")){ + if(null!=ishistory&&ishistory.equals("true") && !flowNo.equals("RentDormantFlow")){ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow"); } CurPage.setAttribute("modelno","rent"); diff --git a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp index 577817d91..877e469d8 100644 --- a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp @@ -33,6 +33,7 @@ String sRightType= CurPage.getParameter("RightType"); String taskno = CurPage.getParameter("TaskNo"); String flowNo = CurPage.getParameter("FlowNo"); + String phaseNo = CurPage.getParameter("PhaseNo"); String settleMethod=""; String rentOrRate=""; BizObject condition=null; @@ -52,9 +53,9 @@ doTemp.appendJboWhere(" and payment_number='"+paymentNumber+"'"); - if(null!=ishistory&&ishistory.equals("true")){ - doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.onhirechange.RentPlanChangeShow");//如果是历史则新显示历史数据 - } +// if(null!=ishistory&&ishistory.equals("true")){ +// doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.onhirechange.RentPlanChangeShow");//如果是历史则新显示历史数据 +// } BizObject boLCC=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION","PAYMENT_NUMBER=:paymentNumber").setParameter("paymentNumber", paymentNumber).getSingleResult(false); String irr = boLCC.getAttribute("IRR").toString(); List rents=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP","select * from O where flowunid='"+flowunid+"' and payment_number='"+paymentNumber+"' order by plan_list").getResultList(false); @@ -71,8 +72,8 @@ v.add(p2);*/ dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 - if(null!=ishistory&&ishistory.equals("true")){ - dwTemp.ReadOnly = "-2";//只读模式 + if(null!=ishistory&&ishistory.equals("true") || !phaseNo.equals("0010")){ + dwTemp.ReadOnly = "1";//只读模式 isShowButton=false; }else{ isShowButton=true;