diff --git a/WebContent/AppMain/Welcome/WorkTips.jsp b/WebContent/AppMain/Welcome/WorkTips.jsp index 35deaedc6..7381529de 100644 --- a/WebContent/AppMain/Welcome/WorkTips.jsp +++ b/WebContent/AppMain/Welcome/WorkTips.jsp @@ -188,7 +188,7 @@ function openFLowReadPage(serialno,objecttype,objectno,readerid,flowNo,PhaseNo){ if(tabid.length>0||tabPid.length>0){ FlowFunction.viewHisTabRead(objecttype,objectno,flowNo,PhaseNo,serialno,readerid); }else{ - var param = "TaskNo="+sTaskNo+"&RightType=ReadOnly&PhaseNo="+PhaseNo+"&ViewID=001"+"&ObjectType="+objecttype+"&ObjectNo="+objectno+"&readerId="+readerid; + var param = "TaskNo="+sTaskNo+"&PhaseNo="+PhaseNo+"&ViewID=001"+"&ObjectType="+objecttype+"&ObjectNo="+objectno+"&ReaderId="+readerid; var objectinfo =$.parseJSON(RunJspAjax("/Tenwa/Core/FlowManager/GetObjectInfo.jsp?TaskNo="+sTaskNo)); var sUrl="/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp"; AsControl.OpenView("/AppMain/MenuTabContainer.jsp", "isAddMain=true&Title=传阅--"+objectinfo.title+"&ToDestroyAllComponent=N&Url="+sUrl+"&Paras="+param, "right"); diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf index b364f3d38..13b148498 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf @@ -96,17 +96,27 @@ FlowFunction.doSubmit=function(sObjectType,sObjectNo,sTaskNo,sFlowName,sFlowNo,s alert("流程提交失败"); } }else{ - AsDialog.PopView("/Common/WorkFlow/FlowSubmitDialog.jsp","TaskNo="+sTaskNo,"dialogWidth=850px;dialogHeight=550px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){ - if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") { - return; - }else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){ - var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; - this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); - alert("提交成功!"); - FlowFunction.successCallBackReload(); - }else{ - alert("提交失败!"); - } + //处理退回直接提交的任务 + var res = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","checkBackType","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>"); + if(res == "success") { + var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; + this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); + alert("提交成功"); + FlowFunction.successCallBackReload(); + return; + } + + AsDialog.PopView("/Common/WorkFlow/FlowSubmitDialog.jsp","TaskNo="+sTaskNo,"dialogWidth=850px;dialogHeight=550px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){ + if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") { + return; + }else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){ + var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程"; + this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent); + alert("提交成功!"); + FlowFunction.successCallBackReload(); + }else{ + alert("提交失败!"); + } },"提交下一步");} },sFlowName+":预警检查"); }; diff --git a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp index 6b5d97acc..e2c8d2ddb 100644 --- a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp +++ b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp @@ -55,10 +55,11 @@ //显示按钮 if(viewTab.getButtonItemList().size()==0) out.write(" "); - if(rightType.equals("ReadOnly")){ + if(rightType.equals("ReadOnly") || !ReaderId.equals("")){ if(ReaderId.equals("")){ out.write(new Button("关闭流程", "关闭流程", "closePage()", "", "btn_icon_close").getHtmlText()); }else{ + rightType = "ReadOnly"; out.write(new Button("关闭流程", "关闭流程", "closePage()", "", "btn_icon_close").getHtmlText()); out.write(new Button("结束传阅", "结束传阅", "closePassed()", "", "btn_icon_add").getHtmlText()); }