From 7054d3f9f95cd015725b14d813f3ec1ab76d2762 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Tue, 8 Oct 2019 09:00:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BD=91=E9=93=B6=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=A2=E6=88=B7=E7=BC=96=E7=A0=81=EF=BC=8C=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5=E5=8F=AA=E8=83=BD=E7=9C=8B=E5=88=B0=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E6=8C=89=E9=92=AE=EF=BC=9B=202=EF=BC=8C?=
 =?UTF-8?q?=E7=BD=91=E9=93=B6=E6=A0=B8=E9=94=80=E7=9A=84=E7=BD=91=E9=93=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8C=89=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E6=A1=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lease/App/Interface/Ebank/LCEbankList.jsp | 15 ++++++----
 .../Fund/FundCollection/LCEbankTempInfo.jsp   | 30 ++++++++++++++++---
 .../amarsoft/dict/als/manage/NameManager.java |  6 ++++
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
index 217b0753c..fd0ae75d3 100644
--- a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
@@ -9,6 +9,11 @@
     */
     String userid=CurUser.getUserID();
 	String department=CurUser.getOrgID();
+	String flag = "true";
+	//运营组只能看到确认收入按钮
+	if("8009011003".equals(department)){
+	//	flag = "false";
+	}
 	//ASObjectModel doTemp = new ASObjectModel("LCEbankList");
 	ASObjectModel doTemp = new ASObjectModel("LCEbankListchly");
 	//String sCondtion=DataRightManager.getRightCondtion(CurUser,(CurUser.hasRole("299")?session.getAttribute("managerPlatFormOrgId").toString():CurUser.getOrgID()), Sqlca, "O.","default");
@@ -21,16 +26,16 @@
 
 	//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",""},
+		{flag,"All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		{flag,"","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"false","","Button","废弃","废弃","abandon()","","","","btn_icon_delete",""},
 		{"true","","Button","确认收入","确认收入","confirmIncome()","","","","btn_icon_valid",""},
-		{"true","","Button","确认退回","确认退回","confirmpayback()","","","","btn_icon_valid",""},
+		{flag,"","Button","确认退回","确认退回","confirmpayback()","","","","btn_icon_valid",""},
 		{"false","","Button","默认导入Excel","导入Excel","MoRen_importExcel()","","","","btn_icon_import",""},
 		{"false","","Button","默认网银模版下载","网银模版下载","MoRenebankDownload()","","","","btn_icon_down",""},
 		{"false","","Button","生成凭证","生成凭证","createVoucher()","","","","btn_icon_down",""},
-		{"true","","Button","导入Excel","导入Excel","importExcel()","","","","btn_icon_import",""},
-		{"true","","Button","网银模版下载","网银模版下载","ebankDownload()","","","","btn_icon_down",""},
+		{flag,"","Button","导入Excel","导入Excel","importExcel()","","","","btn_icon_import",""},
+		{flag,"","Button","网银模版下载","网银模版下载","ebankDownload()","","","","btn_icon_down",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <iframe name="MyAtt" src="<%=com.amarsoft.awe.util.Escape.getBlankJsp(sWebRootPath,"正在下载附件，请稍候...")%>" style="background-color: blue" width=100% height=100% frameborder=0 hspace=0 vspace=0 marginwidth=0 marginheight=0 scrolling="no"> 
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/LCEbankTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/LCEbankTempInfo.jsp
index 350c62438..1210d3445 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/LCEbankTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/LCEbankTempInfo.jsp
@@ -11,22 +11,44 @@
 
 	String sTempletNo = "LCEbankTempInfo";//--模板号--
 	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";//freeform
-	dwTemp.ReadOnly = "-2";//只读模式
+	dwTemp.ReadOnly = "1";//只读模式
 	
 	dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid"));
 	
 	String sButtons[][] = {
+			{"true","All","Button","保存","保存所有修改","saveRecord()","","","",""},
 	};
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+	$(function(){
+		var CUSTOMER_NAME = getItemValue(0, 0, "CUSTOMER_NAME");
+		if(CUSTOMER_NAME==""||CUSTOMER_NAME==null){
+			setItemReadOnly(0, 0, "CUSTOMER_NAME", false);
+		}
+		
+	});
+	function saveRecord(){
+		as_save("myiframe0");
+	}
+	
 	function returnList(){
 		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
 	}
+	//选择承租人
+	function selectCust(){
+		AsDialog.OpenSelector("SelectCustomerBank","","dialogWidth=" + parseInt(window.screen.width * 0.9) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				//alert(getHtmlMessage('1'));//请选择一条信息！
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");
+	    	setItemValue(0,0,"CUSTOMER_ID", sReturn[0]);
+	    	setItemValue(0,0,"CUSTOMER_NAME", sReturn[1]); 
+			},"请选择承租人");
+	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src/com/amarsoft/dict/als/manage/NameManager.java b/src/com/amarsoft/dict/als/manage/NameManager.java
index 574b798c0..786f18e11 100644
--- a/src/com/amarsoft/dict/als/manage/NameManager.java
+++ b/src/com/amarsoft/dict/als/manage/NameManager.java
@@ -198,6 +198,12 @@ public class NameManager
     return NameCache.getName("jbo.app.tenwa.customer.CUSTOMER_INFO", "CustomerName", "CustomerID", sCustomerID);
   }
 
+  public static String getCustomerNumber(String sCustomerID)
+	 throws Exception
+  {
+	return NameCache.getName("jbo.app.tenwa.customer.CUSTOMER_INFO", "customer_num", "CustomerID", sCustomerID);
+  }
+  
   public static String getBusinessName(String sTypeNo)
     throws Exception
   {