diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index 9ca1d90eb..8ec6a41c8 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -70,11 +70,11 @@
//复审意见展示
- if("业务申请流程".equals(flowName)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".equals(phaseNo))){
- doTemp.setVisible("VETO",true);
- }else {
- doTemp.setVisible("VETO",false);
- }
+// if("业务申请流程".equals(flowName)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".equals(phaseNo))){
+// doTemp.setVisible("VETO",true);
+// }else {
+// doTemp.setVisible("VETO",false);
+// }
if(("业务申请流程".equals(flowName)||"业务变更流程".equals(flowName))&&("0030".equals(phaseNo)||"0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".equals(phaseNo))){
dwTemp.getDataObject().setVisible("subjectname", true);
@@ -214,14 +214,14 @@
$(function(){
//拒单理由 复审意见为拒绝和返回经销商时拒单理由显示
- var vo = getItemValue(0,0,"secondchoice");
- if(vo=="0010"){
- showItem(0,"VETO");
- setItemRequired(0,"VETO",true);
- }else {
- hideItem(0,"VETO");
- setItemRequired(0,"VETO",false);
- }
+ // var vo = getItemValue(0,0,"secondchoice");
+ // if(vo=="0010"){
+ // showItem(0,"VETO");
+ // setItemRequired(0,"VETO",true);
+ // }else {
+ // hideItem(0,"VETO");
+ // setItemRequired(0,"VETO",false);
+ // }
$(".info_td_left").css("width","150px");
$(".info_mid_line").css("width","50%");
@@ -284,7 +284,7 @@
if("13"==<%=projectstatus%>){//添加业务二部风管领导审批，意见0070显示
html='| 业务审批结果： 通过 |
';
}else{
- var firstopinionText= $("#FIRSTOPINION").find("option:selected").text();
+ var firstopinionText= $("#SECONDOPINION").find("option:selected").text();
html='| 业务审批结果： 未通过（'+firstopinionText+'） |
';
}
$("#A_Group_0010").append(html);
@@ -351,7 +351,7 @@
if("13"==<%=projectstatus%>){
html='| 业务审批结果： 通过 |
';
}else{
- var firstopinionText= $("#FIRSTOPINION").find("option:selected").text();
+ var firstopinionText= $("#SECONDOPINION").find("option:selected").text();
html='| 业务审批结果： 未通过（'+firstopinionText+'） |
';
}
$("#A_Group_0010").append(html);
@@ -404,7 +404,7 @@
if("13"==<%=projectstatus%>){
html='| 业务审批结果： 通过 |
';
}else{
- var firstopinionText= $("#FIRSTOPINION").find("option:selected").text();
+ var firstopinionText= $("#SECONDOPINION").find("option:selected").text();
html='| 业务审批结果： 未通过（'+firstopinionText+'） |
';
}
$("#A_Group_0010").append(html);
@@ -692,16 +692,16 @@
}
});
//拒单理由 复审意见为拒绝和返回经销商时拒单理由显示
- var vo = getItemValue(0,0,"secondchoice");
- if(vo=="0010"){
- showItem(0,"VETO");
- setItemRequired(0,"VETO",true);
- setItemValue(0, 0, "VETO", "");
- }else {
- hideItem(0,"VETO");
- setItemRequired(0,"VETO",false);
- setItemValue(0, 0, "VETO", "");
- }
+ // var vo = getItemValue(0,0,"secondchoice");
+ // if(vo=="0010"){
+ // showItem(0,"VETO");
+ // setItemRequired(0,"VETO",true);
+ // setItemValue(0, 0, "VETO", "");
+ // }else {
+ // hideItem(0,"VETO");
+ // setItemRequired(0,"VETO",false);
+ // setItemValue(0, 0, "VETO", "");
+ // }
}
function changeThirdChoice(){//根据信审意见，遍历相应的下拉选项
@@ -798,7 +798,7 @@
openDWDialog();
var phaseChoice = "";
var phaseOpinion = "";
- var VETO = "";
+ //var VETO = "";
if("0030" == "<%=phaseNo%>"){
phaseChoice = getItemValue(0,0,"firstchoice");
phaseOpinion = getItemValue(0,0,"firstopinion");
@@ -813,12 +813,12 @@
phaseOpinion = getItemValue(0,0,"fouropinion");
}
//根据复审意见对拒绝理由赋值
- var vo = getItemValue(0,0,"secondchoice");
- if(vo=="0010"){
- VETO = getItemValue(0,0,"VETO");
- }else {
- VETO = "";
- }
+ // var vo = getItemValue(0,0,"secondchoice");
+ // if(vo=="0010"){
+ // VETO = getItemValue(0,0,"VETO");
+ // }else {
+ // VETO = "";
+ // }
// var InterOpinion1 = getItemValue(0,0,"InterOpinion1");
// var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1");
@@ -827,7 +827,7 @@
// 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+",veto="+VETO+",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/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
index 91ad3f30a..1fb37d94d 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
@@ -41,15 +41,15 @@ public class BusinessApproveManager {
private String dataNum;//租赁物复制的数量
private String carId;
- private String veto;//拒单理由
-
- public String getVeto() {
- return veto;
- }
-
- public void setVeto(String veto) {
- this.veto = veto;
- }
+// private String veto;//拒单理由
+//
+// public String getVeto() {
+// return veto;
+// }
+//
+// public void setVeto(String veto) {
+// this.veto = veto;
+// }
public String getDistriOpinion1() {
return DistriOpinion1;
@@ -221,17 +221,16 @@ public class BusinessApproveManager {
}
bomFO.saveObject(bo);
- Transaction sqlca = Transaction.createTransaction(tx);
- String ssql = "";
- if(veto!=null||"".equals(veto)){
- ssql= "update LB_PROJECT_INFO_TEMP set veto = '"+veto+"' where FLOWUNID = '"+flowunid+"'";
- }else {
- ssql= "update LB_PROJECT_INFO_TEMP set veto = '' where FLOWUNID = '"+flowunid+"'";
- }
- SqlObject sqlObject = new SqlObject(ssql);
- sqlca.executeSQL(sqlObject);
-
- tx.commit();
+// Transaction sqlca = Transaction.createTransaction(tx);
+// String ssql = "";
+// if(veto!=null||"".equals(veto)){
+// ssql= "update LB_PROJECT_INFO_TEMP set veto = '"+veto+"' where FLOWUNID = '"+flowunid+"'";
+// }else {
+// ssql= "update LB_PROJECT_INFO_TEMP set veto = '' where FLOWUNID = '"+flowunid+"'";
+// }
+// SqlObject sqlObject = new SqlObject(ssql);
+// sqlca.executeSQL(sqlObject);
+// tx.commit();
}catch(Exception e){
e.printStackTrace();
return "ERROR";