diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index b4d2434b7..d1dd2cac8 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -23,6 +23,7 @@ String ApplyType=CurPage.getParameter("ApplyType"); String PhaseNo=CurPage.getParameter("PhaseNo"); String subjectId=CurPage.getParameter("SubjectId");//获取主体信息，用于是否签约查询 + String channel=CurPage.getParameter("channel"); BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); BizObject ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractId).getSingleResult(false); System.out.print("=========="+ldcls+"=========="); @@ -188,13 +189,16 @@ } if("BusinessApplyApply"=="<%=ApplyType%>"||"BusinessChangeApply"=="<%=ApplyType%>"||"BContractApproveApply"=="<%=ApplyType%>"||"BContractChangeApply"=="<%=ApplyType%>"){ - var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>,subjectId=<%=subjectId%>,collect_type="+getItemValue(0,getRow(),"collect_type"); + var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>,subjectId=<%=subjectId%>,channel=<%=channel%>,collect_type="+getItemValue(0,getRow(),"collect_type"); var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams); if("false"==meassge){ alert("合同已生成，请先删除合同再修改扣款卡信息！"); return ; }else if("Y"==meassge){ setItemValue(0,0,"sign_status","Y"); + }else if("ZCfalse" == meassge){ + alert("该扣款卡信息没有签约，无法保存！"); + return ; }else{ setItemValue(0,0,"sign_status",""); } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 2439981d9..402f30d83 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -19,6 +19,8 @@ BizObject bo=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT", "flow_unid=:flowunid").setParameter("flowunid",sFlowUnid).getSingleResult(false); String custype = CurPage.getParameter("CustomerType"); String customertype = CurPage.getParameter("customertype"); + String channel = CurPage.getParameter("channel"); + ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setHtmlEvent("inputTel","onChange","checkTel"); //租赁形式set只读 @@ -42,7 +44,12 @@ if("01".equals(custype)||"01".equals(customertype)){ userll="/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp?CompClientID="; } - + if("ZC".equals(channel)){ + doTemp.setVisible("ZC_PROJECT_NUMBER",true); + doTemp.setRequired("ZC_PROJECT_NUMBER",true); + doTemp.setVisible("ZC_CONTRACT_NUMBER",true); + doTemp.setRequired("ZC_CONTRACT_NUMBER",true); + } ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); dwTemp.Style = "2";//freeform dwTemp.setGroupHidden("0020"); @@ -70,10 +77,20 @@ if(!checkTel()){ return ; } + if("ZC"=="<%=channel%>"){ + if(!checkZcProjectNumber()){ + return ; + } + if(!checkZcContractNumber()){ + return ; + } + } var leasfrom = getItemValue(0,getRow(),"LEAS_FORM"); var projectSource = getItemValue(0,getRow(),"PROJECT_SOURCE"); var inputName = getItemValue(0,getRow(),"inputName"); var inputTel = getItemValue(0,getRow(),"inputTel"); + var zcProjectNumber = getItemValue(0,getRow(),"ZC_PROJECT_NUMBER"); + var zcContractNumber = getItemValue(0,getRow(),"ZC_CONTRACT_NUMBER"); var customerType = "<%=custype%>"; var customerT = "<%=customertype%>"; var projectNo=getItemValue(0,getRow(),"PROJECT_NO"); @@ -100,7 +117,7 @@ //as_save(0); } if(customerType=="03"||customerT=="03"){//自然人 - frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType); + frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType,zcProjectNumber,zcContractNumber); //as_save("myiframe0","frame_list.window.as_save(0);"); } } @@ -130,5 +147,27 @@ return true; } } + + function checkZcProjectNumber(){ + var zcProjectNumber = getItemValue(0,getRow(0),"ZC_PROJECT_NUMBER"); + if(zcProjectNumber==""){ + setErrorTips("ZC_PROJECT_NUMBER","中车申请号不能为空!"); + return false; + }else{ + setErrorTips("ZC_PROJECT_NUMBER",""); + return true; + } + } + + function checkZcContractNumber(){ + var zcContractNumber = getItemValue(0,getRow(0),"ZC_CONTRACT_NUMBER"); + if(zcContractNumber==""){ + setErrorTips("ZC_CONTRACT_NUMBER","中车合同号不能为空!"); + return false; + }else{ + setErrorTips("ZC_CONTRACT_NUMBER",""); + return true; + } + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 4f90b2071..172810e3c 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -14,6 +14,8 @@ String FlowName = CurPage.getParameter("FlowName");//获取流程名称 String IsHistory = CurPage.getParameter("IsHistory");//获取流程名称 String projectId = CurPage.getParameter("ProjectId"); + String channel = CurPage.getParameter("channel"); + String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'"); String sTempletNo = "";//--模板号-- String sexChange=""; @@ -439,7 +441,7 @@ } */ } - function saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType){//保存 + function saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType,zcProjectNumber,zcContractNumber){//保存 //校验申请人手机号和配偶手机号是否重复 var RepeatReault = ""; var customerType = "03"; @@ -559,13 +561,13 @@ var certid=getItemValue(0,0,"CERTID"); <%-- var customerid=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerAction","updateCustomerId",'certid='+certid+',flowunid=<%=flowunid%>'); --%> // setItemValue(0,0,"customerid",customerid); - as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"','"+leasfrom+"','"+projectSource+"','"+projectNo+"','"+operationType+"')"); + as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"','"+leasfrom+"','"+projectSource+"','"+projectNo+"','"+operationType+"','"+zcProjectNumber+"','"+zcContractNumber+"')"); return true; }; } - function saveCertInfo(inputName,inputTel,leasfrom,projectSource,projectNo,operationType){ - var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCertInfo",'projectNo='+projectNo+',inputName='+inputName+',operationType='+operationType+',inputTel='+inputTel+',project_source='+projectSource+',leas_from='+leasfrom+',idexpiry='+getItemValue(0,0,"idexpiry")+',certtype='+getItemValue(0,0,"certtype")+',customerid='+getItemValue(0,0,"customerid")+',flowunid=<%=flowunid%>,certid='+getItemValue(0,0,"certid")+',name='+getItemValue(0,0,"name")+',userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>'); + function saveCertInfo(inputName,inputTel,leasfrom,projectSource,projectNo,operationType,zcProjectNumber,zcContractNumber){ + var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCertInfo",'zcProjectNumber='+zcProjectNumber+',zcContractNumber='+zcContractNumber+',projectNo='+projectNo+',inputName='+inputName+',operationType='+operationType+',inputTel='+inputTel+',project_source='+projectSource+',leas_from='+leasfrom+',idexpiry='+getItemValue(0,0,"idexpiry")+',certtype='+getItemValue(0,0,"certtype")+',customerid='+getItemValue(0,0,"customerid")+',flowunid=<%=flowunid%>,certid='+getItemValue(0,0,"certid")+',name='+getItemValue(0,0,"name")+',userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>,channel=<%=channel%>'); if(sResult == "SUCCESS"){ parent.reloadSelf(); } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index f8bce9363..a2959fd7b 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -1,4 +1,5 @@ <%@ page contentType="text/html; charset=GBK"%> +<%@ page import="com.tenwa.util.ProjectConstant"%> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%> <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%> @@ -36,6 +37,7 @@ distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); distributorType = bo.getAttribute("TYPE").getString(); } + String distributorNoConfig = ProjectConstant.DISTIRBUTOR_NO;//获取需要配置经销商 System.out.println(distributorNo); System.out.println(distributorType); String sApplyType = CurPage.getParameter("ApplyType"); @@ -88,7 +90,11 @@ <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%>