diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf
index c519b4cae..26d3e3b37 100644
--- a/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf
+++ b/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf
@@ -36,8 +36,12 @@
 		doTemp.setVisible("CONTRACT_NO", true);
 	}
 	//doTemp.appendJboWhere(applyManager.getWhereClause()+" order by objectNo desc ");
-	//Èç¹ûÊÇÏîÄ¿Á¢ÏÔòÌí¼ÓÉêÇëÈËÊÇÖ÷ÉêÇëÈ˵ÄwhereÌõ¼þ
-	if("ProjectApproalApply".equals(sApplyType)||"ContractChangeApply".equals(sApplyType)||"ContractCancelApply".equals(sApplyType)){
+	//Èç¹ûÊÇÏîÄ¿Á¢ÏÔòÌí¼ÓÉêÇëÈËÊÇÖ÷ÉêÇëÈ˵ÄwhereÌõ¼þTAssetsDisposalEndApply
+	if("ProjectApproalApply".equals(sApplyType)||"ContractChangeApply".equals(sApplyType)||"ContractCancelApply".equals(sApplyType)
+			||"ContractOnhireChangeApply".equals(sApplyType)||"TriditionContractChangeApply".equals(sApplyType)||"ContractSupportApply".equals(sApplyType)
+			||"ContractEndApply".equals(sApplyType)||"ProjectChangeApply".equals(sApplyType)||"ProjectCancelApply".equals(sApplyType)||"ProjectCreditApply".equals(sApplyType)
+			||"FundPaymentApply".equals(sApplyType)||"ProjectRecreditApply".equals(sApplyType)||"ProjectSupportApply".equals(sApplyType)||"ContractApprovalApply".equals(sApplyType)
+			||"TAssetsDisposalApply".equals(sApplyType)||"TAssetsDisposalEndApply".equals(sApplyType)||"TAssetsDisposalFeeApply".equals(sApplyType)){
 		doTemp.appendJboWhere(applyManager.getWhereClause()+" and cpt.is_main='Y'");
 	}else{
 		doTemp.appendJboWhere(applyManager.getWhereClause());
diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp
index 821bced6a..07d3d9770 100644
--- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp
@@ -5,7 +5,23 @@
 	/*~[Describe=ÐÂÔö¼Ç¼;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
 	function newApply()
  	{
-		AsDialog.OpenSelector("SelectPaymentForAssetsDisposal","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		var flowno="<%=CurPage.getParameter("ApplyType")%>";
+	 	var selname="";
+	 	var orgId="<%=CurUser.getOrgID()%>".substring(0,7);
+ 		var businessType="";
+	 	if("AssetsDisposalApply"==flowno){
+	 		businessType="1";
+	 	}else{
+	 		if(orgId=="8009011"){
+	 			businessType="3";
+	 		}else if(orgId=="8009010"){
+	 			businessType="2";
+	 		}else{
+	 			alert("µ±Ç°Óû§²»ÄÜ·¢ÆðÉêÇ룡");
+	 			return;
+	 		}
+	 	}
+		AsDialog.OpenSelector("SelectPaymentForAssetsDisposal","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 			if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
 				//alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡
 	    	return;
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp
new file mode 100644
index 000000000..afa43fa42
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp
@@ -0,0 +1,164 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2017-06-26
+        Content: ʾÀýÏêÇéÒ³Ãæ
+        History Log: 
+    */
+
+	String flowunid = CurPage.getParameter("FlowUnid");
+	String contractid = CurPage.getParameter("ContractId");
+	String RightType = CurPage.getParameter("RightType");//Ñ¡Ôñģʽ
+	String ishistory=CurPage.getParameter("IsHistory");
+	String nodeNo=CurPage.getParameter("NodeNo");
+
+	BizObject condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
+	String paymentnumber=condition.getAttribute("payment_number").getString();
+	String contractId=condition.getAttribute("contract_id").getString();
+	//»ñÈ¡ÏîÄ¿Î¥Ô¼½ð£¨Ö»Óд«Í³µÄÓУ©
+	String total_all = JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION","CONTRACT_ID=:contractid").setParameter("contractid", contractid).getSingleResult(false).getAttribute("TOTAL_ALL").getString();
+	
+	BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);
+	String productId=flow.getAttribute("productId").getString();
+	
+	String sTempletNo = "TriditionLCContractTerminate";//--Ä£°åºÅ--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setDefaultValue("PAYMENT_NUMBER", paymentnumber);
+	doTemp.setHtmlEvent("PAYDAY_ADJUST","onchange","getTerminateInfo");
+	doTemp.setHtmlEvent("REPURCHASE_RATIO","onchange","getRepurchaseMoney");
+	
+	doTemp.setHtmlEvent("HANDLING_CHARGE","onchange","changeContract");
+	doTemp.setHtmlEvent("AGREED_PENALTY","onchange","changeContract");
+	doTemp.setHtmlEvent("AGREED_INTEREST","onchange","changeContract");
+	doTemp.setHtmlEvent("COLLECT_FEES","onchange","changeContract");
+	
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
+		dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ
+		isShowButton=false;
+	}else{
+		isShowButton=true;
+	}
+	dwTemp.genHTMLObjectWindow(flowunid);
+	
+	String sButtons[][] = {
+			{"true","","Button","ÌáÇ°½áÇå","ÌáÇ°½áÇå","saveRecord()","","","","btn_icon_settle"},
+			{"true","","Button","³·Ïú½áÇå","³·Ïú½áÇå","cancelChange()","","","","btn_icon_delete"}
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	function getRepurchaseMoney(){
+		var ratio=getItemValue(0,0,"REPURCHASE_RATIO");
+		var corpus=getItemValue(0,0,"CORPUS_OVERAGE");
+		if(ratio&&corpus){
+			setItemValue(0,0,"REPURCHASE_MONEY",Number(ratio*corpus/100).toFixed(6));
+		}
+	}
+	
+	 function getTerminateInfo(){
+		//¼ì²éÔ¼¶¨ÖÕÖ¹ÈÕÊÇ·ñºÏ·¨
+		var paydayAdjust  = getItemValue(0,getRow(),"PAYDAY_ADJUST");
+		var result  = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","checkPaydayAdjust","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>,paydayAdjust="+paydayAdjust);
+		if(result.result != "true"){
+			alert(result.msg);
+			setItemValue(0,getRow(),"PAYDAY_ADJUST","");
+		}else{
+			var terminateInfo  = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","getTerminateInfo","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>,paydayAdjust="+paydayAdjust);	
+			var remaincorpus =  terminateInfo.remaincorpus;
+			var remaininterest =  terminateInfo.remaininterest;
+			var overduerent =  terminateInfo.overduerent;
+			var sumpenalty = terminateInfo.sumpenalty;
+			//ÓâÆÚÀûÏ¢ÔÝʱ¸³ÖµÎª0
+			setItemValue(0,getRow(),"DUN_PENALTY",sumpenalty);
+			setItemValue(0,getRow(),"AGREED_PENALTY",sumpenalty);
+			//Òѵ½ÆÚ×â½ð
+			setItemValue(0,getRow(),"DUN_RENT",overduerent);
+			//δµ½ÆÚ±¾½ð
+			setItemValue(0,getRow(),"CORPUS_OVERAGE",remaincorpus);
+			//δµ½ÆÚÀûÏ¢
+			setItemValue(0,getRow(),"INTEREST_HANDLING_CHARGE",remaininterest);
+			setItemValue(0,getRow(),"AGREED_INTEREST",remaininterest);
+			//É̶¨ÀûϢĬÈϵÈÓÚδµ½ÆÚÀûÏ¢
+			setItemValue(0,getRow(),"AGREED_INTEREST",remaininterest);
+			//»Ø¹º±ÈÀý ĬÈÏ100
+			setItemValue(0,getRow(),"REPURCHASE_RATIO","100");
+			//»Ø¹º±¾½ð
+			setItemValue(0,getRow(),"REPURCHASE_MONEY",remaincorpus);
+			setItemValue(0,getRow(),"HANDLING_CHARGE","0.00");
+			//ÏîÄ¿Î¥Ô¼½ð
+			var total_all = Number("<%=total_all%>")*0.2;
+			setItemValue(0,getRow(),"COLLECT_FEES",total_all);
+			//¼ÆËãºÏͬծȯ×ܼÆ
+			setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal());
+		}
+	}
+	
+	//¼ÆËãծȯ×ܼÆ
+	function  getContractBondTotal(){
+		var  dunrent = getItemValue(0,getRow(),"DUN_RENT");
+		var  handlingcharge = getItemValue(0,getRow(),"HANDLING_CHARGE");
+		var  corpusoverage = getItemValue(0,getRow(),"CORPUS_OVERAGE");
+		var  corpusinterest = 0;
+		var  agreedinterest = getItemValue(0,getRow(),"AGREED_INTEREST");
+		var  agreepenalty = getItemValue(0,getRow(),"AGREED_PENALTY");
+		//var  dunpenalty = getItemValue(0,getRow(),"DUN_PENALTY");AGREED_PENALTY
+		var  otherin = getItemValue(0,getRow(),"OTHER_IN");
+		var  otherout = getItemValue(0,getRow(),"OTHER_OUT");
+		var  collectfees = getItemValue(0,getRow(),"COLLECT_FEES");
+		return Number(otherin ?  otherin : 0 ) - Number(otherout ?  otherout : 0 ) + Number(dunrent ?  dunrent : 0 )
+		+ Number(corpusoverage ?  corpusoverage : 0 ) + Number(corpusinterest ?  corpusinterest : 0 ) + Number(agreedinterest ?  agreedinterest : 0 )
+		+ Number(agreepenalty ?  agreepenalty : 0 ) + Number(collectfees ?  collectfees : 0 ) +  Number(handlingcharge ?  handlingcharge : 0 );
+	}
+	
+	function cancelChange(){
+		openDWDialog();
+		setTimeout(function(){
+		    var message = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","cancelRentChange","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>,contractId=<%=contractId%>");
+			if(message == 'true'){
+				resetDWDialog("ÖÐ;ÖÕÖ¹³·Ïú³É¹¦£¡£¡£¡",true);
+				window.location.href=window.location.href; 
+			}else{
+				resetDWDialog("δ½øÐйýÖÐ;ÖÕÖ¹µÄ²Ù×÷£¡ÇëÏȽøÐкÏͬÖÐ;ÖÕÖ¹£¡£¡£¡",true);
+			} 
+		}, 500);
+	}
+	//±£´æÊý¾Ý
+	function saveRecord(sPostEvents)
+	{
+		//¼ì²éÊÇ·ñ½øÐйý±ä¸ü
+		var result =  AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","checkIsRentChange","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>");
+		if(result == 'true'){
+			as_save("myiframe0","run()");	
+		}else{
+			alert('ÇëÏȳ·Ïú±ä¸ü£¬ÔÙ½øÐбä¸ü²Ù×÷£¡£¡£¡');
+		}
+	}
+	
+	function run()
+	{
+		AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","runTerminate","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>,productId=<%=productId%>,calType=pay_process");
+	}
+	
+	
+	jQuery(function(){
+		setItemValue(0,0,"flowunid","<%=flowunid%>");
+		//ÅжÏÆäËûÓ¦ÊÕºÍÆäËûÓ¦ÍËÊÇ·ñΪ¿Õ
+		var  otherIn = getItemValue(0,getRow(),"OTHER_IN"); 
+		var  otherOut = getItemValue(0,getRow(),"OTHER_OUT");
+		if(!otherIn && !otherOut){
+			//ÆäËûÓ¦ÊÕºÍÆäËûÓ¦ÍË
+			var result =  AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","getTerminateOtherInfo","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>");
+			for(var p in result){
+				setItemValue(0,getRow(),p,result[p]);
+			}
+		}
+		
+	}); 
+	function changeContract(){
+		setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal());
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp
index ec3a8346a..cd5212213 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp
@@ -9,7 +9,7 @@
 	 	var selname="";
 	 	var orgId="<%=CurUser.getOrgID()%>".substring(0,7);
  		var businessType="";
