diff --git a/WebContent/Accounting/LoanSimulation_change/LCRentChangeInfo.jsp b/WebContent/Accounting/LoanSimulation_change/LCRentChangeInfo.jsp index 891fc54b4..8cdacee32 100644 --- a/WebContent/Accounting/LoanSimulation_change/LCRentChangeInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_change/LCRentChangeInfo.jsp @@ -120,6 +120,10 @@ $(function(){ //保存数据 function saveRecord(sPostEvents) { + if(!cheackFinalPayment()){ + AsDebug.alert("提示","只有尾款的的项目并且大于还租次数才能展期变更!"); + return; + } //检查是否进行过变更 as_save("myiframe0","run()"); @@ -130,7 +134,17 @@ function saveRecord(sPostEvents) alert('请先撤销变更,再进行变更操作!!!'); } --%> } - +function cheackFinalPayment(){ + var finalPayment=pay_condition.getItemValue(0,0,"FINAL_PAYMENT"); + var incomeNumber=pay_condition.getItemValue(0,0,"INCOME_NUMBER"); + var adjustList=getItemValue(0,0,"ADJUST_LIST"); + var startList=getItemValue(0,0,"START_LIST"); + if(parseFloat(finalPayment)>0&&parseFloat(adjustList)>parseFloat(incomeNumber)&&parseFloat(startList)==parseFloat(incomeNumber)){ + return true; + }else{ + return false; + } +} function cancelChange(){ openDWDialog(); setTimeout(function(){ diff --git a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp index 70bbf8320..d7f054256 100644 --- a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp @@ -80,9 +80,9 @@ $(function(){ }); function initYearRate(){ - var adjustList = parent.getItemValue(0,getRow(),"ADJUST_LIST"); + var adjustList = parent.getItemValue(0,getRow(),"START_LIST"); if(!adjustList){ - parent.setItemValue(0,0,"ADJUST_LIST",getItemValue(0,0,"INCOME_NUMBER")); + parent.setItemValue(0,0,"START_LIST",getItemValue(0,0,"INCOME_NUMBER")); } var yearRate_adjust = parent.getItemValue(0,getRow(),"YEAR_RATE"); if(!yearRate_adjust){ diff --git a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp index a2d066fab..02931b02a 100644 --- a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp +++ b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp @@ -85,7 +85,10 @@ var applyType = "<%=applyType%>"; var phasename = "<%=phasename%>"; var userID = "<%=userID%>"; - $(function(){initRouteInfo();}); + $(function(){ + initRouteInfo(); + if($("input:radio[value='1000']"))$("input:radio[value='1000']").attr("checked",true); + }); function initRouteInfo(){ //一般路由和条件路由初始化 if(routeJson.routeType=="commroute"||routeJson.routeType=="conditionroute"){ diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp index 3772c4d38..1365df240 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp @@ -15,8 +15,9 @@ var contract_number = sReturn[3]; var proj_name = sReturn[4]; var contract_no = sReturn[5]; - var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow", - "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+proj_name+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"); + var customername = sReturn[6]; + var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow", + "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+(contract_no+"-"+customername)+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"); var sReturnInfos=sReturnInfo.split("@"); if(sReturnInfos[0]=="success") {