From 4c87d412259158673982e6e55ba71911d5404d58 Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Wed, 23 Jan 2019 10:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8jsp=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvoiceConfirmDetailList.jsp              |  2 +-
 .../InvoiceConfirmDetailList2.jsp             | 41 +++++++++++++++++++
 .../InvoiceConfirmDetailList3.jsp             | 41 +++++++++++++++++++
 .../InvoiceConfirmDetailList4.jsp             | 41 +++++++++++++++++++
 .../ConfirmInvoice/InvoiceConfirmList.jsp     |  2 +-
 .../InvoiceConfirmPrintList.jsp               |  4 +-
 .../ConfirmInvoice/InvoiceInvalidBackE.jsp    |  2 +-
 .../ConfirmInvoice/InvoiceInvalidDirectZ.jsp  |  2 +-
 .../ConfirmInvoice/InvoicePrintResultList.jsp |  2 +-
 .../InvoicePrintResultListBack.jsp            |  2 +-
 .../InvoiceRentDirectConfirmList.jsp          |  4 +-
 .../InvoiceRentDirectConfirmListE.jsp         |  4 +-
 .../ConfirmInvoice/InvoiceResultBackE.jsp     |  2 +-
 .../ConfirmInvoice/InvoiceResultListZ.jsp     |  2 +-
 .../rentPlanInvoiceDirectManager.java         |  2 +-
 15 files changed, 138 insertions(+), 15 deletions(-)
 create mode 100644 WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList2.jsp
 create mode 100644 WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList3.jsp
 create mode 100644 WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList4.jsp

diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList.jsp
index bc7e52b71..9763f85cf 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList.jsp
@@ -15,7 +15,7 @@
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
 		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
