diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
index 1f28d5b0c..92f6ecd47 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
@@ -157,7 +157,7 @@
 	String sButtons[][] = {
 		//{"true","All","Button","重置","重置","reloadSelf()","","","",""},
 		{"true","","Button","租金测算","租金测算","saveRecord()","","","","btn_icon_save"},
-		//{((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"}
+	//	{((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"}
 	};
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
@@ -1253,4 +1253,4 @@ jQuery.validator.prototype.showLabel = function(element,message){
 	fundError[id]=message;
 };
 </script>
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index 58719d289..b9cf8fa35 100644
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Context>
-	<Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource"
-		maxActive="30" maxIdle="2" maxWait="10000" username="apzl" password="apzl@2018"
-		driverClassName="com.mysql.jdbc.Driver"
-		url="jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
+  <Resource
+     name="jdbc/als"
+     auth="Container"
+     type="javax.sql.DataSource"
+     maxActive="30"
+     maxIdle="2"
+     maxWait="10000"
+     username="apzl"
+     password="apzl@2018"
+     driverClassName="com.mysql.jdbc.Driver"
+     url="jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
 </Context>
 
diff --git a/WebContent/Tenwa/Apzl/InvoiceManager/BackRentInvoiceOthers.jsp b/WebContent/Tenwa/Apzl/InvoiceManager/BackRentInvoiceOthers.jsp
index 82fe4edd6..50e4676ed 100644
--- a/WebContent/Tenwa/Apzl/InvoiceManager/BackRentInvoiceOthers.jsp
+++ b/WebContent/Tenwa/Apzl/InvoiceManager/BackRentInvoiceOthers.jsp
@@ -38,10 +38,10 @@ function ApplyInvoice(){
 		
 		for(var i = 0;i < types.length; i++){
 				moneyTypes += sParm[i]+"#"+types[i] +"@";
-			    alert(moneyTypes);
+			    //alert(moneyTypes);
 		}
 		moneyTypes = moneyTypes.substr(0,moneyTypes.length-1);
-		alert(moneyTypes);
+		//alert(moneyTypes);
 		/* for(var i = 0;i < sParm.length; i++){
 			if(uids.length == 0){
 			    
diff --git a/WebContent/Tenwa/Apzl/InvoiceManager/InvoiceRentInterest.jsp b/WebContent/Tenwa/Apzl/InvoiceManager/InvoiceRentInterest.jsp
index 9feeb44aa..148f7890c 100644
--- a/WebContent/Tenwa/Apzl/InvoiceManager/InvoiceRentInterest.jsp
+++ b/WebContent/Tenwa/Apzl/InvoiceManager/InvoiceRentInterest.jsp
@@ -34,12 +34,15 @@
 			
 			var planIds = "";
 			for(var i = 0;i < sParm.length; i++){
-				if(planIds.length == 0){
+				//if(planIds.length == 0){
+					//planIds += sParm[i] +"@";
+				//}else{
 					planIds += sParm[i] +"@";
-				}else{
-					planIds += sParm[i] +"@";
-				}
+				//}
 			}
+			//alert(planIds);
+			planIds = planIds.substr(0,planIds.length-1);
+			//alert(planIds);
 			 spara = "planIds="+planIds+",CurUserID=<%=CurUser.getUserID()%>";
 			 var returnValue = AsControl.RunJavaMethodTrans("com.tenwa.apzl.invoicemanager.rentplaninvoice.rentPlanInvoiceManager","selectApplyConfirm",spara);
 			 alert(returnValue);
diff --git a/WebContent/Tenwa/Apzl/InvoiceManager/InvoiceRentPlanConfirm.jsp b/WebContent/Tenwa/Apzl/InvoiceManager/InvoiceRentPlanConfirm.jsp
index 142dfdffb..ab9deaf04 100644
--- a/WebContent/Tenwa/Apzl/InvoiceManager/InvoiceRentPlanConfirm.jsp
+++ b/WebContent/Tenwa/Apzl/InvoiceManager/InvoiceRentPlanConfirm.jsp
@@ -34,12 +34,15 @@
 		
 		var ids = "";
 		for(var i = 0;i < sParm.length; i++){
-			if(ids.length == 0){
+			//if(ids.length == 0){
+				//ids += sParm[i] +"@";
+			//}else{
 				ids += sParm[i] +"@";
-			}else{
-				ids += sParm[i] +"@";
-			}
+			//}
 		}
+		
+		ids = ids.substr(0,ids.length-1);
+		
 		 spara = "ids="+ids+",CurUserID=<%=CurUser.getUserID()%>";
 		 var returnValue = AsControl.RunJavaMethodTrans("com.tenwa.apzl.invoicemanager.rentplaninvoice.rentPlanInvoiceManager","invoiceConfirmSubmit",spara);
 		 alert(returnValue);
diff --git a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp
index 1c920156f..fbd31e2a3 100644
--- a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp
+++ b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp
@@ -40,7 +40,7 @@
 	var docList="<%=docList%>";
 	myleft.width=1;
 	if("SingleRow"=="<%=type%>"){
-		if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"){
+		if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"){
 			AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
 		}else{
 			AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right","");
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmList.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmList.jsp
index 46491a189..5b232a2c1 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmList.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmList.jsp
@@ -33,22 +33,22 @@
 	}
 	
 	function downloadFile(path){
-		alert(path);
+		//alert(path);
 		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
 		window.open(sWebRootPath+"/servlet/view/invoiceDownloadServlet?CompClientID=<%=sCompClientID%>&path="+path, "downloadTemplate");
 	}
 	
 	function selectInvoice(){
 		var sid = getItemValue(0,getRow(0),"sid");
-		alert(sid);
+		//alert(sid);
 		/*  if(typeof(sid)=="undefined" || sObjectInfo.length==0 ){
 			alert("请选择查询开票数据！");
 			return ;
 		 } */
 		 spara = "sid="+sid+",CurUserID=<%=CurUser.getUserID()%>";
-		 var returnValue = AsControl.RunJavaMethodTrans("com.tenwa.lease.app.invoicemanager.InvoiceManagerController","selectConfirm",spara);
+		 //var returnValue = AsControl.RunJavaMethodTrans("com.tenwa.lease.app.invoicemanager.InvoiceManagerController","selectConfirm",spara);
 		 
-		 //var returnValue = AsControl.RunJavaMethodTrans("com.tenwa.apzl.invoicemanager.rentplaninvoice.rentPlanInvoiceManager","selectConfirm",spara);
+		 var returnValue = AsControl.RunJavaMethodTrans("com.tenwa.apzl.invoicemanager.rentplaninvoice.rentPlanInvoiceManager","selectConfirm",spara);
 
 		 alert(returnValue);
 		reloadSelf();
diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml
new file mode 100644
index 000000000..6ae542b9c
--- /dev/null
+++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<table-root 
+  xmlns="http://www.tracywindy.org/table" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.tracywindy.org/table http://www.tracywindy.org/table/table-1.0.xsd">
+  <table>
+    <data>
+    <MYSQL>
+      <table_sql> 
+	        <![CDATA[
+	 select  
+	   ID,
+  CONTRACT_NUMBER,
+ CONTRACT_NO,
+  PROJECT_ID,
+  PRODUCT_ID,
+  PROJECT_NAME,
+  customerid,
+  customername,
+  total,
+  usedlines,
+  relines,
+  plan_money,
+   afact_money,
+  allfact_money,
+  fee_adjust,
+  overmoney,
+  username   from (
+SELECT 
+  lci.ID,
+  lci.CONTRACT_NUMBER,
+  lci.CONTRACT_NO,
+  lci.PROJECT_ID,
+  lci.PRODUCT_ID,
+  lci.PROJECT_NAME,
+  lul.customerid,
+  lul.customername,
+  di.total,
+  di.usedlines,
+  di.relines,
+  vlfp.plan_money,
+  IFNULL(lfi.allfact_money, 0) AS afact_money,
+  vlfp.allfact_money,
+  vlfp.fee_adjust,
+  vlfp.overmoney,
+  ui.username 
+FROM
+  LB_CONTRACT_INFO AS lci 
+  LEFT JOIN 
+    (SELECT 
+      lu.contract_id,
+      ci.customerid,
+      ci.customername 
+    FROM
+      LB_UNION_LESSEE lu,
+      CUSTOMER_INFO ci 
+    WHERE lu.CUSTOMER_ID = ci.customerid 
+      AND is_main = 'y') AS lul 
+    ON lul.CONTRACT_ID = lci.ID 
+  LEFT JOIN 
+    (SELECT 
+      vl.contract_id,
+      SUM(vl.plan_money) plan_money,
+      SUM(vl.allfact_money) allfact_money,
+      SUM(vl.fee_adjust) fee_adjust,
+      SUM(vl.overmoney) overmoney 
+    FROM
+      vi_lc_fund_plan vl 
+    WHERE vl.pay_type = 'pay_type_out' 
+      AND vl.fee_type NOT IN ('feetype16', 'feetype17') 
+    GROUP BY vl.contract_id) vlfp 
+    ON vlfp.contract_id = lci.ID 
+  LEFT JOIN 
+    (SELECT 
+      contract_id,
+      SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money 
+    FROM
+      lc_fund_income 
+    WHERE pay_type = 'pay_type_out' 
+      AND roll_back = '0' 
+      AND pay_status = 'apply_pass' 
+    GROUP BY contract_id) AS lfi 
+    ON lfi.contract_id = lci.ID 
+  LEFT JOIN user_info AS ui 
+    ON lci.PROJECT_MANAGE = ui.userid  
+    left join vi_distributor_lines di on lci.distributor_id=di.distributor_no
+WHERE (
+    lci.contract_status = '21' 
+    OR lci.contract_status = '25' 
+    OR lci.contract_status = '26'
+  )
+  AND lci.ID NOT IN 
+  (SELECT 
+    contract_id 
+  FROM
+    flow_bussiness_object fbo,
+    flow_object fo 
+  WHERE fbo.flow_unid = fo.objectno 
+    AND fbo.flow_name = '璧勯噾浠樻' 
+    AND fo.phaseno NOT IN ('1000', '8000'))) tab 
+    
+			 ]]> 
+	  </table_sql>
+	  </MYSQL>
+	<ORACLE>
+      <table_sql> 
+	        <![CDATA[
+	   select  
+	   ID,
+  CONTRACT_NUMBER,
+ CONTRACT_NO,
+  PROJECT_ID,
+  PRODUCT_ID,
+  PROJECT_NAME,
+  customerid,
+  customername,
+  plan_money,
+   afact_money,
+  allfact_money,
+  fee_adjust,
+  overmoney,
+  username   from (
+SELECT 
+  lci.ID,
+  lci.CONTRACT_NUMBER,
+  lci.CONTRACT_NO,
+  lci.PROJECT_ID,
+  lci.PRODUCT_ID,
+  lci.PROJECT_NAME,
+  lul.customerid,
+  lul.customername,
+  vlfp.plan_money,
+  (NVL(lfi.allfact_money, 0)) AS afact_money,
+  vlfp.allfact_money,
+  vlfp.fee_adjust,
+  vlfp.overmoney,
+  ui.username 
+FROM
+  LB_CONTRACT_INFO  lci 
+  LEFT JOIN 
+    (SELECT 
+      lu.contract_id,
+      ci.customerid,
+      ci.customername 
+    FROM
+      LB_UNION_LESSEE lu,
+      CUSTOMER_INFO ci 
+    WHERE lu.CUSTOMER_ID = ci.customerid 
+      AND is_main = 'Y')  lul 
+    ON lul.CONTRACT_ID = lci.ID 
+  LEFT JOIN 
+    (SELECT 
+      vl.contract_id,
+      SUM(vl.plan_money) plan_money,
+      SUM(vl.allfact_money) allfact_money,
+      SUM(vl.fee_adjust) fee_adjust,
+      SUM(vl.overmoney) overmoney 
+    FROM
+      vi_lc_fund_plan vl 
+    WHERE vl.pay_type = 'pay_type_out' 
+      AND vl.fee_type NOT IN ('feetype16', 'feetype17') 
+    GROUP BY vl.contract_id) vlfp 
+    ON vlfp.contract_id = lci.ID 
+  LEFT JOIN 
+    (SELECT 
+      contract_id,
+      SUM(NVL(fact_money, 0)) + SUM(NVL(fee_adjust, 0)) AS allfact_money 
+    FROM
+      lc_fund_income 
+    WHERE pay_type = 'pay_type_out' 
+      AND roll_back = '0' 
+      AND pay_status = 'apply_pass' 
+    GROUP BY contract_id)  lfi 
+    ON lfi.contract_id = lci.ID 
+  LEFT JOIN user_info  ui 
+    ON lci.PROJECT_MANAGE = ui.userid 
+WHERE (
+    lci.contract_status = '21' 
+    OR lci.contract_status = '25' 
+    OR lci.contract_status = '26'
+  ) 
+  AND NVL(lfi.allfact_money, 0) < vlfp.plan_money 
+  AND lci.ID NOT IN 
+  (SELECT 
+    contract_id 
+  FROM
+    flow_bussiness_object fbo,
+    flow_object fo 
+  WHERE fbo.flow_unid = fo.objectno 
+    AND fbo.flow_name = '璧勯噾浠樻' 
+    AND fo.phaseno NOT IN ('1000', '8000'))) tab  where tab.overmoney>0
+			 ]]> 
+	  </table_sql>
+	</ORACLE>
+      <dataSource>dataSource</dataSource>
+      <show_sql>false</show_sql>
+    </data>
+  </table>
+</table-root>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp
index ade36cba2..42327773c 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp
@@ -24,6 +24,12 @@
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+
+
+		window.onload=function(){
+	  		 var result = RunJavaMethodTrans("com.tenwa.customer.controller.account.CustomerAccountController","selectAccountName","customer_id="+"<%=customer_id%>");
+	   		setItemValue(0,0,"ACCOUNT",result);
+		}
 	//保存
 	function saveRecord(){	
 		if(!iV_all("0")) return;//先检查填写完整性
diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Financial/CustomerFSList.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Financial/CustomerFSList.jsp
index 2767b128d..05a882803 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/Financial/CustomerFSList.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/Financial/CustomerFSList.jsp
@@ -53,6 +53,7 @@
 	}
 	
 	function FSImport(){
+		debugger;
 		var sReportDate = getItemValue(0,getRow(),"ReportDate");
 		if(!sReportDate){
 			alert("请选择一条信息！");
diff --git a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp
index a32a5b602..0d2339a3f 100644
--- a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp
@@ -27,12 +27,6 @@
 include file="/Frame/resources/include/ui/include_info.jspf"%>
 
 <script type="text/javascript">
-    window.onload=function(){
-	    var cus = getItemValue(0,0,'customername');
-	      if(!cus){
-		    setItemValue(0,0,"customername",'<%=customer%>');
-	    }
-    }
 	function goBack(){ 
 		parent.AsDialog.ClosePage();
 	}
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp
index 06d9f6200..d9775034f 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp
@@ -4,15 +4,26 @@
 	<script type="text/javascript">
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ 
 	function newApply(){
+ 		debugger;
 	   var flowno="<%=CurPage.getParameter("ApplyType")%>";
+	   var orgId="<%=CurUser.getOrgID()%>";
  	   var selname="";
+ 	   var parm="";
+ 	   var businessType="";
+ 	  	if(orgId=="8009010"){
+			businessType="2";
+		}else if(orgId=="8009011"){
+			businessType="3";
+		}else{
+			businessType="false";
+		}
  	   if(flowno=="BContractCancelApply"){
  		  selname="SelectContract_Car";
     	}else{
     	  selname="SelectContract";
+    	  parm="businessType,"+businessType;
  	    }
-	 	   
-		AsDialog.OpenSelector(selname,"","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		AsDialog.OpenSelector(selname,parm,"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/Contract/ContractChange/ContractChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList.jsp
index 2bbda54e7..4bc69890e 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList.jsp
@@ -5,7 +5,16 @@
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply()
  	{
-		AsDialog.OpenSelector("SelectContract","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		var orgId="<%=CurUser.getOrgID()%>";
+ 		var businessType="";
+ 		if(orgId=="8009010"){
+ 			businessType="2";
+ 		}else if(orgId=="8009011"){
+ 			businessType="3";
+ 		}else{
+ 			businessType="false";
+ 		}
+		AsDialog.OpenSelector("SelectContract","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/Contract/ContractDataSupport/ContractDataSupportApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractDataSupport/ContractDataSupportApplyList.jsp
index d83536b24..cb1e7e288 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractDataSupport/ContractDataSupportApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractDataSupport/ContractDataSupportApplyList.jsp
@@ -5,7 +5,16 @@
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply()
  	{
-		AsDialog.OpenSelector("SelectContractForSupport","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+ 		var orgId="<%=CurUser.getOrgID()%>";
+ 		var businessType="";
+ 		if(orgId=="8009010"){
+ 			businessType="2";
+ 		}else if(orgId=="8009011"){
+ 			businessType="3";
+ 		}else{
+ 			businessType="false";
+ 		}
+		AsDialog.OpenSelector("SelectContractForSupport","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/Contract/ContractDataSupport/ContractDataSupportApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractDataSupport/ContractDataSupportApplyList_Car.jsp
index 93b2ee142..e62e1307c 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractDataSupport/ContractDataSupportApplyList_Car.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractDataSupport/ContractDataSupportApplyList_Car.jsp
@@ -5,7 +5,7 @@
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply()
  	{
-		AsDialog.OpenSelector("SelectContractForSupport","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		AsDialog.OpenSelector("SelectContractForSupport_Car","","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/Contract/ContractOnhire/ContractOnhireApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhire/ContractOnhireApplyList.jsp
index 3380bd7d5..214c8c07a 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhire/ContractOnhireApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhire/ContractOnhireApplyList.jsp
@@ -5,7 +5,17 @@
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply()
  	{
-		AsDialog.OpenSelector("selectContractPaymentPlan","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+ 		debugger;
+		var orgId="<%=CurUser.getOrgID()%>";
+ 		var businessType="";
+ 		if(orgId=="8009010"){
+ 			businessType="2";
+ 		}else if(orgId=="8009011"){
+ 			businessType="3";
+ 		}else{
+ 			businessType="false";
+ 		}
+		AsDialog.OpenSelector("selectContractPaymentPlanBusiness","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/Fund/ActualPayment/TraditionActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/TraditionActualPaymentTempList.jsp
new file mode 100644
index 000000000..25bf4fc8d
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/TraditionActualPaymentTempList.jsp
@@ -0,0 +1,171 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2017-06-06
+        Content: 
+        History Log: 
+    */
+    String phaseNo = CurPage.getParameter("PhaseNo");
+	String rightType = CurComp.getParameter("RightType");
+    String flowunid = CurPage.getParameter("FlowUnid");
+    String ishistory = CurPage.getParameter("IsHistory");
+	ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempList");
+	if(null!=ishistory&&ishistory.equals("true")){
+		doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
+	}
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.MultiSelect = true;
+	dwTemp.ReadOnly = "0";
+	dwTemp.ShowSummary = "1";
+	if("0030".equals(phaseNo)){
+		rightType = "ReadOnly";
+		dwTemp.ReadOnly = "1";
+	}
+	if("ReadOnly".equals(rightType)){
+		dwTemp.MultiSelect = false;
+	}
+	dwTemp.setPageSize(10);
+	ASDataObject ado = dwTemp.getDataObject();
+	ado.setLockCount(4);
+	ado.setReadOnly("PAYMENT_NUMBER", true);
+	ado.setReadOnly("PROJECT_NAME", true);
+	ado.setReadOnly("PLAN_ID", true);
+	ado.setReadOnly("FEE_TYPE", true);
+	ado.setReadOnly("SETTLE_METHOD", true);
+	ado.setReadOnly("PLAN_DATE", true);
+	ado.setReadOnly("ACCOUNT", true);
+	ado.setReadOnly("ACC_NUMBER", true);
+	ado.setHtmlEvent("FACT_MONEY", "onchange", "checkEquipAmtMoney");
+	ado.setHtmlEvent("FEE_ADJUST", "onchange", "checkEquipAmtMoney");
+	ado.setHtmlEvent("MEMO", "onmouseover", "showMemo");
+	ado.setHtmlEvent("MEMO", "onmouseout", "hideMemo");
+	ado.setHtmlEvent("MEMO", "onkeyup", "synchMemo");
+	dwTemp.genHTMLObjectWindow(flowunid);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String[][] sButtons = null;
+	if("ReadOnly".equals(rightType)){
+		sButtons = new String[][]{
+			};
+	}else{
+		sButtons = new String[][]{
+				{"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_save",""},
+				{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_delete",""}
+			};
+	}
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	$(function(){
+		setColRequired();
+	})
+	
+	function setColRequired(){
+		if("<%=rightType%>" != "ReadOnly"){
+			for(var i=0;i<DZ[0][2].length;i++){
+				if("settlemethod11" == getItemValue(0,i,"SETTLE_METHOD")){
+					var tablename = "myiframe0";
+					setItemNoRequired(0,i,"FACT_OBJECT_NAME");
+					setItemNoRequired(0,i,"CLIENT_BANK");
+					setItemNoRequired(0,i,"CLIENT_ACCOUNT");
+					setItemNoRequired(0,i,"CLIENT_ACCNUMBER");
+					setItemNoRequired(0,i,"BANK");
+					setItemNoRequired(0,i,"ACCOUNT");
+					setItemNoRequired(0,i,"ACC_NUMBER");
+				}
+			}
+		}
+	}
+	
+	function batchModify(){
+		var rows = getCheckedRows(0);
+		if(rows.length == 0){
+			alert("请选择需要批量修改的数据！");
+			return;
+		}
+		AsDialog.PopView("/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp","","dialogWidth=800px;dialogHeight=350px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(data){
+			if(data.length==0){
+				return;
+			}			
+			for(var i=0;i<rows.length;i++){
+				setItemValue(0,rows[i],"APPLYPAY_DATE",data.APPLYPAY_DATE);
+				setItemValue(0,rows[i],"FACT_DATE",data.APPLYPAY_DATE);
+				setItemValue(0,rows[i],"ACCOUNTING_DATE",data.ACCOUNTING_DATE);
+				setItemValue(0,rows[i],"SETTLE_METHOD",data.SETTLE_METHOD);
+				setItemValue(0,rows[i],"BANK",data.BANK);
+				setItemValue(0,rows[i],"ACCOUNT",data.ACCOUNT);
+				setItemValue(0,rows[i],"ACC_NUMBER",data.ACC_NUMBER);
+				setItemValue(0,rows[i],"MEMO",data.MEMO);
+			}
+		},"批量修改");
+	}
+	
+	function checkEquipAmtMoney(){
+		var colName = getInputInfo(this.id).colname.toUpperCase();
+		var position = getInputInfo(this.id).rowindex;
+		var oldValue = DZ[0][2][position][getColIndex(0,colName)];
+		var adjustMoney = eval(getItemValue(0,position,"FACT_MONEY") + "+" +getItemValue(0,position,"FEE_ADJUST"));
+		var paymoney = AsControl.RunJsp("/Tenwa/Lease/Flow/Fund/ActualPayment/GetApplyPassOverMoney.jsp","FlowUnid=<%=flowunid%>&PlanID="+getItemValue(0,position,"PLAN_ID"));
+		var money = eval(removeFomatedNumber(this.value));
+		if(colName == "FACT_MONEY" && money < 0){
+			if(oldValue == ".00"){
+				oldValue = "0.00";
+			}
+			this.value = oldValue;
+			alert("付款金额不能小于0！");
+			return;
+		}
+		if(adjustMoney > paymoney){
+			if(oldValue == ".00"){
+				oldValue = "0.00";
+			}
+			this.value = oldValue;
+			alert("本次付款金额不能大于申请金额！");
+			return;
+		}
+	}
+	
+	function SelectCustomerAccount(){
+		var position = getRow(0);
+		var customerID = getItemValue(0,position,"cust_id");
+		if(!customerID){
+			alert("请先选择付款对象！");
+			return;
+		}
+		AsDialog.OpenSelector("SelectCustomerAccount","customerID,"+customerID,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");
+	    	setItemValue(0,position,"CLIENT_BANK", sReturn[0]);
+	    	setItemValue(0,position,"CLIENT_ACCOUNT", sReturn[1]); 
+	    	setItemValue(0,position,"CLIENT_ACCNUMBER", sReturn[2]); 
+			},"请选择付款对象");
+	}
+	
+	function SelectCustomer(){
+		var position = getRow(0);
+		AsDialog.OpenSelector("SelectCustomerForPayment","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");
+	    	setItemValue(0,position,"cust_id", sReturn[0]);
+	    	setItemValue(0,position,"FACT_OBJECT", sReturn[1]);
+			},"请选择付款对象");
+	}
+	
+	function selectOwnAccount(){
+		var position = getRow(0);
+		AsDialog.OpenSelector("SelectOwnAccount","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");
+	    	setItemValue(0,position,"ACC_NUMBER", sReturn[0]);
+	    	setItemValue(0,position,"BANK", sReturn[1]);
+	    	setItemValue(0,position,"ACCOUNT", sReturn[2]); 
+			},"请选择本方账户信息");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
new file mode 100644
index 000000000..25bf4fc8d
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
@@ -0,0 +1,171 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2017-06-06
+        Content: 
+        History Log: 
+    */
+    String phaseNo = CurPage.getParameter("PhaseNo");
+	String rightType = CurComp.getParameter("RightType");
+    String flowunid = CurPage.getParameter("FlowUnid");
+    String ishistory = CurPage.getParameter("IsHistory");
+	ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempList");
+	if(null!=ishistory&&ishistory.equals("true")){
+		doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
+	}
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.MultiSelect = true;
+	dwTemp.ReadOnly = "0";
+	dwTemp.ShowSummary = "1";
+	if("0030".equals(phaseNo)){
+		rightType = "ReadOnly";
+		dwTemp.ReadOnly = "1";
+	}
+	if("ReadOnly".equals(rightType)){
+		dwTemp.MultiSelect = false;
+	}
+	dwTemp.setPageSize(10);
+	ASDataObject ado = dwTemp.getDataObject();
+	ado.setLockCount(4);
+	ado.setReadOnly("PAYMENT_NUMBER", true);
+	ado.setReadOnly("PROJECT_NAME", true);
+	ado.setReadOnly("PLAN_ID", true);
+	ado.setReadOnly("FEE_TYPE", true);
+	ado.setReadOnly("SETTLE_METHOD", true);
+	ado.setReadOnly("PLAN_DATE", true);
+	ado.setReadOnly("ACCOUNT", true);
+	ado.setReadOnly("ACC_NUMBER", true);
+	ado.setHtmlEvent("FACT_MONEY", "onchange", "checkEquipAmtMoney");
+	ado.setHtmlEvent("FEE_ADJUST", "onchange", "checkEquipAmtMoney");
+	ado.setHtmlEvent("MEMO", "onmouseover", "showMemo");
+	ado.setHtmlEvent("MEMO", "onmouseout", "hideMemo");
+	ado.setHtmlEvent("MEMO", "onkeyup", "synchMemo");
+	dwTemp.genHTMLObjectWindow(flowunid);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String[][] sButtons = null;
+	if("ReadOnly".equals(rightType)){
+		sButtons = new String[][]{
+			};
+	}else{
+		sButtons = new String[][]{
+				{"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_save",""},
+				{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_delete",""}
+			};
+	}
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	$(function(){
+		setColRequired();
+	})
+	
+	function setColRequired(){
+		if("<%=rightType%>" != "ReadOnly"){
+			for(var i=0;i<DZ[0][2].length;i++){
+				if("settlemethod11" == getItemValue(0,i,"SETTLE_METHOD")){
+					var tablename = "myiframe0";
+					setItemNoRequired(0,i,"FACT_OBJECT_NAME");
+					setItemNoRequired(0,i,"CLIENT_BANK");
+					setItemNoRequired(0,i,"CLIENT_ACCOUNT");
+					setItemNoRequired(0,i,"CLIENT_ACCNUMBER");
+					setItemNoRequired(0,i,"BANK");
+					setItemNoRequired(0,i,"ACCOUNT");
+					setItemNoRequired(0,i,"ACC_NUMBER");
+				}
+			}
+		}
+	}
+	
+	function batchModify(){
+		var rows = getCheckedRows(0);
+		if(rows.length == 0){
+			alert("请选择需要批量修改的数据！");
+			return;
+		}
+		AsDialog.PopView("/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp","","dialogWidth=800px;dialogHeight=350px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(data){
+			if(data.length==0){
+				return;
+			}			
+			for(var i=0;i<rows.length;i++){
+				setItemValue(0,rows[i],"APPLYPAY_DATE",data.APPLYPAY_DATE);
+				setItemValue(0,rows[i],"FACT_DATE",data.APPLYPAY_DATE);
+				setItemValue(0,rows[i],"ACCOUNTING_DATE",data.ACCOUNTING_DATE);
+				setItemValue(0,rows[i],"SETTLE_METHOD",data.SETTLE_METHOD);
+				setItemValue(0,rows[i],"BANK",data.BANK);
+				setItemValue(0,rows[i],"ACCOUNT",data.ACCOUNT);
+				setItemValue(0,rows[i],"ACC_NUMBER",data.ACC_NUMBER);
+				setItemValue(0,rows[i],"MEMO",data.MEMO);
+			}
+		},"批量修改");
+	}
+	
+	function checkEquipAmtMoney(){
+		var colName = getInputInfo(this.id).colname.toUpperCase();
+		var position = getInputInfo(this.id).rowindex;
+		var oldValue = DZ[0][2][position][getColIndex(0,colName)];
+		var adjustMoney = eval(getItemValue(0,position,"FACT_MONEY") + "+" +getItemValue(0,position,"FEE_ADJUST"));
+		var paymoney = AsControl.RunJsp("/Tenwa/Lease/Flow/Fund/ActualPayment/GetApplyPassOverMoney.jsp","FlowUnid=<%=flowunid%>&PlanID="+getItemValue(0,position,"PLAN_ID"));
+		var money = eval(removeFomatedNumber(this.value));
+		if(colName == "FACT_MONEY" && money < 0){
+			if(oldValue == ".00"){
+				oldValue = "0.00";
+			}
+			this.value = oldValue;
+			alert("付款金额不能小于0！");
+			return;
+		}
+		if(adjustMoney > paymoney){
+			if(oldValue == ".00"){
+				oldValue = "0.00";
+			}
+			this.value = oldValue;
+			alert("本次付款金额不能大于申请金额！");
+			return;
+		}
+	}
+	
+	function SelectCustomerAccount(){
+		var position = getRow(0);
+		var customerID = getItemValue(0,position,"cust_id");
+		if(!customerID){
+			alert("请先选择付款对象！");
+			return;
+		}
+		AsDialog.OpenSelector("SelectCustomerAccount","customerID,"+customerID,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");
+	    	setItemValue(0,position,"CLIENT_BANK", sReturn[0]);
+	    	setItemValue(0,position,"CLIENT_ACCOUNT", sReturn[1]); 
+	    	setItemValue(0,position,"CLIENT_ACCNUMBER", sReturn[2]); 
+			},"请选择付款对象");
+	}
+	
+	function SelectCustomer(){
+		var position = getRow(0);
+		AsDialog.OpenSelector("SelectCustomerForPayment","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");
+	    	setItemValue(0,position,"cust_id", sReturn[0]);
+	    	setItemValue(0,position,"FACT_OBJECT", sReturn[1]);
+			},"请选择付款对象");
+	}
+	
+	function selectOwnAccount(){
+		var position = getRow(0);
+		AsDialog.OpenSelector("SelectOwnAccount","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");
+	    	setItemValue(0,position,"ACC_NUMBER", sReturn[0]);
+	    	setItemValue(0,position,"BANK", sReturn[1]);
+	    	setItemValue(0,position,"ACCOUNT", sReturn[2]); 
+			},"请选择本方账户信息");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ContractInfo.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ContractInfo.jsp
new file mode 100644
index 000000000..7c8a590ba
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ContractInfo.jsp
@@ -0,0 +1,30 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2017-06-17
+        Content: 示例详情页面
+        History Log: 
+    */
+    String ishistory = CurPage.getParameter("IsHistory");
+	String flowunid = CurPage.getParameter("FlowUnid");
+	String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'");
+	String sTempletNo = "LBContractInfoTemp";//--模板号--
+	if("004".equals(productid)){
+		sTempletNo = "LBContractInfoTemp_Car";
+	}
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	if(null!=ishistory&&ishistory.equals("true")){
+		 doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
+	}
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";
+	dwTemp.ReadOnly = "-2";
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid"));
+	
+	String sButtons[][] = {
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp
new file mode 100644
index 000000000..84cb78418
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp
@@ -0,0 +1,35 @@
+<%@ page contentType="text/html; charset=GBK"%>
+ <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf"%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=自定义函数;]~*/%>
+	<script type="text/javascript">
+ 	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
+	function newApply(){
+		AsDialog.OpenSelector("SelectTraditionContractPayment","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+			if(!sReturn||sReturn=="_CANCEL_"){
+   			 return;
+	    	}
+			sReturn = sReturn.split("@");
+	    	var contract_id = sReturn[0];
+	    	var proj_id = sReturn[1];
+	    	var productId = sReturn[2];
+	    	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 sReturnInfos=sReturnInfo.split("@");
+	    	if(sReturnInfos[0]=="success")
+		     {
+		  		var objectNo=sReturnInfos[1];
+		  		FlowFunction.openStartFlowPage(objectNo);
+		   }
+		 else
+		  {
+		  	 var mes=sReturnInfos[1];
+		  		alert(mes);
+		  }
+	    	reloadSelf();
+		},"请选择合同");
+   }   
+	</script>
+ <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentPayCondition.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentPayCondition.jsp
new file mode 100644
index 000000000..2791ab7ad
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentPayCondition.jsp
@@ -0,0 +1,47 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%>
+<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
+<%	
+	/*
+        Author: undefined 2016-09-01
+        Content: 
+        History Log: 
+    */ 
+    
+	String FlowUnid=CurPage.getParameter("FlowUnid");
+	if(FlowUnid==""||FlowUnid==null){
+	    	FlowUnid="flowunid";
+    }
+	String rightType = CurPage.getParameter("RightType");
+  	String ishistory = CurPage.getParameter("IsHistory");
+  	String phaseNo = CurPage.getParameter("PhaseNo");
+	String compClientID = request.getParameter("CompClientID");
+	ASObjectModel doTemp = new ASObjectModel("FundPaymentPayCondition");
+	if(null!=ishistory&&ishistory.equals("true")){
+		doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
+	}
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";
+	dwTemp.ReadOnly="0";
+	if("0030".equals(phaseNo)){
+		dwTemp.getDataObject().setReadOnly("BUSINESS_CHECK", true);
+		dwTemp.getDataObject().setReadOnly("OPERATE_CHECK", false);
+	}
+	dwTemp.setPageSize(50);
+	dwTemp.genHTMLObjectWindow(FlowUnid);
+	
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+	};
+		
+%>
+<script type="text/javascript">
+ var rowSpan="PAYMENT_NUMBER,FEE_TYPE,PLAN_LIST,PLAN_MONEY";
+</script><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	$(function(){
+		$("#DWTD").width( document.body.offsetWidth  - 10);
+		document.getElementById('DWTD').innerHTML = '<div style="width:'+(document.body.offsetWidth  - 10)+'px;height:100%;overflow: scroll;">'+document.getElementById('DWTD').innerHTML+'</div>';
+	})
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundIncomeList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundIncomeList.jsp
new file mode 100644
index 000000000..d8c393112
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundIncomeList.jsp
@@ -0,0 +1,22 @@
+<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+
+	String flowunid = CurPage.getParameter("FlowUnid");	
+	String contract_id = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:FlowUnid")
+						 .setParameter("FlowUnid", flowunid).getSingleResult(false).getAttribute("contract_id").getString();	
+	ASObjectModel doTemp = new ASObjectModel("LCFundIncomeList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.ShowSummary = "1";
+	dwTemp.genHTMLObjectWindow(contract_id);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundPaymentList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundPaymentList.jsp
new file mode 100644
index 000000000..a82ec1ffc
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundPaymentList.jsp
@@ -0,0 +1,27 @@
+<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2017-06-06
+        Content: 
+        History Log: 
+    */
+    String flowunid = CurPage.getParameter("FlowUnid");
+	String contract_id = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:FlowUnid")
+		.setParameter("FlowUnid", flowunid).getSingleResult(false).getAttribute("contract_id").getString();
+	ASObjectModel doTemp = new ASObjectModel("LCFundPaymentList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.ShowSummary = "1";
+	dwTemp.genHTMLObjectWindow(contract_id);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp
new file mode 100644
index 000000000..2cf242340
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp
@@ -0,0 +1,73 @@
+<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2017-06-06
+        Content: 
+        History Log: 
+    */
+    String phaseNo = CurPage.getParameter("PhaseNo");
+	String rightType = CurComp.getParameter("RightType");
+    String flowunid = CurPage.getParameter("FlowUnid");
+	String contract_id = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:FlowUnid")
+		.setParameter("FlowUnid", flowunid).getSingleResult(false).getAttribute("contract_id").getString();
+	ASObjectModel doTemp = new ASObjectModel("VILCFundEquipAMTList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";
+	dwTemp.ShowSummary = "1";
+	if("0030".equals(phaseNo)){
+		rightType = "ReadOnly";
+		dwTemp.ReadOnly = "1";
+		dwTemp.MultiSelect = false;
+	}
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(contract_id);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = null;
+	if("ReadOnly".equals(rightType)){
+		sButtons = new String[][]{
+			};
+	}else{
+		sButtons = new String[][]{
+				{"true","","Button","生成本次付款","生成本次付款","openFundPlanList()","","","","btn_icon_add",""}
+			};
+	}
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function openFundPlanList(){
+		var equipAMTID = getItemValue(0,getRow(0),"ID");
+		if(equipAMTID == "" || !equipAMTID){
+			alert("请选择一条数据！");
+			return;
+		}
+		var equipOverMoney = getItemValue(0,getRow(0),"money");
+		if(confirm("是否要进行货扣？")){
+			AsDialog.OpenSelector("SelectPaymentFundList","paymentNumber,"+getItemValue(0,getRow(0),"payment_number"),"dialogWidth=" + parseInt(window.screen.width * 0.9) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+				if(!sReturn||sReturn=="_CANCEL_"){
+	   			 return;
+		    	}
+				var result = RunJavaMethodTrans("com.tenwa.flow.fund.flowpayment.FundPayment","setDeductMoney",
+						"fundList="+sReturn+",flowunid=<%=flowunid%>,equipAMTID="+equipAMTID+",equipOverMoney="+equipOverMoney+",userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
+				if("SUCCESS" == result){
+					alert("操作成功，请到本次付款明细查看！");
+					reloadSelf();
+				}else{
+					alert("操作失败！");
+				}
+			},"请选择合同");
+		}else{
+			var result = RunJavaMethodTrans("com.tenwa.flow.fund.flowpayment.FundPayment","setEquipAMTPayment",
+					"flowunid=<%=flowunid%>,equipAMTID="+equipAMTID+",equipOverMoney="+equipOverMoney+",userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
+			if("SUCCESS" == result){
+				alert("操作成功，请到本次付款明细查看！");
+				reloadSelf();
+			}else{
+				alert("操作失败！");
+			}
+		}
+	}
+	
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundOtherList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundOtherList.jsp
new file mode 100644
index 000000000..dca8f131b
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundOtherList.jsp
@@ -0,0 +1,65 @@
+<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2017-06-06
+        Content: 
+        History Log: 
+    */
+    String phaseNo = CurPage.getParameter("PhaseNo");
+	String rightType = CurComp.getParameter("RightType");
+    String flowunid = CurPage.getParameter("FlowUnid");
+	String contract_id = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:FlowUnid")
+		.setParameter("FlowUnid", flowunid).getSingleResult(false).getAttribute("contract_id").getString();
+	ASObjectModel doTemp = new ASObjectModel("VILCFundOtherList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";
+	dwTemp.ShowSummary = "1";
+	dwTemp.MultiSelect = true;
+	if("0030".equals(phaseNo)){
+		rightType = "ReadOnly";
+		dwTemp.ReadOnly = "1";
+		dwTemp.MultiSelect = false;
+	}
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(contract_id);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String[][] sButtons = null;
+	if("ReadOnly".equals(rightType)){
+		sButtons = new String[][]{
+			};
+	}else{
+		sButtons = new String[][]{
+				{"true","","Button","生成本次付款","生成本次付款","createFundIncome()","","","","btn_icon_add",""}
+			};
+	}
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function createFundIncome(){
+		var planids = "";
+		var overmoneys = "";
+		var rows = getCheckedRows(0);
+		if(rows.length == 0){
+			alert("请选择一条数据！");
+			return;
+		}
+		rows = getSelRows(0);
+		for(var i=0;i<rows.length;i++){
+			planids += "@" + getItemValue(0,rows[i],"ID");
+			overmoneys += "@" + getItemValue(0,rows[i],"money");
+		}
+		planids = planids.substring(1);
+		overmoneys = overmoneys.substring(1);
+		var result = RunJavaMethodTrans("com.tenwa.flow.fund.flowpayment.FundPayment","setFundPayment",
+				"flowunid=<%=flowunid%>,planids="+planids+",overmoneys="+overmoneys+",userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
+		if("SUCCESS" == result){
+			alert("操作成功，请到本次付款明细查看！");
+			reloadSelf();
+		}else{
+			alert("操作失败！");
+		}
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Project/ProjectCancel/ProjectCancelApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/ProjectCancel/ProjectCancelApplyList.jsp
index cc4d042a8..eaa42ecfc 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/ProjectCancel/ProjectCancelApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/ProjectCancel/ProjectCancelApplyList.jsp
@@ -4,7 +4,16 @@
 	<script type="text/javascript">
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply(){
-		AsDialog.OpenSelector("SelectProject","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		var orgId="<%=CurUser.getOrgID()%>";
+ 		var businessType="";
+ 		if(orgId=="8009010"){
+ 			businessType="2";
+ 		}else if(orgId=="8009011"){
+ 			businessType="3";
+ 		}else{
+ 			businessType="false";
+ 		}
+		AsDialog.OpenSelector("SelectProject","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/Project/ProjectChange/ProjectChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/ProjectChange/ProjectChangeApplyList.jsp
index 1a654444b..c6b673fb3 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/ProjectChange/ProjectChangeApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/ProjectChange/ProjectChangeApplyList.jsp
@@ -5,7 +5,16 @@
 	<script type="text/javascript">
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply(){
-		AsDialog.OpenSelector("SelectProject","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		var orgId="<%=CurUser.getOrgID()%>";
+ 		var businessType="";
+ 		if(orgId=="8009010"){
+ 			businessType="2";
+ 		}else if(orgId=="8009011"){
+ 			businessType="3";
+ 		}else{
+ 			businessType="false";
+ 		}
+		AsDialog.OpenSelector("SelectProject","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'));//请选择一条信息！
diff --git a/WebContent/Tenwa/Lease/Flow/Project/ProjectDataSupport/ProjectDataSupportApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/ProjectDataSupport/ProjectDataSupportApplyList.jsp
index 5eb6ab39f..057a1571e 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/ProjectDataSupport/ProjectDataSupportApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/ProjectDataSupport/ProjectDataSupportApplyList.jsp
@@ -5,7 +5,16 @@
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply()
  	{
-		AsDialog.OpenSelector("SelectProjectForSupport","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		var orgId="<%=CurUser.getOrgID()%>";
+ 		var businessType="";
+ 		if(orgId=="8009010"){
+ 			businessType="2";
+ 		}else if(orgId=="8009011"){
+ 			businessType="3";
+ 		}else{
+ 			businessType="false";
+ 		}
+		AsDialog.OpenSelector("SelectProjectForSupport","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/Project/ProjectRecredit/ProjectRecreditApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/ProjectRecredit/ProjectRecreditApplyList.jsp
index acb215f2f..27bf617b8 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/ProjectRecredit/ProjectRecreditApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/ProjectRecredit/ProjectRecreditApplyList.jsp
@@ -4,7 +4,16 @@
 <script type="text/javascript">
 	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply(){
-		AsDialog.OpenSelector("selectRecreditProject","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		var orgId="<%=CurUser.getOrgID()%>";
+ 		var businessType="";
+ 		if(orgId=="8009010"){
+ 			businessType="2";
+ 		}else if(orgId=="8009011"){
+ 			businessType="3";
+ 		}else{
+ 			businessType="false";
+ 		}
+		AsDialog.OpenSelector("selectRecreditProject","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/voucher/voucherass_detail.jsp b/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp
index f6055785e..c1ae6c155 100644
--- a/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp
+++ b/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp
@@ -34,12 +34,12 @@
 	// 凭证NC接口生成xml文件 
 	function NCInterface(){
 		alert("传输开始");
+	　　　//$.post('http://172.16.0.19/com.tenwa.voucher.serviceImp.VoucherSysJointNCServiceImpl/sendVoucherData' , function (text, status) { alert(text); });
 		var mes = RunJavaMethodTrans("com.tenwa.voucher.serviceImp.VoucherSysJointNCServiceImpl","sendVoucherData","");
 		alert("传输成功");
 	}
 
 	function synVoucherCode(){
-		
 		var ids=getItemValue(0,'f3')+"";
 		if(ids==""){
 			layer.alert("请先选择凭证信息！",{icon:7},function(index){
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 2641af59c..d08eccf08 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1092,7 +1092,7 @@
 			<Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否允许修改" PARAMETERID="AllowModify" PARAMETERNAME="是否允许修改" PRIGHTTYPE="Hide"/>
 		</Parameters>
 	</Component>
-	<Component FORMAT="1" ID="FIRST_PLAN_DATE" NAME="第一期租金支付日" STATUS="2" TYPE="PRD0311"/><Component FORMAT="1" ID="SECOND_PLAN_DATE" NAME="第二期租金支付日" STATUS="2" TYPE="PRD0311"/><Component FORMAT="1" ID="EQUIP_END_VALUE" NAME="期末余值" PRODUCT_TYPE="car_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE=""/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="INSURE_INCOME" NAME="保险费收入" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURE_EXPENSE" NAME="保险费支出" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="NOMINAL_PRICE" NAME="留购价款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="BEFORE_INTEREST" NAME="租前息" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PeriodBeginPayMoney" NAME="期初付款总计" STATUS="2" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All" SORTNO=""/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly" SORTNO=""/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly" SORTNO=""/><Parameter ARIGHTTYPE="ReadOnly" DISPLAYNAME="加上期初第一期租金" PARAMETERID="FirstRent" PARAMETERNAME="加上期初第一期租金" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="CleanCreditMoney" NAME="净融资额" STATUS="2" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly"/></Parameters></Component><Component FORMAT="1" ID="GrossProfit" NAME="项目粗利" STATUS="2" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="加上财务利息" PARAMETERID="FinanceInterest" PARAMETERNAME="加上财务利息" PRIGHTTYPE="ReadOnly"/></Parameters></Component>
+	<Component FORMAT="1" ID="FIRST_PLAN_DATE" NAME="第一期租金支付日" STATUS="2" TYPE="PRD0311"/><Component FORMAT="1" ID="SECOND_PLAN_DATE" NAME="第二期租金支付日" STATUS="2" TYPE="PRD0311"/><Component FORMAT="1" ID="EQUIP_END_VALUE" NAME="期末余值" PRODUCT_TYPE="car_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE=""/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="INSURE_INCOME" NAME="保险费收入" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURE_EXPENSE" NAME="保险费支出" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="NOMINAL_PRICE" NAME="留购价款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="BEFORE_INTEREST" NAME="租前息" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PeriodBeginPayMoney" NAME="期初付款总计" STATUS="2" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All" SORTNO=""/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly" SORTNO=""/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly" SORTNO=""/><Parameter ARIGHTTYPE="ReadOnly" DISPLAYNAME="加上期初第一期租金" PARAMETERID="FirstRent" PARAMETERNAME="加上期初第一期租金" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="CleanCreditMoney" NAME="净融资额" STATUS="2" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly"/></Parameters></Component><Component FORMAT="1" ID="GrossProfit" NAME="项目粗利" STATUS="2" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="加上财务利息" PARAMETERID="FinanceInterest" PARAMETERNAME="加上财务利息" PRIGHTTYPE="ReadOnly"/></Parameters></Component>
 	
 	
 	<Component FORMAT="1" ID="DISCOUNT" NAME="贴息" PRODUCT_TYPE="car_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="单台金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="总贴息金额" PARAMETERID="DISCOUNT_ALL" PARAMETERNAME="总贴息金额" PRIGHTTYPE="All"/></Parameters></Component>
diff --git a/WebContent/WEB-INF/etc/app_config.properties b/WebContent/WEB-INF/etc/app_config.properties
index 7a72b617a..b1406c5b9 100644
--- a/WebContent/WEB-INF/etc/app_config.properties
+++ b/WebContent/WEB-INF/etc/app_config.properties
@@ -1,74 +1,75 @@
-###############################################################################
-#  APP_CONFIG properties
-###############################################################################
-
-###############################################################################
-# APP_BASE_CONFIG
-###############################################################################
-# base.data.
-base.data.source=als
-base.data.encoding=UTF-8
-base.data.fource.encoding=true
-
-# base.param.key.
-base.param.key.hold.time=TokenHoldTime
-base.param.key.encoding=encoding
-base.param.key.no.check.uri=NoCheckURI
-
-# session check.
-base.session.check.token=token
-base.session.check.user.id=userid
-base.session.check.dev.id=devid
-base.session.check.dev.os=devos
-base.session.check.expire=expire
-
-# session.
-base.session.web.api.page=WebApiPage
-base.session.req.uri=ReqURI
-
-# base.return.
-base.return.code.500=500
-base.return.msg.500=\u540e\u53f0\u670d\u52a1\u51fa\u73b0\u5f02\u5e38!
-base.return.code.404=404
-base.return.code.406=406
-base.return.msg.406=\u8bbf\u95ee\u670d\u52a1\u540e\u53f0\u6743\u9650\u65e0\u6548!
-base.return.result.success.code=SUCCESS
-base.return.result.fail.code=FAIL
-base.return.msg.save.fail=\u4fdd\u5b58\u5931\u8d25
-base.return.msg.save.success=\u4fdd\u5b58\u6210\u529f
-base.return.msg.edit.fail=\u7f16\u8f91\u5931\u8d25
-base.return.msg.edit.success=\u7f16\u8f91\u6210\u529f
-base.return.msg.del.fail=\u5220\u9664\u5931\u8d25
-base.return.msg.del.success=\u5220\u9664\u6210\u529f
-base.return.msg.init.display.fail=\u521d\u59cb\u5316\u9875\u9762\u5931\u8d25
-base.return.msg.init.display.success=\u521d\u59cb\u5316\u9875\u9762\u6210\u529f
-
-base.return.type.void=void
-base.return.type.app.att=AppAtt
-
-# base pwd encryption des.
-base.pwd.encryption.des.one=0123456789abc
-base.pwd.encryption.des.two=1234567890abc
-base.pwd.encryption.des.three=1234567890!@#
-
-# customer type
-base.customer.type.company=01
-base.customer.type.person=03
-
-
-###############################################################################
-# APP_PUSH_MESSAGE_CONFIG
-###############################################################################
-push.message.switch=true
-push.message.secret.key.android=xpStkADS2IUJk10PejtJvQ==
-push.message.secret.key.ios=WZ5jwvsdAFzo+sDY7wrZgA==
-push.message.package.name=com.tenwa.test
-
-
-#base.filter.user.role.id='800090001R00000004','800090001R00000005','099','299','399','800090001R00000010','800090002R00000001','800090002R00000003','800090002R00000045','800090001R00000006','800090001R00000007','800090001R00000008','800090001R00000009','800090001R00000013','800090001R00000014','800090001R00000022','800090001R00000019','800090001R00000020','800090001R00000015','800090001R00000025'
-base.filter.user.role.id=none
-
-base.business.type=1
-base.company.doc.name=\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868@\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868,\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09@\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09,\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09@\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09,\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e@\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e,\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e@\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e,\u6536\u5165\u8bc1\u660e@\u6536\u5165\u8bc1\u660e,\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355@\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355,\u7a0e\u5355@\u7a0e\u5355,\u8425\u4e1a\u6267\u7167@\u8425\u4e1a\u6267\u7167,\u7ecf\u8425\u6750\u6599@\u7ecf\u8425\u6750\u6599,\u8d44\u683c\u8bc1\u4e66@\u8d44\u683c\u8bc1\u4e66,\u623f\u4ea7\u8bc1\u660e@\u623f\u4ea7\u8bc1\u660e,\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u8f66\u8f86\u7167\u7247@\u8f66\u8f86\u7167\u7247,\u8f66\u8f86\u89c6\u9891@\u8f66\u8f86\u89c6\u9891,\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a,\u5176\u4ed6@\u5176\u4ed6,
-base.person.doc.name=\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868@\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868,\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09@\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09,\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09@\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09,\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e@\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e,\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e@\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e,\u6536\u5165\u8bc1\u660e@\u6536\u5165\u8bc1\u660e,\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355@\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355,\u7a0e\u5355@\u7a0e\u5355,\u8425\u4e1a\u6267\u7167@\u8425\u4e1a\u6267\u7167,\u7ecf\u8425\u6750\u6599@\u7ecf\u8425\u6750\u6599,\u8d44\u683c\u8bc1\u4e66@\u8d44\u683c\u8bc1\u4e66,\u623f\u4ea7\u8bc1\u660e@\u623f\u4ea7\u8bc1\u660e,\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u8f66\u8f86\u7167\u7247@\u8f66\u8f86\u7167\u7247,\u8f66\u8f86\u89c6\u9891@\u8f66\u8f86\u89c6\u9891,\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a,\u5176\u4ed6@\u5176\u4ed6
+###############################################################################
+#  APP_CONFIG properties
+###############################################################################
+
+###############################################################################
+# APP_BASE_CONFIG
+###############################################################################
+# base.data.
+base.data.source=als
+base.data.encoding=UTF-8
+base.data.fource.encoding=true
+
+# base.param.key.
+base.param.key.hold.time=TokenHoldTime
+base.param.key.encoding=encoding
+base.param.key.no.check.uri=NoCheckURI
+
+# session check.
+base.session.check.token=token
+base.session.check.user.id=userid
+base.session.check.dev.id=devid
+base.session.check.dev.os=devos
+base.session.check.expire=expire
+
+# session.
+base.session.web.api.page=WebApiPage
+base.session.req.uri=ReqURI
+
+# base.return.
+base.return.code.500=500
+base.return.msg.500=\u540e\u53f0\u670d\u52a1\u51fa\u73b0\u5f02\u5e38!
+base.return.code.404=404
+base.return.code.406=406
+base.return.msg.406=\u8bbf\u95ee\u670d\u52a1\u540e\u53f0\u6743\u9650\u65e0\u6548!
+base.return.result.success.code=SUCCESS
+base.return.result.fail.code=FAIL
+base.return.msg.save.fail=\u4fdd\u5b58\u5931\u8d25
+base.return.msg.save.success=\u4fdd\u5b58\u6210\u529f
+base.return.msg.edit.fail=\u7f16\u8f91\u5931\u8d25
+base.return.msg.edit.success=\u7f16\u8f91\u6210\u529f
+base.return.msg.del.fail=\u5220\u9664\u5931\u8d25
+base.return.msg.del.success=\u5220\u9664\u6210\u529f
+base.return.msg.init.display.fail=\u521d\u59cb\u5316\u9875\u9762\u5931\u8d25
+base.return.msg.init.display.success=\u521d\u59cb\u5316\u9875\u9762\u6210\u529f
+
+base.return.type.void=void
+base.return.type.app.att=AppAtt
+
+# base pwd encryption des.
+base.pwd.encryption.des.one=0123456789abc
+base.pwd.encryption.des.two=1234567890abc
+base.pwd.encryption.des.three=1234567890!@#
+
+# customer type
+base.customer.type.company=01
+base.customer.type.person=03
+
+
+###############################################################################
+# APP_PUSH_MESSAGE_CONFIG
+###############################################################################
+push.message.switch=true
+push.message.secret.key.android=xpStkADS2IUJk10PejtJvQ==
+push.message.secret.key.ios=WZ5jwvsdAFzo+sDY7wrZgA==
+push.message.package.name=com.tenwa.test
+
+
+#base.filter.user.role.id='800090001R00000004','800090001R00000005','099','299','399','800090001R00000010','800090002R00000001','800090002R00000003','800090002R00000045','800090001R00000006','800090001R00000007','800090001R00000008','800090001R00000009','800090001R00000013','800090001R00000014','800090001R00000022','800090001R00000019','800090001R00000020','800090001R00000015','800090001R00000025'
+base.filter.user.role.id=none
+
+base.business.type=1
+base.company.doc.name=\u7533\u8bf7\u4eba\u8425\u4e1a\u6267\u7167\uff08\u6b63\u672c\u6216\u526f\u672c\uff09@\u7533\u8bf7\u4eba\u8425\u4e1a\u6267\u7167\uff08\u6b63\u672c\u6216\u526f\u672c\uff09,\u7533\u8bf7\u4eba\u516c\u53f8\u7ae0\u7a0b\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u7533\u8bf7\u4eba\u516c\u53f8\u7ae0\u7a0b\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u7533\u8bf7\u4eba\u9a8c\u8d44\u62a5\u544a\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u7533\u8bf7\u4eba\u9a8c\u8d44\u62a5\u544a\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u6cd5\u4eba\u4ee3\u8868\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u6cd5\u4eba\u4ee3\u8868\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u8d22\u52a1\u8d1f\u8d23\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u8d22\u52a1\u8d1f\u8d23\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u80a1\u4e1c\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u80a1\u4e1c\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09@\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09,\u7ecf\u8425\u573a\u6240\u79df\u8d41\u534f\u8bae@\u7ecf\u8425\u573a\u6240\u79df\u8d41\u534f\u8bae,\u4e0a\u5e74\u5ea6\u53ca\u8fd11\u4e2a\u6708\u7684\u8d22\u52a1\u62a5\u8868\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u4e0a\u5e74\u5ea6\u53ca\u8fd11\u4e2a\u6708\u7684\u8d22\u52a1\u62a5\u8868\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u516c\u53f8\u94f6\u884c\u6d41\u6c34\uff08\u6216\u80a1\u4e1c\u540d\u4e0b\u94f6\u884c\u6d41\u6c34\uff09@\u516c\u53f8\u94f6\u884c\u6d41\u6c34\uff08\u6216\u80a1\u4e1c\u540d\u4e0b\u94f6\u884c\u6d41\u6c34\uff09,\u4e1a\u52a1\u5f80\u6765\u5408\u540c@\u4e1a\u52a1\u5f80\u6765\u5408\u540c,\u80a1\u4e1c\u7b80\u5386@\u80a1\u4e1c\u7b80\u5386,\u540c\u610f\u7533\u8bf7\u878d\u8d44\u79df\u8d41\u4e1a\u52a1\u7684\u80a1\u4e1c\u4f1a\u51b3\u8bae@\u540c\u610f\u7533\u8bf7\u878d\u8d44\u79df\u8d41\u4e1a\u52a1\u7684\u80a1\u4e1c\u4f1a\u51b3\u8bae,\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868@\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868,\u7ecf\u8425\u8bb8\u53ef\u8bc1\uff08\u7279\u6b8a\u884c\u4e1a\u5982\u6709\u63d0\u4f9b\uff09@\u7ecf\u8425\u8bb8\u53ef\u8bc1\uff08\u7279\u6b8a\u884c\u4e1a\u5982\u6709\u63d0\u4f9b\uff09,\u4e2a\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u4e66@\u4e2a\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u4e66,\u4f01\u4e1a\u5f81\u4fe1\u67e5\u8be2@\u4f01\u4e1a\u5f81\u4fe1\u67e5\u8be2
+base.person.doc.name=\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868@\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868,\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09@\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09,\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09@\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09,\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e@\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e,\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e@\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e,\u6536\u5165\u8bc1\u660e@\u6536\u5165\u8bc1\u660e,\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355@\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355,\u7a0e\u5355@\u7a0e\u5355,\u8425\u4e1a\u6267\u7167@\u8425\u4e1a\u6267\u7167,\u7ecf\u8425\u6750\u6599@\u7ecf\u8425\u6750\u6599,\u8d44\u683c\u8bc1\u4e66@\u8d44\u683c\u8bc1\u4e66,\u623f\u4ea7\u8bc1\u660e@\u623f\u4ea7\u8bc1\u660e,\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u8f66\u8f86\u7167\u7247@\u8f66\u8f86\u7167\u7247,\u8f66\u8f86\u89c6\u9891@\u8f66\u8f86\u89c6\u9891,\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a,\u5176\u4ed6@\u5176\u4ed6
+
 base.calculation.tool.flow.unid=TENWA123
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 91a95cec5..b5a43639b 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -3511,7 +3511,7 @@
 				<attribute name="pdfurl" label="鐢靛瓙绁≒DF鏂囦欢涓嬭浇鍦板潃" type="STRING" length="500"/>
 				<attribute name="localFile" label="鐢靛瓙绁≒DF鏂囦欢鏈湴鍦板潃" type="STRING" length="500"/>
 				<attribute name="returncode" label="缁撴灉鐘舵�佺爜" type="STRING" length="1"/>
-				<attribute name="returnmsg" label="缁撴灉鎻忚堪" type="STRING" length="20"/>
+				<attribute name="returnmsg" label="缁撴灉鎻忚堪" type="STRING" length="500"/>
 				<attribute name="FIELD1" label="FIELD1" type="STRING" length="32"/>
 				<attribute name="FIELD2" label="FIELD2" type="STRING" length="32"/>
 				<attribute name="FIELD3" label="FIELD3" type="STRING" length="32"/>
@@ -3637,7 +3637,8 @@
 				<attribute name="TAX_TYPE" label="閲戦绫诲瀷" type="STRING"/>
 				<attribute name="TAX_REG_CODE" label="绾崇◣浜鸿瘑鍒彿" type="STRING"/>
 				<attribute name="TAX_BANK" label="寮�鎴疯" type="STRING"/>
-				<attribute name="TAX_ACC" label="寮�鎴疯处鍙�" type="STRING"/>
+				<attribute name="TAX_ACC" label="寮�鎴疯处鍙�" type="STRING"/>
+				<attribute name="invoice_status" label="鐘舵��" type="STRING"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java
index c4dcdbd25..fba46256b 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java
@@ -55,7 +55,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
 		//String FlowUnid=this.getAttribute("FlowUnid").toString();
 		//String VOUCHERNO="PZ2018071000000005";
 		//String VOUCHERNO=this.getAttribute("VoucherNo").toString();
-		if("PZ2018080300000069".equals(VOUCHERNO)||"PZ2018071000000005".equals(VOUCHERNO)) {
+		if("PZ2018080300000069".equals(VOUCHERNO)||"PZ2018071100000010".equals(VOUCHERNO)) {
 			 sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.HANDLING_CHARGE_MONEY,LCCT.CLEAN_LEASE_MONEY,IFNULL(LCCT.CAUTION_MONEY,0)AS CAUTION_MONEY,LCCT.INSURANCE_PREMIUM,LCCT.PURCHASE_TAX,LCCT.INCIDENTAL,LCCT.GPS_FEE as GPS_FEE_FINANCE,LCCT.TABLEWARE_FEE,LRPT.INTEREST,LRPT.INTERESTNOTAX,LRPT.TAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LCCT.GPS_FEE_FINA FROM LC_CALC_CONDITION LCCT inner join (SELECT contract_id,FLOWUNID,min(ACC_NUMBER) ACC_NUMBER FROM lc_fund_income_temp WHERE fee_type='feetype10' GROUP BY contract_id,FLOWUNID) lfit on lfit.contract_id=lcct.contract_id  LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST,SUM(ROUND((INTEREST/1.16),2)) AS INTERESTNOTAX,SUM(INTEREST-ROUND((INTEREST/1.16),2)) AS TAX FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID=LCCT.FLOWUNID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lfit.FLOWUNID=:FLOWUNID";
 		}else {
 			 sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.HANDLING_CHARGE_MONEY,LCCT.CLEAN_LEASE_MONEY,IFNULL(LCCT.CAUTION_MONEY,0)AS CAUTION_MONEY,LCCT.INSURANCE_PREMIUM,LCCT.PURCHASE_TAX,LCCT.INCIDENTAL,LCCT.GPS_FEE as GPS_FEE_FINANCE,LCCT.TABLEWARE_FEE,LRPT.INTEREST,LRPT.INTERESTNOTAX,LRPT.TAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LCCT.GPS_FEE_FINA FROM LC_CALC_CONDITION LCCT inner join (SELECT contract_id,FLOWUNID,min(ACC_NUMBER) ACC_NUMBER FROM lc_fund_income_temp WHERE fee_type='feetype10' GROUP BY contract_id,FLOWUNID) lfit on lfit.contract_id=lcct.contract_id  LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST,SUM(ROUND((INTEREST/1.06),2)) AS INTERESTNOTAX,SUM(INTEREST-ROUND((INTEREST/1.06),2)) AS TAX FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID=LCCT.FLOWUNID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lfit.FLOWUNID=:FLOWUNID";
diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
index fb48d73ef..d3b22b386 100644
--- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
@@ -301,7 +301,10 @@ public class CreateVoucherServiceImpl {
 				if("PZ2018071000000006".equals(VOUCHERNO) || "PZ2018080300000071".equals(VOUCHERNO) || "PZ2018071100000010".equals(VOUCHERNO) || "PZ2018080300000074".equals(VOUCHERNO)) {
 					subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id
 					subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称
-				}else if("PZ2018072100000037".equals(VOUCHERNO)||"PZ2018080400000091".equals(VOUCHERNO)){
+				}else if("PZ2018082600000149".equals(VOUCHERNO) || "PZ2018082600000150".equals(VOUCHERNO) || "PZ2018070900000003".equals(VOUCHERNO) || "PZ2018080200000065".equals(VOUCHERNO)) {
+					subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id
+					subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称
+				}else if("PZ2018072100000037".equals(VOUCHERNO)||"PZ2018080400000091".equals(VOUCHERNO) || "PZ2018072100000038".equals(VOUCHERNO)||"PZ2018080400000092".equals(VOUCHERNO)){
 					subData.put("CUSTID","0203440110");//经销商id
 					subData.put("CUSTNAME","业务系统待查客户");//经销商名称
 				}else {
@@ -313,7 +316,10 @@ public class CreateVoucherServiceImpl {
 				subData.put("F8",dataTemp.get("MONEY"));//贷方金额
 				subData.put("ENTRYDC", "-1");
 				//凭证信息像是经销商名称
-				if("PZ2018071000000006".equals(VOUCHERNO) || "PZ2018080300000071".equals(VOUCHERNO) || "PZ2018071100000010".equals(VOUCHERNO) || "PZ2018080300000074".equals(VOUCHERNO) || "PZ2018082600000149".equals(VOUCHERNO) || "PZ2018082600000150".equals(VOUCHERNO)) {
+				if("PZ2018071000000006".equals(VOUCHERNO) || "PZ2018080300000071".equals(VOUCHERNO) || "PZ2018071100000010".equals(VOUCHERNO) || "PZ2018080300000074".equals(VOUCHERNO)) {
+					subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id
+					subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称
+				}else if("PZ2018070900000003".equals(VOUCHERNO) || "PZ2018080200000065".equals(VOUCHERNO)) {
 					subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id
 					subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称
 				}else if("PZ2018081600000120".equals(VOUCHERNO)){
diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java
index 8dd1e8d32..a64ad0193 100644
--- a/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java
@@ -140,7 +140,7 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService {
 						Element year = voucherHead.addElement("year");// 会计年度/非空
 							year.setText(ACC_YEAR);
 						Element pk_system = voucherHead.addElement("pk_system");// 来源系统/非空
-							pk_system.setText(own.getAttribute("OWN_NAME").getString());//----------------------------------------
+							pk_system.setText(own.getAttribute("OWN_NAME").getString()==null?"":own.getAttribute("OWN_NAME").getString());//----------------------------------------
 						Element voucherkind = voucherHead.addElement("voucherkind");// 凭证类型值/非空
 							voucherkind.setText("0");
 						Element pk_accountingbook = voucherHead.addElement("pk_accountingbook");// 核算核算账簿/非空
@@ -817,9 +817,9 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService {
 						Element item1 = suplinkman.addElement("item");// 编码,最大长度为64,类型为:String
 							Element linkmanvo = item1.addElement("linkmanvo");
 								Element code2 = linkmanvo.addElement("code"); // 编码,最大长度为64,类型为:String
-									code2.setText("");
+									code2.setText(DISTRIBUTOR_CODING);
 								Element name2 = linkmanvo.addElement("name"); // 名称,最大长度为64,类型为:String
-									name2.setText("");
+									name2.setText(DISTRIBUTOR_NAME);
 								Element sex = linkmanvo.addElement("sex"); // 性别,最大长度为64,类型为:Integer
 									sex.setText("");
 								Element vjob2 = linkmanvo.addElement("vjob"); // 职位,最大长度为64,类型为:String
@@ -839,7 +839,7 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService {
 								Element address = linkmanvo.addElement("address"); // 住址,最大长度为64,类型为:String
 									address.setText("");
 								Element postcode = linkmanvo.addElement("postcode"); // 邮编,最大长度为64,类型为:String
-									postcode.setText("");
+									postcode.setText(POSTCODE);
 								Element memo2 = linkmanvo.addElement("memo"); // 其它,最大长度为64,类型为:String
 									memo2.setText("");
 							Element pk_linkman = item1.addElement("pk_linkman");// 联系人,最大长度为20,类型为:String
@@ -944,11 +944,11 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService {
 						Element shortname = billhead.addElement("shortname");// 简称,最大长度为200,类型为:String
 							shortname.setText(contract_name);
 						Element mnecode = billhead.addElement("mnecode");// 助记码,最大长度为50,类型为:String
-							mnecode.setText("助记码,最大长度为50,类型为:String");
+							mnecode.setText("");
 						Element pid = billhead.addElement("pid");// 上级档案,最大长度为20,类型为:String
-							pid.setText("上级档案,最大长度为20,类型为:String");
+							pid.setText("");
 						Element memo = billhead.addElement("memo");// 备注,最大长度为200,类型为:String
-							memo.setText("备注,最大长度为200,类型为:String");
+							memo.setText("");
 				}
 			String URL="D:\\voucher\\"+"APleasing_"+(i+1)+"_Defdoc_"+year_month_day+".xml";
 			file=new File(URL);
diff --git a/src_tenwa/com/tenwa/apzl/invoicemanager/rentplaninvoice/rentPlanInvoiceManager.java b/src_tenwa/com/tenwa/apzl/invoicemanager/rentplaninvoice/rentPlanInvoiceManager.java
index a1b385b8f..292fe9803 100644
--- a/src_tenwa/com/tenwa/apzl/invoicemanager/rentplaninvoice/rentPlanInvoiceManager.java
+++ b/src_tenwa/com/tenwa/apzl/invoicemanager/rentplaninvoice/rentPlanInvoiceManager.java
@@ -29,6 +29,7 @@ import jbo.app.tenwa.calc.VI_INVOICE_RENT_PLAN_CONFIRM;
 import jbo.app.tenwa.calc.VI_LI_INVOICE_OTHERS;
 import jbo.app.tenwa.calc.VI_LI_INVOICE_RENT;
 import jbo.app.tenwa.customer.CUSTOMER_COMPANY;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY;
 import jbo.app.tenwa.customer.CUSTOMER_PERSON;
 import jbo.awe.USER_INFO;
 import jbo.com.tenwa.entity.comm.invoice.LI_RENT_INVOICE_INFO;
@@ -117,53 +118,70 @@ public class rentPlanInvoiceManager extends BaseTable{
 		String contract_id="";
 		
 		for(int i=0;i<planIds.length;i++){
-			String id=UUID.randomUUID().toString().replaceAll("-", "");
 			String planId = planIds[i];
-			BizObject viInvoiceRent = viInvoiceRentManager.createQuery("plan_id=:plan_id").setParameter("plan_id", planId).getSingleResult(false);
-			invoice_money = viInvoiceRent.getAttribute("plan_money").toString();
-			plan_id = viInvoiceRent.getAttribute("plan_id").toString();
-			PAYMENT_NUMBER = viInvoiceRent.getAttribute("payment_number").toString();
-			TAX_REG_CODE = viInvoiceRent.getAttribute("cert_id").toString();
-			TAX_BANK = viInvoiceRent.getAttribute("bank_name").toString();
-			TAX_ACC = viInvoiceRent.getAttribute("acc_number").toString();
-			contract_id = viInvoiceRent.getAttribute("contract_id").toString();
-			
-			tax_type = viInvoiceRent.getAttribute("tax_type").toString();
-			
-			
-			BizObject lriiObject = lriiManager.createQuery("plan_id=:plan_id").setParameter("plan_id", planId).getSingleResult(false);
-			if(lriiObject!=null){
-				lriiManager.createQuery("update o set invoice_status='1' where plan_id=:plan_id").setParameter("plan_id", planId).executeUpdate();
-			}else{
+			//BizObject viInvoiceRent = viInvoiceRentManager.createQuery("plan_id=:plan_id").setParameter("plan_id", planId).getSingleResult(false);
+			List<BizObject> viInvoiceRent = JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.VI_LI_INVOICE_RENT", "plan_id=:plan_id").setParameter("plan_id", planId).getResultList(false);
+			for (BizObject bizObject : viInvoiceRent) {
+				String id=UUID.randomUUID().toString().replaceAll("-", "");
 				
-				BizObject rentInvoiceInfo = lriiManager.newObject();
-				rentInvoiceInfo.setAttributeValue("id", id);
-				rentInvoiceInfo.setAttributeValue("invoice_status", invoice_status);
-				rentInvoiceInfo.setAttributeValue("bill_type", bill_type);
-				rentInvoiceInfo.setAttributeValue("invoice_money", invoice_money);
+				invoice_money = bizObject.getAttribute("plan_money").toString();
+				plan_id = bizObject.getAttribute("plan_id").toString();
+				PAYMENT_NUMBER = bizObject.getAttribute("payment_number").toString();
+				TAX_REG_CODE = bizObject.getAttribute("cert_id").toString();
+				TAX_BANK = bizObject.getAttribute("bank_name").toString();
+				TAX_ACC = bizObject.getAttribute("acc_number").toString();
+				contract_id = bizObject.getAttribute("contract_id").toString();
+				tax_type = bizObject.getAttribute("tax_type").toString();
 				
 				if("利息".equals(tax_type)){	
-					rentInvoiceInfo.setAttributeValue("tax_type", "interest");
+					tax_type = "interest";
 				}else if("逾期利息".equals(tax_type)){
-					rentInvoiceInfo.setAttributeValue("tax_type", "overinterest");
-				
-				}else{
-					return "金额类型为空！";
+					tax_type = "overinterest";					
 				}
 				
-				rentInvoiceInfo.setAttributeValue("TEMPORARY_NOINVOICE", "0.00");
-				rentInvoiceInfo.setAttributeValue("NOINVOICE", "0.00");
-				rentInvoiceInfo.setAttributeValue("plan_id", plan_id);
-				rentInvoiceInfo.setAttributeValue("PAYMENT_NUMBER", PAYMENT_NUMBER);
-				rentInvoiceInfo.setAttributeValue("TAX_REG_CODE", TAX_REG_CODE);// 纳税人识别号
-				rentInvoiceInfo.setAttributeValue("TAX_BANK", TAX_BANK);//开户行
-				rentInvoiceInfo.setAttributeValue("TAX_ACC", TAX_ACC);//开户账号
-				rentInvoiceInfo.setAttributeValue("contract_id", contract_id);
 				
-				rentInvoiceInfo = this.initTabeUserInfo(rentInvoiceInfo);
-				lriiManager.saveObject(rentInvoiceInfo);
+				BizObject lriiObject = lriiManager.createQuery("plan_id=:plan_id and tax_type=:tax_type").setParameter("plan_id", planId).setParameter("tax_type", tax_type).getSingleResult(false);
+				if(lriiObject!=null){
+					lriiManager.createQuery("update o set invoice_status='1' where plan_id=:plan_id").setParameter("plan_id", planId).executeUpdate();
+				}else{
+					
+					BizObject rentInvoiceInfo = lriiManager.newObject();
+					rentInvoiceInfo.setAttributeValue("id", id);
+					rentInvoiceInfo.setAttributeValue("invoice_status", invoice_status);
+					rentInvoiceInfo.setAttributeValue("bill_type", bill_type);
+					rentInvoiceInfo.setAttributeValue("invoice_money", invoice_money);
+					
+					/*if("利息".equals(tax_type)){	
+						rentInvoiceInfo.setAttributeValue("tax_type", "interest");
+					}else if("逾期利息".equals(tax_type)){
+						rentInvoiceInfo.setAttributeValue("tax_type", "overinterest");
+						
+					}else{
+						return "金额类型为空！";
+					}*/
+					
+					if("".equals(tax_type) || tax_type==null){	
+						return "金额类型为空！";
+					}else{
+						rentInvoiceInfo.setAttributeValue("tax_type", tax_type);
+					} 
+					
+						
+					
+					rentInvoiceInfo.setAttributeValue("TEMPORARY_NOINVOICE", "0.00");
+					rentInvoiceInfo.setAttributeValue("NOINVOICE", "0.00");
+					rentInvoiceInfo.setAttributeValue("plan_id", plan_id);
+					rentInvoiceInfo.setAttributeValue("PAYMENT_NUMBER", PAYMENT_NUMBER);
+					rentInvoiceInfo.setAttributeValue("TAX_REG_CODE", TAX_REG_CODE);// 纳税人识别号
+					rentInvoiceInfo.setAttributeValue("TAX_BANK", TAX_BANK);//开户行
+					rentInvoiceInfo.setAttributeValue("TAX_ACC", TAX_ACC);//开户账号
+					rentInvoiceInfo.setAttributeValue("contract_id", contract_id);
+					
+					rentInvoiceInfo = this.initTabeUserInfo(rentInvoiceInfo);
+					lriiManager.saveObject(rentInvoiceInfo);
+				}
 			}
-			
+
 		}
 		
 		return "开票成功";
@@ -259,11 +277,11 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 		if(ownAccount==null || "".equals(ownAccount)){
 			return "您的本方银行账户为空！";
 		}
-		String[] rentPlanids = this.getIds().split("@");
+		String[] rentInvoiceids = this.getIds().split("@");
 		List<String> rentPlanIdList = new ArrayList<String>();
 		
-		for(int i=0;i<rentPlanids.length;i++){
-			rentPlanIdList.add("'"+rentPlanids[i]+"'");
+		for(int i=0;i<rentInvoiceids.length;i++){
+			rentPlanIdList.add("'"+rentInvoiceids[i]+"'");
 		}
 		
 		String customerid="";
@@ -293,8 +311,8 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 		
 		BizObjectManager invoiceRentManager = JBOFactory.getBizObjectManager(LI_RENT_INVOICE_INFO.CLASS_NAME);
 	    Double sl = 0.06;    
-		for(int i=0;i<rentPlanids.length;i++){
-			String invoiceId = rentPlanids[i];
+		for(int i=0;i<rentInvoiceids.length;i++){
+			String invoiceId = rentInvoiceids[i];//li_rent_invoice_info的id
 			
 			BizObjectManager confirmDetailManager = JBOFactory.getBizObjectManager(LI_INVOICE_CONFIRM_DETAIL.CLASS_NAME);
 			tx.join(confirmDetailManager);
@@ -304,12 +322,14 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 			String planid="";
 			String planList="";
 			String TAX_TYPE ="";
+			String spbm = "";
+			String spmc = "";
 			
 			BizObject invoiceRentBizObject = invoiceRentManager.createQuery("ID=:id ").setParameter("id",invoiceId).getSingleResult(false);
 			invoiceMoney = new BigDecimal(invoiceRentBizObject.getAttribute("INVOICE_MONEY").getString()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
 			TAX_TYPE = invoiceRentBizObject.getAttribute("TAX_TYPE").getString();
 			planid = invoiceRentBizObject.getAttribute("plan_id").toString();
-			if(planid !=null || !"".equals(planid)){
+			if(planid !=null && !"".equals(planid)){
 				BizObjectManager rentPlanManager = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME);
 				
 				BizObject rentPlan = rentPlanManager.createQuery("id=:plan_id").setParameter("plan_id", planid).getSingleResult(false);
@@ -318,6 +338,21 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 				if("overinterest".equals(TAX_TYPE)){
 					planList += " "+"逾期利息"; 		
 				}
+				spmc = "租赁利息";
+			}else{
+				if ("myhj".equals(TAX_TYPE)) {
+					//planList = "名义货价";
+					spmc = "名义货价";
+				}else if("sxf".equals(TAX_TYPE)){
+					//planList = "手续费";
+					spmc = "手续费";
+				}else if("gps".equals(TAX_TYPE)){
+					//planList = "GPS安装服务费";
+					spmc = "GPS安装服务费";
+				}else{
+					return "金额类型不存在！";
+				}
+				
 			}
 
 			Double se = Double.valueOf(  df2.format(invoiceMoney*sl ));
@@ -333,21 +368,7 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 			confirmDetailBizObject.setAttributeValue("spsl","");
 			confirmDetailBizObject.setAttributeValue("dw","");
 			confirmDetailBizObject.setAttributeValue("fphxz","0");
-			
-			/*if("sxf".equals(TAX_TYPE)){
-				confirmDetailBizObject.setAttributeValue("spmc","手续费");		
-			}else if("myhj".equals(TAX_TYPE)){
-				confirmDetailBizObject.setAttributeValue("spmc","名义货价");
-			}else if("gps".equals(TAX_TYPE)){
-				confirmDetailBizObject.setAttributeValue("spmc","GPS安装服务费");
-			}else{
-				confirmDetailBizObject.setAttributeValue("spmc","租赁利息");
-			}*/
-			if("overinterest".equals(TAX_TYPE) || "interest".equals(TAX_TYPE)){
-				confirmDetailBizObject.setAttributeValue("spmc","租赁利息");		
-			}else{
-				confirmDetailBizObject.setAttributeValue("spmc","其他费用");
-			}
+			confirmDetailBizObject.setAttributeValue("spmc",spmc);		
 			
 			confirmDetailBizObject.setAttributeValue("spsm","");
 			confirmDetailBizObject.setAttributeValue("ggxh",planList);
@@ -355,7 +376,16 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 			confirmDetailBizObject.setAttributeValue("sl",sl);
 			confirmDetailBizObject.setAttributeValue("se",se);
 			confirmDetailBizObject.setAttributeValue("hsbz","0");
-			confirmDetailBizObject.setAttributeValue("spbm","3060109010000000000");
+			
+			Configure config = Configure.getInstance();
+			try {
+				spbm = config.getConfigure("INVOICE_SPBM") ;
+			} catch (Exception e) {
+				e.printStackTrace();
+				return "读取a3web的开票接口配置文件失败";
+			}
+			
+			confirmDetailBizObject.setAttributeValue("spbm",spbm);
 			confirmDetailBizObject.setAttributeValue("zxbm","");
 			confirmDetailBizObject.setAttributeValue("yhzcbs","0");
 			confirmDetailBizObject.setAttributeValue("slbs","");
@@ -379,15 +409,15 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 			String xhdwdzdh = ownInfo.getAttribute("LEASE_TEL").toString();//销货单位地址电话
 			
 			BizObjectManager customerPersonManager = JBOFactory.getBizObjectManager(CUSTOMER_PERSON.CLASS_NAME);
-			BizObjectManager customerCompanyManager = JBOFactory.getBizObjectManager(CUSTOMER_COMPANY.CLASS_NAME);
+			BizObjectManager customerFamilyManager = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY.CLASS_NAME);
 			
 			BizObject customerPerson = customerPersonManager.createQuery("SELECT o.certid,caa.fulladdress,o.mobile,ca.acc_number,ca.bank_name from o JOIN jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca ON ca.customerid=o.customerid JOIN jbo.app.tenwa.customer.CUSTOMER_ADDRESS caa ON caa.customerid=ca.customerid where o.customerid=:customerid")
 			.setParameter("customerid", customerid).getSingleResult(false);
 			
-			BizObject  customerCompany = customerCompanyManager.createQuery("customerid=:customerid").setParameter("customerid", customerid).getSingleResult(false);
-			String companyTel="";
-			if(customerCompany!=null){
-			  companyTel = customerCompany.getAttribute("company_tel").toString();
+			BizObject  customerFamily = customerFamilyManager.createQuery("customerid=:customerid").setParameter("customerid", customerid).getSingleResult(false);
+			String familyTel="";
+			if(customerFamily!=null){
+			  familyTel = customerFamily.getAttribute("tel").toString();
 			}
 			String certid="";
 			String fulladdress="";
@@ -442,8 +472,8 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 			confirmBizObject.setAttributeValue("yfpdm", "");
 			confirmBizObject.setAttributeValue("yfphm", "");
 			confirmBizObject.setAttributeValue("GMF_DZYX", "");
-			if(customertype=="01"){
-				confirmBizObject.setAttributeValue("GMF_SJHM", companyTel);				
+			if("01".equals(customertype)){
+				confirmBizObject.setAttributeValue("GMF_SJHM", familyTel);				
 			}else{
 				confirmBizObject.setAttributeValue("GMF_SJHM", mobile);				
 			}
@@ -537,10 +567,12 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
 
        String xml = JaxbUtil.convertToXml(invoiceRequestBase);
        ResultPojo result = doPost(xml);
-     
+       
+       //根据sid拿到LI_INVOICE_CONFIRM表的id(租金发票表的id和此表id都保存在LI_INVOICE_CONFIRM_Detail表中)
        BizObjectManager confirmManager = JBOFactory.getBizObjectManager(LI_INVOICE_CONFIRM.CLASS_NAME);
        BizObject confirm = confirmManager.createQuery("sid=:sid").setParameter("sid", sid).getSingleResult(false);
        String invoice_confirm_id = confirm.getAttribute("id").toString();
+       
        String id=UUID.randomUUID().toString().replaceAll("-", "");
 		if(result.getCode()==0){
            InvoiceRequestBase responseBase =  (InvoiceRequestBase) result.getData();
@@ -612,6 +644,7 @@ public String selectApplyOtherConfirm(JBOTransaction tx) throws Exception{
            System.out.println("[OK][returnmsg]=>>>"+returnmsg);
            if("0".equals(returncode)){
                //System.out.println("[OK][SUCCESS]");
+        	   //修改租金发票信息表的状态
                BizObjectManager confirmDetailManager = JBOFactory.getBizObjectManager(LI_INVOICE_CONFIRM_DETAIL.CLASS_NAME);
                BizObject confirmDetail = confirmDetailManager.createQuery("invoice_confirm_id=:invoice_confirm_id").setParameter("invoice_confirm_id", invoice_confirm_id).getSingleResult(false);
                	String invoiceId = confirmDetail.getAttribute("invoice_id").toString();
diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java
index 8d3e326bc..8139d23a6 100644
--- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java
+++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java
@@ -15,6 +15,7 @@ import com.amarsoft.are.jbo.JBOException;
 import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.are.jbo.JBOTransaction;
 import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
 import com.amarsoft.awe.util.Transaction;
 import com.amarsoft.dict.als.cache.CacheLoaderFactory;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
@@ -182,7 +183,8 @@ public class EbankUse {
 		String SUMMARY = this.getSUMMARY();
 		// 执行确认收入时, 可核销金额转入非业务金额
 		String sql2 = "UPDATE LC_EBANK SET NOWITH_MONEY=(NOWITH_MONEY+MAYOPE_MONEY),MAYOPE_MONEY='0.00',SUMMARY=CONCAT_WS(',',SUMMARY,'"+ SUMMARY + "') WHERE ID='" + ID + "'";
-		Sqlca.executeSQL(sql2);
+		SqlObject sql3= new SqlObject(sql2);
+		Sqlca.executeSQL(sql3);
 		if (Sqlca != null) {
 			Sqlca.commit();
 		}