From 7ead49d844e72d20bc680f5566ebefce0f415c92 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Tue, 24 Jul 2018 19:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E5=80=BC=E4=B8=8E=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E5=AE=A1=E6=A0=B8=E7=AC=AC=E4=BA=8C=E9=83=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp     | 9 +++++++--
 .../DistributorApproval/LDistributorInfo.jsp             | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
index 1d46a2880..07d481a7c 100644
--- a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
+++ b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
@@ -21,7 +21,8 @@
 	//dwTemp.ReadOnly = "-2";//只读模式
 	
 	dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
-	
+	String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT limit 0,1");
+	String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT limit 0,1");
 	String sButtons[][] = {
 		{"true","All","Button","保存","保存所有修改","save()","","","",""},
 		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
@@ -29,6 +30,10 @@
 	/* sButtonPosition = "south"; */
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+	window.onload=function(){
+		setItemValue(0,0,"LOCAL_ACCOUNT",'<%=acc_number%>');
+		setItemValue(0,0,"LOCAL_BANK",'<%=acc_bank%>');
+	}
 	var sFlowUnid = "<%=sFlowUnid%>";
 	setItemValue(0,0,"MONEY_TYPE","保证金退款");
 	setItemValue(0,0,"REFUND_PERSON","<%=ProjectName%>");
@@ -60,7 +65,7 @@
 	function selectensureS(){
 		AsDialog.OpenSelector("DepositcollectionS","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 	    	if(!sReturn||sReturn=="_CANCEL_"){
-				alert(getHtmlMessage('1'));//请选择一条信息！
+				//alert(getHtmlMessage('1'));//请选择一条信息！
 				return;
 	    	}
 	    	sReturn = sReturn.split("@");//"@"表示了向页面添加数据时的连续性
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
index 8a6ac91b5..d7a2abf16 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
@@ -19,11 +19,13 @@
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	doTemp.setDefaultValue("FLOWUNID", sFlowUnid);
 	doTemp.setDefaultValue("DISTRIBUTOR_NO", DISTRIBUTOR_NO);
-	if("ReadOnly".equals(RightType)){
+	if("0020".equals(PhaseNo)){
 		doTemp.setRequired("RETAIL_OPEN_DATE",true);//(0, "RETAIL_OPEN_DATE", true);
 		doTemp.setReadOnly("",true);//先把页面所有字段设为只读状态
 		doTemp.setReadOnly("RETAIL_OPEN_DATE",false);//唯独把这个字段设为必填
-		doTemp.setReadOnly("RETAIL_OPEN_DATE",false);//唯独把这个字段设为必填
+	}
+	if("ReadOnly".equals(RightType)){
+		//doTemp.setReadOnly("RETAIL_OPEN_DATE",false);//唯独把这个字段设为必填
 		doTemp.setReadOnly("PROVINCES",true);//省份只读
 		doTemp.setReadOnly("SUBSIDIARY_COMPANY",true);//所属母公司
 		doTemp.setColInnerBtEvent("PROVINCES,SUBSIDIARY_COMPANY,DISTRIBUTOR_ADDRESSNAME", "");