Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into develop
This commit is contained in:
commit
0d85eae5f1
@ -73,7 +73,7 @@
|
||||
dwTemp.getDataObject().setRequired("secondchoice", true);
|
||||
dwTemp.getDataObject().setRequired("secondopinion", true);
|
||||
dwTemp.setGroupHidden("0040");
|
||||
if("BACK".equals(flowstate)||"ANYBACK".equals(flowstate)){
|
||||
if(("BACK".equals(flowstate)||"ANYBACK".equals(flowstate))&&"0060".equals(phaseNo)){
|
||||
dwTemp.getDataObject().setVisible("thirdchoice", true);
|
||||
dwTemp.getDataObject().setVisible("thirdopinion", true);
|
||||
dwTemp.getDataObject().setReadOnly("thirdchoice", true);
|
||||
@ -131,6 +131,41 @@
|
||||
dwTemp.getDataObject().setReadOnly("thirdchoice", false);
|
||||
dwTemp.getDataObject().setReadOnly("thirdopinion", false);
|
||||
dwTemp.setGroupHidden("0030,0040,0050");
|
||||
}else if("0070".equals(phaseNo)){//添加业务分管领导
|
||||
if(!"true".equals(ishistory)){//显示初审和复审意见
|
||||
dwTemp.getDataObject().setVisible("firstchoice", true);
|
||||
dwTemp.getDataObject().setVisible("firstopinion", true);
|
||||
dwTemp.getDataObject().setReadOnly("firstchoice", true);
|
||||
dwTemp.getDataObject().setReadOnly("firstopinion", true);
|
||||
dwTemp.getDataObject().setVisible("secondchoice", true);
|
||||
dwTemp.getDataObject().setVisible("secondopinion", true);
|
||||
dwTemp.getDataObject().setReadOnly("secondchoice", true);
|
||||
dwTemp.getDataObject().setReadOnly("secondopinion", true);
|
||||
if(money>200000){//如果大约20万显示负责人审批意见
|
||||
dwTemp.getDataObject().setVisible("thirdchoice", true);
|
||||
dwTemp.getDataObject().setVisible("thirdopinion", true);
|
||||
dwTemp.getDataObject().setReadOnly("thirdchoice", true);
|
||||
dwTemp.getDataObject().setReadOnly("thirdopinion", true);
|
||||
}else{
|
||||
dwTemp.setGroupHidden("0040");
|
||||
}
|
||||
|
||||
}else{
|
||||
dwTemp.getDataObject().setVisible("firstchoice", true);
|
||||
dwTemp.getDataObject().setVisible("firstopinion", true);
|
||||
dwTemp.getDataObject().setReadOnly("firstchoice", true);
|
||||
dwTemp.getDataObject().setReadOnly("firstopinion", true);
|
||||
dwTemp.getDataObject().setVisible("secondchoice", false);
|
||||
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.setGroupHidden("0030,0040,0050");
|
||||
}
|
||||
}
|
||||
dwTemp.genHTMLObjectWindow(flowunid);
|
||||
|
||||
@ -192,12 +227,12 @@
|
||||
$("#A_div_1180").attr("style","display:none;");
|
||||
$("#A_div_1250").attr("style","display:none;");
|
||||
$("#A_Group_0020").attr("style","display:none;");
|
||||
if("13"==<%=projectstatus%>){
|
||||
html='<tr id="contractsign" class="test"><td>业务审批结果: 通过</td></tr>';
|
||||
<%-- if("13"==<%=projectstatus%>){ --%>//添加业务二部风管领导审批,意见0070显示
|
||||
/* html='<tr id="contractsign" class="test"><td>业务审批结果: 通过</td></tr>';
|
||||
}else{
|
||||
html='<tr id="contractsign" class="test"><td>业务审批结果: 未通过</td></tr>';
|
||||
}
|
||||
$("#A_Group_0010").append(html);
|
||||
$("#A_Group_0010").append(html); */
|
||||
}
|
||||
_user_validator[0]['rules']['SECONDCHOICE']['required0'] = true;
|
||||
_user_validator[0]['messages']['SECONDCHOICE']['required0'] = '请输入复审意见';
|
||||
@ -304,7 +339,19 @@
|
||||
_user_validator[0]['rules']['FOUROPINION']['required0'] = true;
|
||||
_user_validator[0]['messages']['FOUROPINION']['required0'] = "请输入审批意见";
|
||||
break;
|
||||
case '0070'://经销商
|
||||
if("true"=="<%=ishistory%>"&&<%=CurUser.hasRole("401")%>){
|
||||
$("#A_Group_0020").attr("style","display:none;");
|
||||
if("13"==<%=projectstatus%>){
|
||||
html='<tr id="contractsign" class="test"><td>业务审批结果: 通过</td></tr>';
|
||||
}else{
|
||||
html='<tr id="contractsign" class="test"><td>业务审批结果: 未通过</td></tr>';
|
||||
}
|
||||
$("#A_Group_0010").append(html);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
var certResult = checkCertId();
|
||||
if(certResult=="4" && "false"=="<%=ishistory%>"){
|
||||
//$("#FULLNAME").attr("style","color:red;");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user