From 9386616a2309551e4e0ba07d258eafc75a2c74c2 Mon Sep 17 00:00:00 2001
From: linxiaoping <12345678>
Date: Thu, 21 Jun 2018 18:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Comm/CustomerDoc/CustomerDoc_Info.jsp     | 40 +++++++++++++++++++
 .../Lessee/Company/CustomerCompany.jsp        | 17 ++++----
 .../Customer/Lessee/Person/CustomerPerson.jsp |  9 +++++
 .../LDistributorAccountInfo.jsp               | 11 +++--
 WebContent/money/sourceOfFunds.jsp            |  2 +-
 5 files changed, 68 insertions(+), 11 deletions(-)
 create mode 100644 WebContent/Tenwa/Comm/CustomerDoc/CustomerDoc_Info.jsp

diff --git a/WebContent/Tenwa/Comm/CustomerDoc/CustomerDoc_Info.jsp b/WebContent/Tenwa/Comm/CustomerDoc/CustomerDoc_Info.jsp
new file mode 100644
index 000000000..365f2a8d5
--- /dev/null
+++ b/WebContent/Tenwa/Comm/CustomerDoc/CustomerDoc_Info.jsp
@@ -0,0 +1,40 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2018-06-21
+        Content: 示例详情页面
+        History Log: 
+    */
+	String sPrevUrl = CurPage.getParameter("ID");
+	String docClassItemno = CurPage.getParameter("docClassItemno");
+	String custid = CurPage.getParameter("custid");
+	/* if(sPrevUrl == null) sPrevUrl = ""; */
+
+	String sTempletNo = "CustomerDoc_Info";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	//doTemp.appendJboWhere("rela.id="+relative_Id);
+/* 	doTemp.setColTips("", "测试"); */
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	//dwTemp.ReadOnly = "-2";//只读模式
+	//dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
+	dwTemp.genHTMLObjectWindow("");
+	
+	String sButtons[][] = {
+		{"true","All","Button","保存","保存所有修改","save()","","","",""},
+		{"true","All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	/* sButtonPosition = "south"; */
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	function save(){
+		setItemValue(0,0,"doc_Class_Itemno","<%=docClassItemno%>");
+		setItemValue(0,0,"cust_id","<%=custid%>");
+		as_save("myiframe0","returnList()");
+	}
+	
+	function returnList(){
+		 AsControl.OpenView("/Tenwa/Comm/CustomerDoc/CustomerList.jsp", "","_self","");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
index 841be6be4..bb8b27fa6 100644
--- a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
@@ -8,7 +8,6 @@
 	doTemp.setHtmlEvent("status","onchange","changeOtherRequired");
 	doTemp.setDefaultValue("rccurrency", "01");
 	doTemp.setDefaultValue("pccurrency", "01");
-// 	doTemp.setDefaultValue("status", "checked","checked");
 	//初始化客户类别字段
 	BizObjectManager typeManager = JBOFactory.getBizObjectManager(CUSTOMER_TYPE.CLASS_NAME);
 	List<BizObject> types = typeManager.createQuery("customerid=:customerid  and status='valid'").setParameter("customerid",customerId).getResultList(false);
@@ -59,7 +58,7 @@
 	function changeOtherRequired(){
 		var status = getItemValue(0,getRow(),"status");
 		var country = getItemValue(0,getRow(),"countrycode");
-//		if(status == "status02"){
+		if(status == "status02"){
 			setItemRequired(0,"custkind",true);
 			setItemRequired(0,"custsource",true);
 			setItemRequired(0,"certtype",true);
@@ -76,7 +75,7 @@
 			setItemRequired(0,"establish_date",true);
 			setItemRequired(0,"licensematurity",true);
 			setItemRequired(0,"operationperiod",true);
-	/* 	
+	 	
 		}else{
 			setItemRequired(0,"custkind",false);
 			setItemRequired(0,"custsource",false);
@@ -94,7 +93,7 @@
 			setItemRequired(0,"establish_date",false);
 			setItemRequired(0,"licensematurity",false);
 			setItemRequired(0,"operationperiod",false);
-		} */
+		} 
 		if(status == "status02" && country=='CHN'){
 			/* setItemRequired(0,"provincecodename",true);
 			setItemRequired(0,"citycodename",true); */
@@ -119,7 +118,7 @@
 	}
 	function changeRegisterInfo(){//客户状态为正式时注册信息必填，否则不必填
 		var status = getItemValue(0,getRow(),"status");
-		//if(status == "status02"){
+		if(status == "status02"){
 			setItemRequired(0,"economytypename",true);
 			setItemRequired(0,"orgnaturename",true);
 			setItemRequired(0,"orgnaturecategoryname",true);
@@ -133,7 +132,7 @@
 			setItemRequired(0,"licensematurity",true);
 			setItemRequired(0,"operationperiod",true);
 		
-		/* }else{
+		 }else{
 			setItemRequired(0,"economytypename",false);
 			setItemRequired(0,"orgnaturename",false);
 			setItemRequired(0,"orgnaturecategoryname",false);
@@ -146,7 +145,11 @@
 			setItemRequired(0,"establish_date",false);
 			setItemRequired(0,"licensematurity",false);
 			setItemRequired(0,"operationperiod",false);
-		} */
+			setItemRequired(0,"custsource",false);
+			setItemRequired(0,"certtype",false);
+			setItemRequired(0,"custkind",false);
+			
+		} 
 	}
 	
 	function saveRecord(){
diff --git a/WebContent/Tenwa/Customer/Lessee/Person/CustomerPerson.jsp b/WebContent/Tenwa/Customer/Lessee/Person/CustomerPerson.jsp
index 2e8976734..691214b34 100644
--- a/WebContent/Tenwa/Customer/Lessee/Person/CustomerPerson.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Person/CustomerPerson.jsp
@@ -43,6 +43,7 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	$(document).ready(function(){
+		$("#STATUS_0").prop("checked", true);
 		init();
 		ValidityCheck();
 		changeOtherRequired();
@@ -75,6 +76,8 @@
 			setItemRequired(0,"WORKCORP",true);//单位名称
 			setItemRequired(0,"certtype",true);
 			setItemRequired(0,"certid",true);
+			setItemRequired(0,"CERTID",true);
+			
 		}else{
 			setItemRequired(0,"CUSTSOURCE",false);
 			setItemRequired(0,"CUSTKIND",false);
@@ -87,6 +90,12 @@
 			setItemRequired(0,"WORKCORP",false);
 			setItemRequired(0,"certtype",false);
 			setItemRequired(0,"certid",false);
+			
+			setItemRequired(0,"SEX",false);
+			setItemRequired(0,"UNITKINDNAME",false);
+			setItemRequired(0,"CERTID",true);
+			
+			
 		}
 		if(status == "status02" && country=='CHN'){
 			setItemRequired(0,"provincename",true);
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp
index 65d98fa56..7d03c4871 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp
@@ -86,9 +86,14 @@
 	}
  	// 选择市区
 	function selectCityCode(){
- 		
-		AsDialog.OpenSelector("selectCityCode","province,"+province,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
+ 		//alert("参数："+province);
+ 		if(province=="" || province==null){
+ 			alert("请先选择省份。");
+ 			return;
+ 		}else{
+			AsDialog.OpenSelector("selectCityCode","province,"+province,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
 				function(sReturn){
+			
 					if(!sReturn||sReturn=="_CANCEL_"||sReturn=="")
 					{
 							 //alert(getHtmlMessage('1'));//请选择一条信息！
@@ -99,7 +104,7 @@
  					setItemValue(0,0,"district",sReturn[1]);
 					},"请选择地区",'');
 
-
+ 		}
 		
 		
 	}
diff --git a/WebContent/money/sourceOfFunds.jsp b/WebContent/money/sourceOfFunds.jsp
index 57ec0ef20..d36ddfb92 100644
--- a/WebContent/money/sourceOfFunds.jsp
+++ b/WebContent/money/sourceOfFunds.jsp
@@ -16,7 +16,7 @@
 	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","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">