From 464a60eb8f7582631def36ccf82674bb0595bb21 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 21 Aug 2018 16:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=9A=E5=8A=A1=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=AE=A1=E6=89=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/ApprovalForm.jsp | 93 ++++++++---------- .../CustomerFamilyJoinTempInfo.jsp | 4 + WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 42 ++++++++ WebContent/WEB-INF/etc/jbo/jbo_sys.xml | 50 ++++++++++ .../fileTemplate/直接扣款授权委托书.docx | Bin 13338 -> 13361 bytes .../businessapply/BusinessApproveManager.java | 3 +- .../businessapply/CustomerInfoManage.java | 2 +- 7 files changed, 142 insertions(+), 52 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 38d042fed..6bd2f770d 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -31,13 +31,6 @@ if("01".equals(customerType)){ doTemp.setVisible("SEX",false);//Ƿ˿ͻԱֶ } - if(("ҵ".equals(flowName)&&"ANYBACK".equals(flowstate))&&("0010".equals(phaseNo)||"0020".equals(phaseNo))){ - doTemp.setVisible("InterOpinion1",false); - doTemp.setVisible("InterOpinion2",false); - doTemp.setVisible("DistriOpinion2",false); - doTemp.setVisible("InterOpinion3",false); - doTemp.setReadOnly("DistriOpinion1",true);//ֶζֻ - } doTemp.setHtmlEvent("firstchoice","onChange","changeFirstChoice"); doTemp.setHtmlEvent("secondchoice","onChange","changeSecondChoice"); doTemp.setHtmlEvent("thirdchoice","onChange","changeThirdChoice"); @@ -63,8 +56,8 @@ dwTemp.getDataObject().setVisible("secondopinion", true); dwTemp.getDataObject().setReadOnly("secondchoice", true); dwTemp.getDataObject().setReadOnly("secondopinion", true); - dwTemp.getDataObject().setVisible("InterOpinion2", true); - dwTemp.getDataObject().setReadOnly("InterOpinion2", true); +// dwTemp.getDataObject().setVisible("InterOpinion2", true); +// dwTemp.getDataObject().setReadOnly("InterOpinion2", true); dwTemp.setGroupHidden("0040,0050"); } }else if("0040".equals(phaseNo)){// @@ -82,8 +75,8 @@ dwTemp.getDataObject().setVisible("thirdopinion", true); dwTemp.getDataObject().setReadOnly("thirdchoice", true); dwTemp.getDataObject().setReadOnly("thirdopinion", true); - dwTemp.getDataObject().setVisible("INTEROPINION3", true); - dwTemp.getDataObject().setReadOnly("INTEROPINION3", true); +// dwTemp.getDataObject().setVisible("INTEROPINION3", true); +// dwTemp.getDataObject().setReadOnly("INTEROPINION3", true); dwTemp.setGroupHidden("0050"); } if(CurUser.hasRole("401")){ @@ -112,10 +105,10 @@ dwTemp.getDataObject().setVisible("secondopinion", false); dwTemp.getDataObject().setVisible("thirdchoice", false); dwTemp.getDataObject().setVisible("thirdopinion", false); - dwTemp.getDataObject().setVisible("INTEROPINION2", false); - dwTemp.getDataObject().setVisible("DISTRIOPINION2", false); - dwTemp.getDataObject().setVisible("INTEROPINION3", false); - dwTemp.getDataObject().setVisible("DISTRIOPINION3", false); +// dwTemp.getDataObject().setVisible("INTEROPINION2", false); +// dwTemp.getDataObject().setVisible("DISTRIOPINION2", false); +// dwTemp.getDataObject().setVisible("INTEROPINION3", false); +// dwTemp.getDataObject().setVisible("DISTRIOPINION3", false); dwTemp.setGroupHidden("0030,0040,0050"); } @@ -179,8 +172,8 @@ $("#FIRSTCHOICE").attr("disabled","disabled");// $("#FIRSTOPINION").attr("disabled","disabled");// - $("#INTEROPINION1").attr("disabled","disabled");//ڲ - $("#DISTRIOPINION1").attr("disabled","disabled");// +// $("#INTEROPINION1").attr("disabled","disabled");//ڲ +// $("#DISTRIOPINION1").attr("disabled","disabled");// if("BACK"=="<%=flowstate%>"||"ANYBACK"=="<%=flowstate%>"){ $("#A_div_1250").attr("style","display:block;"); $("#A_div_1260").attr("style","display:block;"); @@ -205,12 +198,12 @@ $("#FIRSTCHOICE").attr("disabled","disabled");// $("#FIRSTOPINION").attr("disabled","disabled");// - $("#INTEROPINION1").attr("disabled","disabled");//ڲ - $("#DISTRIOPINION1").attr("disabled","disabled");// +// $("#INTEROPINION1").attr("disabled","disabled");//ڲ +// $("#DISTRIOPINION1").attr("disabled","disabled");// $("#SECONDCHOICE").attr("disabled","disabled");// $("#SECONDOPINION").attr("disabled","disabled");// - $("#INTEROPINION2").attr("disabled","disabled");//ڲ - $("#DISTRIOPINION2").attr("disabled","disabled");// +// $("#INTEROPINION2").attr("disabled","disabled");//ڲ +// $("#DISTRIOPINION2").attr("disabled","disabled");// if("true"=="<%=ishistory%>"&&<%=CurUser.hasRole("401")%>){ $("#A_div_1130").attr("style","display:none;"); $("#A_div_1140").attr("style","display:none;"); @@ -237,12 +230,12 @@ $("#FIRSTCHOICE").attr("disabled","disabled");// $("#FIRSTOPINION").attr("disabled","disabled");// - $("#INTEROPINION1").attr("disabled","disabled");//ڲ - $("#DISTRIOPINION1").attr("disabled","disabled");// +// $("#INTEROPINION1").attr("disabled","disabled");//ڲ +// $("#DISTRIOPINION1").attr("disabled","disabled");// $("#SECONDCHOICE").attr("disabled","disabled");// $("#SECONDOPINION").attr("disabled","disabled");// - $("#INTEROPINION2").attr("disabled","disabled");//ڲ - $("#DISTRIOPINION2").attr("disabled","disabled");// +// $("#INTEROPINION2").attr("disabled","disabled");//ڲ +// $("#DISTRIOPINION2").attr("disabled","disabled");// if("BACK"=="<%=flowstate%>"||"ANYBACK"=="<%=flowstate%>"){ $("#A_div_1130").attr("style","display:none;"); $("#A_div_1140").attr("style","display:none;"); @@ -272,14 +265,14 @@ } var firstchoice = getItemValue(0,0,"firstchoice"); if(firstchoice==""){ - setItemRequired(0,"InterOpinion1",false); - setItemRequired(0,"DistriOpinion1",false); +// setItemRequired(0,"InterOpinion1",false); +// setItemRequired(0,"DistriOpinion1",false); $("#FIRSTOPINION").attr("disabled",""); } if(firstchoice=="0010"){ setItemRequired(0,"A_div_1220",true); - setItemRequired(0,"InterOpinion1",false); - setItemRequired(0,"DistriOpinion1",true); +// setItemRequired(0,"InterOpinion1",false); +// setItemRequired(0,"DistriOpinion1",true); $("#FIRSTOPINION").attr("disabled",""); var obj=document.getElementById('FIRSTOPINION'); for(var i=0;i<7;i++){ @@ -288,8 +281,8 @@ obj.options[7].style.display = "none"; } if(firstchoice=="0030"){ - setItemRequired(0,"InterOpinion1",true); - setItemRequired(0,"DistriOpinion1",false); +// setItemRequired(0,"InterOpinion1",true); +// setItemRequired(0,"DistriOpinion1",false); $("#FIRSTOPINION").attr("disabled",""); var obj=document.getElementById('FIRSTOPINION'); for(var i=0;i<7;i++){ @@ -298,8 +291,8 @@ obj.options[7].style.display = "block"; } if(firstchoice=="0040"){ - setItemRequired(0,"InterOpinion1",false); - setItemRequired(0,"DistriOpinion1",true); +// setItemRequired(0,"InterOpinion1",false); +// setItemRequired(0,"DistriOpinion1",true); setItemValue(0,0,"firstopinion",""); $("#FIRSTOPINION").attr("disabled","disabled"); } @@ -320,14 +313,14 @@ var firstchoice = getItemValue(0,0,"firstchoice"); var attribute1=""; if(firstchoice==""){ - setItemRequired(0,"InterOpinion1",false); - setItemRequired(0,"DistriOpinion1",false); +// setItemRequired(0,"InterOpinion1",false); +// setItemRequired(0,"DistriOpinion1",false); $("#FIRSTOPINION").removeAttr("disabled"); } if(firstchoice=="0010"){ setItemRequired(0,"A_div_1220",true); - setItemRequired(0,"InterOpinion1",true); - setItemRequired(0,"DistriOpinion1",false); +// setItemRequired(0,"InterOpinion1",true); +// setItemRequired(0,"DistriOpinion1",false); setItemRequired(0,"FIRSTOPINION",true); $("#FIRSTOPINION").removeAttr("disabled"); /* var obj=document.getElementById('FIRSTOPINION'); @@ -338,8 +331,8 @@ attribute1="1"; } if(firstchoice=="0020"){ - setItemRequired(0,"InterOpinion1",true); - setItemRequired(0,"DistriOpinion1",false); +// setItemRequired(0,"InterOpinion1",true); +// setItemRequired(0,"DistriOpinion1",false); setItemRequired(0,"FIRSTOPINION",true); $("#FIRSTOPINION").removeAttr("disabled"); /* var obj=document.getElementById('FIRSTOPINION'); @@ -350,16 +343,16 @@ attribute1="2"; } if(firstchoice=="0030"){ - setItemRequired(0,"InterOpinion1",true); - setItemRequired(0,"DistriOpinion1",false); +// setItemRequired(0,"InterOpinion1",true); +// setItemRequired(0,"DistriOpinion1",false); setItemRequired(0,"FIRSTOPINION",false); setItemValue(0,0,"firstopinion",""); $("#FIRSTOPINION").attr("disabled","disabled"); attribute1=""; } if(firstchoice=="0040"){ - setItemRequired(0,"InterOpinion1",false); - setItemRequired(0,"DistriOpinion1",true); +// setItemRequired(0,"InterOpinion1",false); +// setItemRequired(0,"DistriOpinion1",true); setItemRequired(0,"FIRSTOPINION",false); setItemValue(0,0,"firstopinion",""); $("#FIRSTOPINION").attr("disabled","disabled"); @@ -539,14 +532,14 @@ phaseChoice = getItemValue(0,0,"fourchoice"); phaseOpinion = getItemValue(0,0,"fouropinion"); } - var InterOpinion1 = getItemValue(0,0,"InterOpinion1"); - var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1"); - var InterOpinion2 = getItemValue(0,0,"InterOpinion2"); - var DistriOpinion2 = getItemValue(0,0,"DistriOpinion2"); - var InterOpinion3 = getItemValue(0,0,"InterOpinion3"); - var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3"); +// var InterOpinion1 = getItemValue(0,0,"InterOpinion1"); +// var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1"); +// var InterOpinion2 = getItemValue(0,0,"InterOpinion2"); +// var DistriOpinion2 = getItemValue(0,0,"DistriOpinion2"); +// var InterOpinion3 = getItemValue(0,0,"InterOpinion3"); +// var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3"); var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","saveApproveOpinion", - "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",InterOpinion1="+InterOpinion1+",DistriOpinion1="+DistriOpinion1+",InterOpinion2="+InterOpinion2+",DistriOpinion2="+DistriOpinion2+",InterOpinion3="+InterOpinion3+",DistriOpinion3="+DistriOpinion3+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>"); + "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>"); if("SUCCESS" == sResult){ resetDWDialog("ɹ",true); reloadSelf(); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp index 5113fefb4..2db3c0922 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp @@ -226,10 +226,14 @@ return; }else{ */ var flowunid = getItemValue(0,0,"flowunid"); + var customerid = getItemValue(0,0,"customerid"); if(null==flowunid||""==flowunid){ setItemValue(0, 0, "flowunid", "<%=FlowUnid%>"); setItemValue(0, 0, "Partner_", "Y"); } + if(null==customerid||""==customerid){ + setItemValue(0, 0, "customerid","<%=customerid%>"); + } as_save(0); // } } diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 5ec0f75ac..84aaaba7b 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -4506,6 +4506,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml index 2b1b18be0..f0aa119cb 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_sys.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_sys.xml @@ -2254,5 +2254,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/fileTemplate/直接扣款授权委托书.docx b/WebContent/fileTemplate/直接扣款授权委托书.docx index 5d4e065902ee0d2c7631ed63bebb2698c56a4b78..cec319ba0a3e178499c6b8486f42fafa2e2335bd 100644 GIT binary patch delta 4554 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

E=}B(}91` zW5(f(zri$z1Bx;8wcj-A=`GrqXv^Hozd-~H*-am7ZQLl_Y0E6nC~O#oY5Zu9rEF;U z=C{EPS!+#7FMFQ_gmlC9!QN;Cj`q&%Ztr^Or*)KN_Jf*3jPozph|$43nKQjP0jz&y zs%^c6qqAr3)U3js4b3jJ z%L8Eu4Ipd1-d!YZYV*Ovq&58<=0t2NVk8P_z?(z zww)%6hQ2ff<_IrAmN4g;%4!Z@Df1ExmyHh{@1O_M z7dCRTiFOR5xJpL~pipaamzpVfG;2?D0`tGU0jbm;GF5V%C;y;{b%>C-FoDKTNwC;@ z2nL5YmVKpbH>m7!eG8!tZ7%x^py2w+#tGVZRC{JRXC`B}m->79X~C?F{D)KFsV*zfKz(lHuE)ABsVYw^cxBclaitYSDoQ6`SG==^FV%2*ai(Z4b(w;UBQM9+`Ej! zPkOZwez^CeWB&(`8nZ4W=L!L4lNK*P0hg0kFEatVlZ!7n0V|WlFE;_GClz`llL+u8<&d9PAvrh067i-01*HH00000 o0096X0001-lQ%Oy0hW_?GduzKle0580U?v@GbjcEF8}}l01|PWr~m)} delta 4598 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 diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java index 95fc77cb7..dbfe7e1b5 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java @@ -4,6 +4,7 @@ import jbo.app.LB_EQUIPMENT_CAR; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; import jbo.sys.CAR_PLATENUMBER_CODE; import jbo.sys.FLOW_OPINION; +import jbo.sys.FLOW_OPINION_BUSINESS; import jbo.sys.FLOW_TASK; import com.amarsoft.are.jbo.BizObject; @@ -147,7 +148,7 @@ public class BusinessApproveManager { BizObjectManager bomFT = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,tx); BizObject boFT = bomFT.createQuery("objectno=:flowunid and phaseno=:phaseNo and relativeobjectno is not null") .setParameter("flowunid", flowunid).setParameter("phaseNo", phaseNo).getSingleResult(true); - BizObjectManager bomFO = JBOFactory.getBizObjectManager(FLOW_OPINION.CLASS_NAME,tx); + BizObjectManager bomFO = JBOFactory.getBizObjectManager(FLOW_OPINION_BUSINESS.CLASS_NAME,tx); BizObject bo = bomFO.createQuery("serialno='"+serialNo+"'").getSingleResult(true); if(boFT != null){ boFT.setAttributeValue("relativeobjectno", null); 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 c7904250b..03caf8e81 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java @@ -281,7 +281,7 @@ public class CustomerInfoManage { public String saveCustomerFamily(JBOTransaction tx){ try{ BizObjectManager bom = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME,tx); - BizObject bo = bom.createQuery("flowunid=:flowunid and customerid=:customerid").setParameter("flowunid", flowunid).setParameter("customerid", customerid).getSingleResult(true); + BizObject bo = bom.createQuery("flowunid=:flowunid and customerid=:customerid and Spouse_='Y' ").setParameter("flowunid", flowunid).setParameter("customerid", customerid).getSingleResult(true); if(bo != null){ bo.setAttributeValue("certid", certid); bo.setAttributeValue("name", name);