diff --git a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp index 56aa2fb77..1edf7547b 100644 --- a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp +++ b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp @@ -22,15 +22,29 @@ //获取信审意见 只要有一个意见为拒绝的,就不允许直接结束 String choice=""; - if ("BusinessApplyFlow".equals(flowNo)&&("0040".equals(phaseNo)||"0050".equals(phaseNo))){ + if ("BusinessApplyFlow".equals(flowNo)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo))){ choice = Sqlca.getString("select CONCAT(IFNULL(v.FIRSTCHOICE,','),',',IFNULL(v.SECONDCHOICE,','),',',IFNULL(v.THIRDCHOICE,',')) choice" + " from VI_PROJECTINFO_BUSINESS v, flow_task t where t.serialno='"+taskNo+"' and v.FLOWUNID=t.objectno"); - if (choice.contains("0010")){ - choice="审批意见为拒绝,流程不允许直接结束!"; - }else{ - choice=""; +// if (choice.contains("0010")){ +// choice="审批意见为拒绝,流程不允许直接结束!"; +// }else{ +// choice=""; +// } + String[] arr=choice.split(","); + HashSet sets=new HashSet(); + for (int i = 0; i 1){//有拒绝 有同意 意见不一致 + choice="2";//"意见不一致流程不能结束,须退回!"; + } + System.out.println(flowNo+","+taskNo+","+choice+","+arr+","+sets); } + + //会签历史纪录阶段号问题 tx.commit(); @@ -278,12 +292,17 @@ var phaseNo= "<%=phaseNo%>";//phaseOpinion 8000是否决 1000是结束 var choice= "<%=choice%>"; //alert(flowNo+','+phaseNo+','+phaseOpinion); - if ("BusinessApplyFlow"==flowNo&&("0040"==phaseNo||"0050"==phaseNo)){ - if(choice!=""&&phaseOpinion=="1000"){ - alert(choice); + if ("BusinessApplyFlow"==flowNo&&("0040"==phaseNo||"0050"==phaseNo||"0060"==phaseNo)){ + if(choice=="1"&&phaseOpinion=="1000"){ + alert("审批意见为拒绝,流程不允许直接结束!"); + return; + } + if(choice=="2"){ + alert("审批意见不一致流程不能结束,须退回!"); return; } } + //return; var confirmStr="确认提交到下一步?"; if (!confirm(confirmStr)) return; diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp index 5a931a4d9..28cbc5cc2 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp @@ -121,6 +121,17 @@ alert("请至少选择一条记录!"); return ; } + var rows = getCheckedRows(0); + var contractIds = ""; + for(var i in rows){ + contractIds += "@"+getItemValue(0,rows[i],"CONTRACT_ID"); + } + var message = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","checkDeposit","flowunid=<%=flowunid%>"+",contractIds="+contractIds); + if(message!="true"){ + if(!confirm(message+',是否继续放款?')){ + return + } + } if(confirm("确认要发起付款申请吗?")){ ids=plist.replace(/\,/g,"@"); var sParams = "CurUserID=<%=CurUser.getUserID()%>,contract_ids="+ids+",FLOWUNID=<%=flowunid%>"; diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index 496eb104b..bfb537804 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -662,6 +662,8 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{ if(results.size()==0){ meaage="true"; }else { + int alertCount=0; + String alertName=""; for (int i = 0; i < results.size(); i++) { String pData = results.get(i).get("product_data"); if("".equals(pData)){ @@ -675,7 +677,8 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{ for (int j = 0; j 0){ + meaage="["+alertName+"]等"+alertCount+"个客户保证金没有核销"; + } } //meaage="true22"; } catch (Exception e) {