diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index 64279a4a0..a023b8a53 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -272,10 +272,12 @@ alert("Çë¹´Ñ¡ºÏͬģ°å£¡"); return; } - var contractNomessage = RunJavaMethodTrans("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","CheckContractNo","contractId="+"<%=sContractId%>"+",contractNo="+"<%=CurPage.getParameter("ContractNo")%>"); - if("error"==contractNomessage){ - alert("ºÏͬ±àºÅÖØ¸´£¬ÇëÁªÏµºǫ́ÈËÔ±´¦Àí£¡"); - return; + if("BContractChangeApply"!="<%=CurPage.getParameter("ApplyType")%>"){ + var contractNomessage = RunJavaMethodTrans("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","CheckContractNo","contractId="+"<%=sContractId%>"+",contractNo="+"<%=CurPage.getParameter("ContractNo")%>"); + if("error"==contractNomessage){ + alert("ºÏͬ±àºÅÖØ¸´£¬ÇëÁªÏµºǫ́ÈËÔ±´¦Àí£¡"); + return; + } } var message = RunJavaMethodTrans("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","CheckCar","contractId="+"<%=sContractId%>"+",templateIds="+tempids+",flowunid="+"<%=flowunid%>"); if(""!=message){ diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp index 94a4ba671..42eb76341 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp @@ -34,6 +34,7 @@ doTemp.setHtmlEvent("suphone","onChange","checkSuphone"); doTemp.setHtmlEvent("certtype", "onChange", "setSexRead"); doTemp.setHtmlEvent("certid","onChange","ValidityCheck"); + doTemp.setHtmlEvent("CERTTYPE","onChange","checkCertidSex"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ @@ -303,24 +304,35 @@ sex = parseInt(sex); if(sex%2==0){//ÆæÄÐżŮ setItemValue(0,getRow(),"SEX","2"); + setItemReadOnly(0,0,"SEX",true); }else{ setItemValue(0,getRow(),"SEX","1"); + setItemReadOnly(0,0,"SEX",true); } }else if(certID.length==15){ sex = certID.substring(14,15); sex = parseInt(sex); if(sex%2==0){//ÆæÄÐżŮ setItemValue(0,getRow(),"SEX","2"); + setItemReadOnly(0,0,"SEX",true); }else{ setItemValue(0,getRow(),"SEX","1"); + setItemReadOnly(0,0,"SEX",true); } } - setItemReadOnly(0,0,"SEX",true); + }else{ + setItemReadOnly(0,0,"SEX",false); } checkCertidRepeat(); } - + //Ñ¡ÔñÖ¤¼þÀàÐͺó£¬Èç¹ûÖ¤¼þºÅ²»Îª¿Õ£¬ÔòÈ¥ÅжÏÐÔ±ð + function checkCertidSex(){ + var certID = getItemValue(0,getRow(),"CERTID"); + if(certID.length>0){ + ValidityCheck(); + } + } function checkCertidRepeat(){ var id = getItemValue(0,getRow(),"ID"); var certId = getItemValue(0,getRow(),"CERTID"); diff --git a/WebContent/fileTemplate/租金支付表.docx b/WebContent/fileTemplate/租金支付表.docx index e6e24ef9e..26fe5bad5 100644 Binary files a/WebContent/fileTemplate/租金支付表.docx and b/WebContent/fileTemplate/租金支付表.docx differ diff --git a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java index f97c81429..a6c7ef5af 100644 --- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java +++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java @@ -604,12 +604,41 @@ public class CreditBodyGuardAction { msg = "¹æÔòÃèÊö:"+detailList.get(0).get("description").toString()+"¡£" +"·çÏÕÀàÐÍ:"+detailList.get(0).get("fraud_type_display_name").toString()+"¡£" +"Æ¥Åä×Ö¶Î:"+detailList.get(0).get("hit_type_display_name").toString()+"¡£"; - }else if(null==riskItemList.get(i).get("risk_name")&&!"".equals(riskItemList.get(i).get("risk_name").toString())&&riskItemList.get(i).get("risk_name").toString().length()>0){ + }else if("3¸öÔÂÄÚÉêÇëÈËÔÚ¶à¸öƽ̨±»·Å¿î_²»°üº¬±¾ºÏ×÷·½".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); - msg = "¹æÔòÃèÊö:"+detailList.get(0).get("description").toString()+"¡£" - +"·çÏÕÀàÐÍ:"+detailList.get(0).get("fraud_type_display_name").toString()+"¡£" - +"Æ¥Åä×Ö¶Î:"+detailList.get(0).get("hit_type_display_name").toString()+"¡£"; + @SuppressWarnings("rawtypes") + List platformdetailList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("platform_detail")),HashMap.class); + @SuppressWarnings("rawtypes") + List platformdetaildimensionList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("platform_detail_dimension")),HashMap.class); + @SuppressWarnings("rawtypes") + List platformdetaildimensioncertidList = JSON.parseArray(JSON.toJSONString(platformdetaildimensionList.get(0).get("detail")),HashMap.class); + @SuppressWarnings("rawtypes") + List platformdetaildimensionphoneList = JSON.parseArray(JSON.toJSONString(platformdetaildimensionList.get(1).get("detail")),HashMap.class); + StringBuffer sb1 = new StringBuffer(); + for(int j=0;j