diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 7f48c0a1f..6468ed0c7 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -63,7 +63,7 @@ // dwTemp.getDataObject().setReadOnly("InterOpinion2", true); dwTemp.setGroupHidden("0040,0050"); } - }else if("0040".equals(phaseNo)){//复审 + }else if("0040".equals(phaseNo)||"0060".equals(phaseNo)){//复审 dwTemp.getDataObject().setVisible("firstchoice", true); dwTemp.getDataObject().setVisible("firstopinion", true); dwTemp.getDataObject().setReadOnly("firstchoice", true); @@ -204,6 +204,36 @@ _user_validator[0]['rules']['SECONDOPINION']['required0'] = true; _user_validator[0]['messages']['SECONDOPINION']['required0'] = "请输入审批意见"; break; + case '0060'://大于20万复审 + $("#A_div_1250").attr("style","display:none;"); + $("#A_div_1260").attr("style","display:none;"); + + $("#FIRSTCHOICE").attr("disabled","disabled");//初审意见 + $("#FIRSTOPINION").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;"); + } + if("true"=="<%=ishistory%>"&&<%=CurUser.hasRole("401")%>){ + $("#A_div_1130").attr("style","display:none;"); + $("#A_div_1140").attr("style","display:none;"); + $("#A_div_1210").attr("style","display:none;"); + $("#A_div_1150").attr("style","display:none;"); + $("#A_div_1160").attr("style","display:none;"); + $("#A_div_1230").attr("style","display:none;"); + $("#A_div_1170").attr("style","display:none;"); + $("#A_div_1180").attr("style","display:none;"); + $("#A_div_1250").attr("style","display:none;"); + $("#A_Group_0020").attr("style","display:none;"); + + } + _user_validator[0]['rules']['SECONDCHOICE']['required0'] = true; + _user_validator[0]['messages']['SECONDCHOICE']['required0'] = '请输入复审意见'; + _user_validator[0]['rules']['SECONDOPINION']['required0'] = true; + _user_validator[0]['messages']['SECONDOPINION']['required0'] = "请输入审批意见"; + break; case '0050'://信审 $("#FIRSTCHOICE").attr("disabled","disabled");//初审意见 @@ -311,7 +341,7 @@ } obj.options[7].style.display = "block"; } - if(firstchoice=="0040"){ + if(firstchoice=="0040"||"0060"==firstchoice){ // setItemRequired(0,"InterOpinion1",false); // setItemRequired(0,"DistriOpinion1",true); setItemValue(0,0,"firstopinion",""); @@ -388,7 +418,7 @@ // $("#FIRSTOPINION").attr("disabled","disabled"); attribute1="3"; } - if(firstchoice=="0040"){ + if(firstchoice=="0040"||firstchoice=="0060"){ // setItemRequired(0,"InterOpinion1",false); // setItemRequired(0,"DistriOpinion1",true); setItemRequired(0,"FIRSTOPINION",false); @@ -447,7 +477,7 @@ var obj=document.getElementById('SECONDOPINION'); attribute1="3"; } - if(secondchoice=="0040"){ + if(secondchoice=="0040"||secondchoice=="0060"){ setItemRequired(0,"InterOpinion2",false); //setItemRequired(0,"DistriOpinion2",true); // setItemValue(0,0,"secondopinion",""); @@ -504,7 +534,7 @@ var obj=document.getElementById('THIRDOPINION'); attribute1="3"; } - if(thirdchoice=="0040"){ + if(thirdchoice=="0040"||thirdchoice=="0060"){ setItemRequired(0,"InterOpinion3",false); //setItemRequired(0,"DistriOpinion3",true); setItemValue(0,0,"thirdopinion",""); @@ -561,7 +591,7 @@ if("0030" == "<%=phaseNo%>"){ phaseChoice = getItemValue(0,0,"firstchoice"); phaseOpinion = getItemValue(0,0,"firstopinion"); - }else if("0040" == "<%=phaseNo%>"){ + }else if("0040" == "<%=phaseNo%>"||"0060" == "<%=phaseNo%>"){ phaseChoice = getItemValue(0,0,"secondchoice"); phaseOpinion = getItemValue(0,0,"secondopinion"); }else if("0050" == "<%=phaseNo%>"){ diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java index 4cc55fadd..595145fef 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java @@ -22,7 +22,7 @@ public class ApprovalOpinionCheck extends DefaultBussinessCheck{ String flowunid=this.getAttribute("ObjectNo").toString(); String phaseno=this.getAttribute("PhaseNo").toString(); boolean flag = true; - String sql="select case when ft.phaseno='0030' then case when fo.phasechoice is not null then 1 else 0 end when ft.phaseno='0040' then case when fo.phasechoice is not null then 1 else 0 end when ft.phaseno='0050' then case when fo.phasechoice is not null then 1 else 0 end else 99 end phasechoice,case when ft.phaseno='0030' then case when fo.phaseopinion is not null then 1 else 0 end when ft.phaseno='0040' then case when fo.phaseopinion is not null then 1 else 0 end when ft.phaseno='0050' then case when fo.phaseopinion is not null then 1 else 0 end else 99 end phaseopinion from flow_task ft left join flow_opinion fo on ft.relativeobjectno = fo.serialno " + String sql="select case when ft.phaseno='0030' then case when fo.phasechoice is not null then 1 else 0 end when ft.phaseno='0040' then case when fo.phasechoice is not null then 1 else 0 end when ft.phaseno='0060' then case when fo.phasechoice is not null then 1 else 0 end when ft.phaseno='0050' then case when fo.phasechoice is not null then 1 else 0 end else 99 end phasechoice,case when ft.phaseno='0030' then case when fo.phaseopinion is not null then 1 else 0 end when ft.phaseno='0040' then case when fo.phaseopinion is not null then 1 else 0 end when ft.phaseno='0060' then case when fo.phaseopinion is not null then 1 else 0 end when ft.phaseno='0050' then case when fo.phaseopinion is not null then 1 else 0 end else 99 end phaseopinion from flow_task ft left join flow_opinion fo on ft.relativeobjectno = fo.serialno " +" where ft.objectno = '"+flowunid+"' and ft.phaseno = '"+phaseno+"' and ft.serialno='"+serialno+"' and ft.relativeobjectno is not null"; SqlObject so = new SqlObject(sql); ASResultSet result = Sqlca.getASResultSet(so); @@ -45,6 +45,11 @@ public class ApprovalOpinionCheck extends DefaultBussinessCheck{ message = "复审意见未填写!"; flag = false; } break; + case "0060": + if(!"1".equals(phasechoice)){ + message = "复审意见未填写!"; flag = false; + } + break; case "0050": if(!"1".equals(phasechoice)){ message = "部门负责人意见未填写!"; flag = false;