diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp
index 7822f2198..176153845 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp
@@ -16,6 +16,13 @@
 
 	doTemp.setHtmlEvent("Invoice_code_bak", "onChange", "checkInvoiceCodeBak");
 	doTemp.setHtmlEvent("Invoice_number_bak", "onChange", "checkInvoiceNumberBak");
+
+	//自动计算税金及开票金额合计
+	doTemp.setHtmlEvent("tax_rate", "onChange", "checkInvoiceMoney");
+	doTemp.setHtmlEvent("tax_rate_bak", "onChange", "checkInvoiceMoney");
+	doTemp.setHtmlEvent("Invoice_money", "onChange", "checkInvoiceMoney");
+	doTemp.setHtmlEvent("Invoice_money_bak", "onChange", "checkInvoiceMoney");
+
 	//doTemp.setColTips("", "测试");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
@@ -29,6 +36,26 @@
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+
+	//自动计算税金及开票金额合计
+	function checkInvoiceMoney(){
+		var Invoice_money = parseFloat(getItemValue(0,getRow(0),"Invoice_money"));
+		var tax_rate = parseFloat(getItemValue(0,getRow(0),"tax_rate"))/100;
+		//开票金额（开票金额-挂车）/（1+税率）*税率 四舍五入保留两位小鼠
+		var tax_due = roundOff(Invoice_money/(1+tax_rate)*tax_rate,2);//税金
+		setItemValue(0,getRow(0),"tax_due",tax_due);
+
+		var Invoice_money_bak = parseFloat(getItemValue(0,getRow(0),"Invoice_money_bak"));
+		var tax_rate_bak = parseFloat(getItemValue(0,getRow(0),"tax_rate_bak"))/100;
+		//开票金额（开票金额-挂车）/（1+税率）*税率 四舍五入保留两位小鼠
+		var tax_due_bak = roundOff(Invoice_money_bak/(1+tax_rate_bak)*tax_rate_bak,2);//税金
+		setItemValue(0,getRow(0),"tax_due_bak",tax_due_bak);
+
+		//开票金额合计
+		var Invoice_money_total=roundOff((Invoice_money+Invoice_money_bak),2);
+		setItemValue(0,getRow(0),"Invoice_money_total",Invoice_money_total);
+	}
+
 	//发票号码-挂车校验
 	function checkInvoiceNumberBak(){
 		//取值
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
index fe7ae3d20..c5deb85c0 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
@@ -30,7 +30,7 @@
 	if("ReadOnly".equals(rightType)){
 		dwTemp.MultiSelect = false;
 	}
-	dwTemp.setPageSize(10);
+	dwTemp.setPageSize(pageSize==null?20:Integer.parseInt(pageSize));
 	ASDataObject ado = dwTemp.getDataObject();
 	ado.setLockCount(5);
 	dwTemp.genHTMLObjectWindow(flowunid);
diff --git a/WebContent/Tenwa/Lease/voucher/Voucher_NC_Log.jsp b/WebContent/Tenwa/Lease/voucher/Voucher_NC_Log.jsp
index 386dd4a90..1cf5a3f65 100644
--- a/WebContent/Tenwa/Lease/voucher/Voucher_NC_Log.jsp
+++ b/WebContent/Tenwa/Lease/voucher/Voucher_NC_Log.jsp
@@ -9,7 +9,7 @@
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式
-	dwTemp.setPageSize(10);
+	dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize));
 	dwTemp.genHTMLObjectWindow("");
 
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index 40fc98bc6..117d7cd43 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -1317,6 +1317,10 @@
 				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
 				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
 				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
+				<attribute name="tax_rate" label="绋庣巼" type="STRING" length="20"/>
+				<attribute name="tax_rate_bak" label="绋庣巼_鎸傝溅" type="STRING" length="20"/>
+				<attribute name="tax_due_total" label="绋庨噾鍚堣" type="STRING" length="32"/>
+				<attribute name="Invoice_money_total" label="寮�绁ㄩ噾棰濆悎璁�" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1349,6 +1353,10 @@
 				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
 				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
 				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
+				<attribute name="tax_rate" label="绋庣巼" type="STRING" length="20"/>
+				<attribute name="tax_rate_bak" label="绋庣巼_鎸傝溅" type="STRING" length="20"/>
+				<attribute name="tax_due_total" label="绋庨噾鍚堣" type="STRING" length="32"/>
+				<attribute name="Invoice_money_total" label="寮�绁ㄩ噾棰濆悎璁�" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java
index f06b3639f..50bcd7da8 100644
--- a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java
+++ b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java
@@ -97,4 +97,23 @@ public interface LB_INVOICE_INFO{
 	* 更新时间 STRING(100)<br>
 	*/
 	public static final String updatetime = "updatetime";
+
+
+	/**
+	 * 税率 STRING(100)<br>
+	 */
+	public static final String tax_rate = "tax_rate";
+	/**
+	 * 税率_挂车 STRING(100)<br>
+	 */
+	public static final String tax_rate_bak = "tax_rate_bak";
+	/**
+	 * 税金合计 STRING(100)<br>
+	 */
+	public static final String tax_due_total = "tax_due_total";
+	/**
+	 * 开票金额合计 STRING(100)<br>
+	 */
+	public static final String Invoice_money_total = "Invoice_money_total";
+
 }
\ No newline at end of file
diff --git a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java
index 864c254ac..6d4ce806d 100644
--- a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java
+++ b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java
@@ -101,4 +101,21 @@ public interface LB_INVOICE_INFO_TEMP{
 	* 更新时间 STRING(100)<br>
 	*/
 	public static final String updatetime = "updatetime";
+
+	/**
+	 * 税率 STRING(100)<br>
+	 */
+	public static final String tax_rate = "tax_rate";
+	/**
+	 * 税率_挂车 STRING(100)<br>
+	 */
+	public static final String tax_rate_bak = "tax_rate_bak";
+	/**
+	 * 税金合计 STRING(100)<br>
+	 */
+	public static final String tax_due_total = "tax_due_total";
+	/**
+	 * 开票金额合计 STRING(100)<br>
+	 */
+	public static final String Invoice_money_total = "Invoice_money_total";
 }
\ No newline at end of file