diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp index 02774ece6..8f3a2f59e 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp @@ -112,8 +112,8 @@ if(CheckPhoneCode(workTel)){ return true; }else{ - //setErrorTips("WORKTEL","单位电话格式不正确!"); - alert("单位电话格式不正确!"); + setErrorTips("WORKTEL","单位电话格式不正确!"); +// alert("单位电话格式不正确!"); return false; } } @@ -121,7 +121,8 @@ function checkMobileRepeat(){//校验担保人手机号重复 var customerType = "03"; var mobile = getItemValue(0,getRow(),"MOBILE"); - var sParams = "mobile="+mobile+",customerType="+customerType+",flowunid="+"<%=sFlowUnid%>"; + var id = getItemValue(0,getRow(),"id"); + var sParams ="certId="+id+ ",mobile="+mobile+",customerType="+customerType+",flowunid="+"<%=sFlowUnid%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkMobileRepeat",sParams); if(sReturnInfo=="8"){ /* alert("该手机号已重复!"); @@ -147,10 +148,10 @@ if(falgs==false){ return; } -// var WorkTelResult = checkWorkTel(); -// if(WorkTelResult==false){ -// return; -// } + var WorkTelResult = checkWorkTel(); + if(WorkTelResult==false){ + return; + } as_save(0,"goBack()"); } @@ -160,6 +161,6 @@ var sparam="FlowUnid="+getItemValue(0,0,"FLOWUNID")+"&ProjectId="+getItemValue(0,0,"project_id")+"&RightType="+'<%=RightType%>'; AsControl.OpenView(url,sparam,"_self",""); } - + <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp index 4b999f119..cd5b97e31 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp @@ -107,7 +107,8 @@ function checkTelRepeat(){//校验共同申请人手机号重复 var customerType = "03"; var tel = getItemValue(0,getRow(),"tel"); - var sParams = "mobile="+tel+",customerType="+customerType+",flowunid="+"<%=FlowUnid%>"; + var id = getItemValue(0,getRow(),"id"); + var sParams = "certId="+id+",mobile="+tel+",customerType="+customerType+",flowunid="+"<%=FlowUnid%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkMobileRepeat",sParams); if(sReturnInfo=="8"){ setErrorTips("tel","该手机号已重复!"); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 4d75d5a02..efe97a877 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -399,12 +399,18 @@ //校验公司电话区号 var workTel = getItemValue(0,0,"WORKTEL"); - if(typeof(workTel)!=undefined && mobile != ''){ + /* if(typeof(workTel)!=undefined && mobile != ''){ var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CheckCustomerInfo","CheckWorkTelInfo","workTel="+workTel); if(result=="false"){ alert("公司电话格式不正确!请输入区号-固定电话号!"); return; } + } */ + if(CheckPhoneCode(workTel)){ + }else{ + setErrorTips("WORKTEL","公司电话格式不正确!"); + //alert("公司电话格式不正确!"); + return; } <%-- var idexpiry=getItemValue(0,getRow(),"IDEXPIRY"); diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java index 37b0d277a..0c66dc696 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java @@ -88,7 +88,32 @@ public class CustomerInfoCheck { if(mobilePT==null && mobileFT==null && mobileLUT==null){ this.repeatResult = "7"; }else{ - this.repeatResult = "8"; + if(certId!=null){ + boolean falg = false; + if(mobilePT!=null){ + String id = mobilePT.getAttribute("ID").getString(); + if(id.equals(certId)){ + falg=true; + } + }else if(mobileFT!=null){ + String id = mobileFT.getAttribute("ID").getString(); + if(id.equals(certId)){ + falg=true; + } + }else if(mobileLUT!=null){ + String id = mobileLUT.getAttribute("ID").getString(); + if(id.equals(certId)){ + falg=true; + } + } + if(falg){ + this.repeatResult = "7"; + }else{ + this.repeatResult = "8"; + } + }else{ + this.repeatResult = "8"; + } } } return repeatResult; diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java index 6cdacb97b..fbe816033 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java @@ -301,6 +301,9 @@ public class CustomerInfoManage { try{ BizObjectManager bom = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME,tx); BizObject bo = bom.createQuery("flowunid=:flowunid and customerid=:customerid and Spouse_<>'Y' ").setParameter("flowunid", flowunid).setParameter("customerid", customerid).getSingleResult(true); + if(bo==null){ + return "ERROR"; + } bom.deleteObject(bo); }catch(Exception e){ e.printStackTrace();