From fe0a8ed91b33d26952fdd581c461967168974b07 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Fri, 27 Jul 2018 16:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=A1=E9=AA=8C=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=8118=E4=BD=8D=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp  | 10 +++++-----
 .../CustomerFamilyJoinTempInfo.jsp                   | 10 +++++-----
 .../BusinessApplication/CustomerFamilyTempInfo.jsp   | 12 +++++++-----
 .../BusinessApproval/ProjectApprovalCreationInfo.jsp | 12 ++++++------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
index d41b92a87..5ad70beac 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
@@ -60,15 +60,15 @@
 			}
 		}
 		if(certType=="Ind01"){
+			if(certId.length!=18){
+				alert("身份证必须是18位！"); 
+				return false;
+			}
 			if(CheckLicense(certId)){
 				return true;
 			}else{
 				//setErrorTips("certId","身份证格式不正确!");
-				if(certId.length==18){
-					alert("身份证格式错误！"); 
-				}else{
-					alert("身份证必须是18位！"); 
-				}
+				alert("身份证格式错误！"); 
 				return false;
 			}
 		}
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
index 3968043a6..d5caf3717 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
@@ -41,6 +41,10 @@
 <script type="text/javascript">
 	function checkCertId(){//校验共同申请人证件号格式
 		var certId = getItemValue(0,getRow(0),"certid");
+		if(certId.length!=18){
+			alert("身份证必须是18位！"); 
+			return false;
+		}
 		if(certId==""){
 			//setErrorTips("certId","证件号不能为空!");
 			alert("证件号不能为空!");
@@ -51,11 +55,7 @@
 			return true;
 		}else{
 			//setErrorTips("certId","身份证格式不正确!");
-			if(certId.length==18){
-				alert("身份证格式错误！"); 
-			}else{
-				alert("身份证必须是18位！"); 
-			}
+			alert("身份证格式错误！"); 
 			return false;
 		}
 
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
index 1547bfd28..9abf3aacd 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
@@ -197,6 +197,12 @@
  		
 		if(name.length > 0){
 			if(certid.length > 0){
+				if(certid.length!=18){
+					parent.parent.openDWDialog();
+					setErrorTips("certid","身份证必须是18位！"); 
+					parent.parent.resetDWDialog("配偶身份证信息错误！",false);
+					return false;
+				}
 				if(CheckLicense(certid)){
 					setItemValue(0,0,"certid",certid);
 					//setItemUnit(0,0,"certid","");
@@ -209,11 +215,7 @@
 // 				}
 				else{
 					parent.parent.openDWDialog();
-					if(certid.length==18){
-						setErrorTips("certid","身份证格式错误！"); 
-					}else{
-						setErrorTips("certid","身份证必须是18位！"); 
-					}
+					setErrorTips("certid","身份证格式错误！"); 
 					parent.parent.resetDWDialog("配偶身份证信息错误！",false);
 					return false;
 				}
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 91a77ed3d..d2a508609 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -418,14 +418,14 @@
 				var certid = getItemValue(0,getRow(),"certid");
 				//判断组织机构代码合法性
 				if(certType =='Ind01'){
-					 if(CheckLicense(certid) ){
+					if(certid.length!=18){
+						setErrorTips("certid","身份证必须是18位！"); 
+						return false;
+					}
+					if(CheckLicense(certid) ){
 						return true;
 					}else{
-						if(certid.length==18){
-							setErrorTips("certid","身份证格式错误！"); 
-						}else{
-							setErrorTips("certid","身份证必须是18位！"); 
-						}
+						setErrorTips("certid","身份证格式错误！"); 
 						return false;
 					}
 				}