-	 	if("ContractOnhireCarChangeApply"==flowno){
+	 	if("ContractOnhireCarChangeApply"==flowno||"ContractBasicInfoChangeApply"==flowno){
 	 		businessType="1";
 	 	}else{
 	 		if(orgId=="8009011"){
diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp
index f43ac50af..ffc33d11e 100644
--- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp
@@ -60,10 +60,6 @@
 			window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
 		}
 		function generateQuotation(){
-		/* 	var  paymentnumber=getItemValue(0,getRow(0),"PAYMENT_NUMBER");
-			var  planlist=getItemValue(0,getRow(0),"PLAN_LIST");
-			alert(sss);
-			return; */
 			var PAYMENT_NUMBERS=getItemValueArray(0,"PAYMENT_NUMBER");
 			var PLAN_LISTS=getItemValueArray(0,"PLAN_LIST");
 			
@@ -77,7 +73,6 @@
 				var tempParam={};
 				var sparam="";
 				//Ä£°åºÅ
-	// 			param["templateNo"]="ceaa18f72b0e4bbaa6e66dcfd7e32c87";
 				param["templateNo"]="372f9e55fae944a5964b6f6b1503c0c2";
 				
 				//Éú³ÉÎļþ¹ØÁª¹Øϵ
@@ -88,8 +83,7 @@
 				tempParam["PLAN_NUMBER"]=PAYMENT_NUMBERS[i];
 				tempParam["customername"]=customernames[i];
 				tempParam["contract_number"]=contract_numbers[i];
-				
-					
+			
 				//Éú³ÉÄ£°å¹Ì¶¨²ÎÊý
 				tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
 				tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
diff --git a/WebContent/fileTemplate/租金支付通知书.docx b/WebContent/fileTemplate/租金支付通知书.docx
index 50d87fdf5..0ad42898e 100644
Binary files a/WebContent/fileTemplate/租金支付通知书.docx and b/WebContent/fileTemplate/租金支付通知书.docx differ