-		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
 		{"true","","Button","返回","返回","returnList()","","","","btn_icon_return",""},
 	};
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList2.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList2.jsp
new file mode 100644
index 000000000..9ac4f319d
--- /dev/null
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList2.jsp
@@ -0,0 +1,41 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2018-08-06
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("InvoiceConfirmDetailList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("invoice_confirm_id"));
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		{"true","","Button","返回","返回","returnList()","","","","btn_icon_return",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		 var sUrl = "";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "";
+		 var sPara = getItemValue(0,getRow(0),'ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');
+	}
+	 function returnList(){
+		 AsControl.OpenView("/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmPrintList.jsp", "","_self","");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList3.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList3.jsp
new file mode 100644
index 000000000..6c9dd8839
--- /dev/null
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList3.jsp
@@ -0,0 +1,41 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2018-08-06
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("InvoiceConfirmDetailList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("invoice_confirm_id"));
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		{"true","","Button","返回","返回","returnList()","","","","btn_icon_return",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		 var sUrl = "";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmInfo.jsp";
+		 var sPara = getItemValue(0,getRow(0),'ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');
+	}
+	 function returnList(){
+		 AsControl.OpenView("/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmList.jsp", "","_self","");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList4.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList4.jsp
new file mode 100644
index 000000000..b987d1b20
--- /dev/null
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList4.jsp
@@ -0,0 +1,41 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2018-08-06
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("InvoiceConfirmDetailList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("invoice_confirm_id"));
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		{"true","","Button","返回","返回","returnList()","","","","btn_icon_return",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		 var sUrl = "";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmInfo.jsp";
+		 var sPara = getItemValue(0,getRow(0),'ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');
+	}
+	 function returnList(){
+		 AsControl.OpenView("/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmListE.jsp", "","_self","");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmList.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmList.jsp
index 7b105ff7f..358b0a45e 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmList.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmList.jsp
@@ -19,7 +19,7 @@
 		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"true","","Button","查询","查询","selectInvoice()","","","","",""},
 		{"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""},
-	    {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+	    //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmPrintList.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmPrintList.jsp
index 321e9ab31..116c2ca6d 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmPrintList.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmPrintList.jsp
@@ -20,7 +20,7 @@
 		{"true","","Button","查询","查询","selectInvoice()","","","","",""},
 		{"true","","Button","发票打印申请","发票打印申请","printInvoice()","","","","",""},
 		//{"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""},
-	    {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+	    //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -81,7 +81,7 @@
 		 AsControl.OpenView(sUrl,'','_self','');
 	}
 	function viewAndEdit(){
-		 var sUrl = "/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList.jsp";
+		 var sUrl = "/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList2.jsp";
 		
 		 var sPara = getItemValue(0,getRow(0),'ID');
 		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceInvalidBackE.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceInvalidBackE.jsp
index ff3723076..4ce51c8d4 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceInvalidBackE.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceInvalidBackE.jsp
@@ -18,7 +18,7 @@
 		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"true","","Button","发票作废查询","发票作废查询","InvalidQuery()","","","","",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceInvalidDirectZ.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceInvalidDirectZ.jsp
index 0bb2dc5bd..d249d91b2 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceInvalidDirectZ.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceInvalidDirectZ.jsp
@@ -18,7 +18,7 @@
 		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"true","","Button","发票作废查询","发票作废查询","InvalidQuery()","","","","",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoicePrintResultList.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoicePrintResultList.jsp
index fbd95b0ea..db6fff3cb 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoicePrintResultList.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoicePrintResultList.jsp
@@ -18,7 +18,7 @@
 		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"true","","Button","打印","打印","print()","","","","",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoicePrintResultListBack.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoicePrintResultListBack.jsp
index 2e947b6e9..bdf22fd12 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoicePrintResultListBack.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoicePrintResultListBack.jsp
@@ -18,7 +18,7 @@
 		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"true","","Button","打印","打印","print()","","","","",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmList.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmList.jsp
index aafc9a103..f386a0399 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmList.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmList.jsp
@@ -19,7 +19,7 @@
 		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"true","","Button","查询","查询","selectInvoice()","","","","",""},
 		{"true","","Button","发票打印申请","发票打印申请","printInvoice()","","","","",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -78,7 +78,7 @@
 		 AsControl.OpenView(sUrl,'','_self','');
 	}
 	function viewAndEdit(){
-		 var sUrl = "/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList.jsp";
+		 var sUrl = "/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList3.jsp";
 		 var sPara = getItemValue(0,getRow(0),'ID');
 		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
 			alert("参数不能为空！");
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmListE.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmListE.jsp
index 6077b3f44..863286559 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmListE.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceRentDirectConfirmListE.jsp
@@ -19,7 +19,7 @@
 		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"true","","Button","查询","查询","selectInvoice()","","","","",""},
 		{"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -89,7 +89,7 @@
 		 AsControl.OpenView(sUrl,'','_self','');
 	}
 	function viewAndEdit(){
-		 var sUrl = "/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList.jsp";
+		 var sUrl = "/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceConfirmDetailList4.jsp";
 		 var sPara = getItemValue(0,getRow(0),'ID');
 		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
 			alert("参数不能为空！");
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultBackE.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultBackE.jsp
index 28a190997..66d24737c 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultBackE.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultBackE.jsp
@@ -19,7 +19,7 @@
 		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		{"true","","Button","发票作废申请","发票作废申请","InvoiceInvalid()","","","","",""},
 		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultListZ.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultListZ.jsp
index fd0e99d03..0daad55f0 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultListZ.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultListZ.jsp
@@ -19,7 +19,7 @@
 		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		{"true","","Button","发票作废申请","发票作废申请","InvoiceInvalid()","","","","",""},
 		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/src_tenwa/com/tenwa/apzl/invoicemanager/rentplaninvoice/rentPlanInvoiceDirectManager.java b/src_tenwa/com/tenwa/apzl/invoicemanager/rentplaninvoice/rentPlanInvoiceDirectManager.java
index 3f6a1df7b..25cf48f36 100644
--- a/src_tenwa/com/tenwa/apzl/invoicemanager/rentplaninvoice/rentPlanInvoiceDirectManager.java
+++ b/src_tenwa/com/tenwa/apzl/invoicemanager/rentplaninvoice/rentPlanInvoiceDirectManager.java
@@ -591,7 +591,7 @@ public class rentPlanInvoiceDirectManager extends BaseTable{
 			String contract_id = bizObject.getAttribute("contract_id").toString();
 			
 			//查询本方银行账号和地址电话
-			BizObject rent = JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_RENT_INCOME", "SELECT O.own_number,oi.lease_tel FROM lc_rent_income O LEFT JOIN own_info oi ON O.own_account=oi.own_name WHERE O.contract_id =:contract_id GROUP BY O.contract_id")
+			BizObject rent = JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_RENT_INCOME", "SELECT O.own_number,oi.lease_tel FROM O LEFT JOIN jbo.com.tenwa.entity.comm.own.OWN_INFO oi ON O.own_account=oi.own_name WHERE O.contract_id =:contract_id GROUP BY O.contract_id")
 			.setParameter("contract_id", contract_id).getSingleResult(false);
 			if(rent==null){
 				return "您的本方银行账户为空！";