From 99bb7434cc7de5f3d04adb1a0d84a8e1018eab9d Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Wed, 18 Jul 2018 11:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=92=8C=E9=85=8D=E5=81=B6=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerFamilyTempInfo.jsp                | 107 ++++++++++--------
 .../BusinessApplication/CustomerInfo.jsp      |  19 ++--
 2 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
index 4b73ffe54..4a95a5b66 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
@@ -26,11 +26,16 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	$(function(){
-		if(<%=marriage%>=="01"){//已婚时
-			changeFamilyRequiredTrue();
+		if("<%=marriage%>"=="01"){//已婚时,设置必填，显示配偶页面
+			changeFamilyRequiredTrue(<%=marriage%>);
+			$("#A_Group_0030").attr("style","display:block;");
 		}else{
-			changeFamilyRequiredFalse();
+			changeFamilyRequiredFalse(<%=marriage%>);
+			$("#A_Group_0030").attr("style","display:none;");
+			//$("#A_Group_0030").css("display","none");
+			//$("#A_Group_0030").hide();
 		}
+		
 		var remarkResult = checkTel();
 		if(remarkResult=="6"){
 			//$("#FULLNAME").attr("style","color:red;");
@@ -91,8 +96,8 @@
 		}
 	}
 	
-	function changeFamilyRequiredTrue(marriage){//设置配偶信息只读
-		setItemValue(0,0,"status",marriage);
+	function changeFamilyRequiredTrue(marriage){//设置配偶信息必填
+		setItemValue(0,0,"status",marriage);//把父页面婚姻状况存入状态字段
 		setItemRequired(0,"name",true);
 		setItemRequired(0,"certid",true);
 		setItemRequired(0,"tel",true);
@@ -102,9 +107,10 @@
 		setItemRequired(0,"suphone",true);
 		setItemRequired(0,"sposition",true);
 		setItemRequired(0,"smincome",true);
+		setItemRequired(0,"workunit",true);
 	}
-	function changeFamilyRequiredFalse(marriage){//关闭配偶信息只读
-		setItemValue(0,0,"status",marriage);
+	function changeFamilyRequiredFalse(marriage){//设置配偶信息不必填
+		setItemValue(0,0,"status",marriage);//把父页面婚姻状况存入状态字段
 		setItemRequired(0,"name",false);
 		setItemRequired(0,"certid",false);
 		setItemRequired(0,"tel",false);
@@ -115,6 +121,7 @@
 		setItemRequired(0,"title",false);
 		setItemRequired(0,"sposition",false);
 		setItemRequired(0,"smincome",false);
+		setItemRequired(0,"workunit",false);
 	}
 	
 	function changePartner(){//校验是否存在共同申请人
@@ -130,8 +137,8 @@
  	}
 	
 	function save(){//保存配偶信息
-		
-		var status = getItemValue(0,0,"status");
+
+		var status = getItemValue(0,0,"status");//获取父页面婚姻状况
 		var name = getItemValue(0,0,"name");
 		var certid = getItemValue(0,0,"certid");
 		var tel = getItemValue(0,0,"tel");
@@ -143,45 +150,49 @@
  		var smincome = getItemValue(0,getRow(0),"smincome");
  		var workunit = getItemValue(0,getRow(0),"workunit");
  		
-		if(name=="" && "01"==status){
-			alert("请输入姓名!");
-			return;
-		}
-		if(certid=="" && "01"==status){
-			alert("请输入身份证号!");
-			return;
-		}
-		if(tel=="" && "01"==status){
-			alert("请输入手机号!");
-			return;
-		}
-		if(partner=="" && "01"==status){
-			alert("请选择配偶作为共同申请人!");
-			return;
-		}
-		if(shukou=="" && "01"==status){
-			alert("请输入户口!");
-			return;
-		}
-		if(suname=="" && "01"==status){
-			alert("请输入单位名称!");
-			return;
-		}
-		if(suphone=="" && "01"==status){
-			alert("请输入单位电话!");
-			return;
-		}
-		if(sposition=="" && "01"==status){
-			alert("请输入职位!");
-			return;
-		}
-		if(smincome=="" && "01"==status){
-			alert("请输入月收入金额!");
-			return;
-		}
-		if(workunit=="" && "01"==status){
-			alert("请输入居住地址!");
-			return;
+ 		if(status=="01"){//已婚时走不为空校验
+ 			
+			if(name==""){
+				alert("请输入姓名!");
+				return;
+			}
+			if(certid==""){
+				alert("请输入身份证号!");
+				return;
+			}
+			if(tel==""){
+				alert("请输入手机号!");
+				return;
+			}
+			if(partner==""){
+				alert("请选择配偶作为共同申请人!");
+				return;
+			}
+			if(shukou==""){
+				alert("请输入户口!");
+				return;
+			}
+			if(suname==""){
+				alert("请输入单位名称!");
+				return;
+			}
+			if(suphone==""){
+				alert("请输入单位电话!");
+				return;
+			}
+			if(sposition==""){
+				alert("请输入职位!");
+				return;
+			}
+			if(smincome==""){
+				alert("请输入月收入金额!");
+				return;
+			}
+			if(workunit==""){
+				alert("请输入居住地址!");
+				return;
+			}
+		
 		}
  		
 		if(name.length > 0){
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
index 0cba4bb92..c68d5159a 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
@@ -48,7 +48,6 @@
 	
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
-
 	function checkMailingAddress(){//当邮寄地址选择为户籍地址时，户籍地址必填
 		var mailingAddress = getItemValue(0,0,'Mailing_Address');
 		if("户籍地址" == mailingAddress){
@@ -68,21 +67,23 @@
 			}
 	} */
 	
-	function changeChildrensNumber(){//未婚时隐藏配偶信息页面，清空子女人数
+	function changeChildrensNumber(){//已婚时显示配偶信息页面
 		var marriage = getItemValue(0,0,"MARRIAGE");
 		if("01" == marriage){
-			$("#CHILDRENS_NUMBER").removeAttr("ReadOnly");
+			$("#CHILDRENS_NUMBER").removeAttr("ReadOnly");//删除子女人数字段只读属性
 			$("#A_Group_0030").attr("style","display:block;");
+			changeFamilyRequired();
 		}else{
 			setItemValue(0,0,"childrens_number","");
 			setItemRequired(0, "childrens_number", false);
-//			$("#CHILDRENS_NUMBER").attr("ReadOnly","true");
+//			$("#CHILDRENS_NUMBER").attr("ReadOnly","true");//设置子女人数只读属性
 // 			hideItem(0,'family');
 			$("#A_Group_0030").attr("style","display:none;");
+			changeFamilyRequired();
 		}
 	}
 	
-	function changeFamilyRequired(){//已婚时配偶信息必填校验
+	function changeFamilyRequired(){//已婚时设置配偶信息必填,并将婚姻状况参数传递到子页面
 		var marriage = getItemValue(0,getRow(0),"MARRIAGE");
 		if("01" == marriage){
 			frame_list.window.changeFamilyRequiredTrue(marriage);
@@ -190,7 +191,8 @@
 		
 // 	}
 	
-	$(document).ready(function(){		
+	$(document).ready(function(){
+		//changeOtherRequired();
 		checkMailingAddress();
 		//当页面被加载时标红
 // 		var nameResult = checkName();
@@ -239,8 +241,9 @@
 			checkDriver();
 			//ValidityCheck();
 		}
-		//changeOtherRequired();
-		changeChildrensNumber();
+		frame_list.window.onload = function(){
+			changeChildrensNumber();
+		}
 	})
 	var flag=false;//标记是否复制过客户
 	function changeCertid(){