From 3e6f255e312a6194ceaab9b3dff284d5e28a31da Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Thu, 23 Aug 2018 18:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=E9=80=80?=
 =?UTF-8?q?=E5=9B=9E=E5=8A=A0=E9=A3=8E=E9=99=A9=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseFunction/BaseFlowFunction.jspf        | 32 ++++++++++++++-----
 .../BaseFunction/BaseFlowListFunction.jspf    |  2 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
index 13b148498..2b997e5bf 100644
--- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
+++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
@@ -125,7 +125,7 @@ FlowFunction.successCallBackReload=function(){
 	reloadSelf();
 }
 /*~[Describe=退回申请;InputParam=无;OutPutParam=无;]~*/
-FlowFunction.backStep=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,sTaskNo,isLoadSignPage){ 
+FlowFunction.backStep=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,sTaskNo,sFlowName,isLoadSignPage,assignSubmitType){
 	 if(sPhaseNo=="0010"){alert("第一步能不能再退回");return false;}
 	 //检查是否初始化页面的节点
     var result=AsControl.RunJavaMethodTrans("com.tenwa.flow.treeview.action.CheckAndSaveTreeView","run","TaskNo="+sTaskNo);
@@ -139,13 +139,29 @@ FlowFunction.backStep=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,sTaskNo,is
 		    	  }
 		        return;
 	}}
-	AsDialog.PopView("/Common/WorkFlow/FlowBackSubmitDialog.jsp","TaskNo="+sTaskNo+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo,
-			"dialogWidth=850px;dialogHeight=550px;",function(sReturn){
-				if(sReturn.length>0){
-				if(sReturn!="_CANCEL_"){
-				   FlowFunction.successCallBackReload();
-				}}
-			},"退回步骤");
+	if(sFlowName=="业务申请流程"){
+		autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=false",sPhaseNo,function(riskMessage){
+	 		if(riskMessage != true){
+	 			return;
+	 		}
+	 		
+       		AsDialog.PopView("/Common/WorkFlow/FlowBackSubmitDialog.jsp","TaskNo="+sTaskNo+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo,
+    			"dialogWidth=850px;dialogHeight=550px;",function(sReturn){
+    				if(sReturn.length>0){
+    				if(sReturn!="_CANCEL_"){
+    				   FlowFunction.successCallBackReload();
+    				}}
+    		},"退回步骤");
+	 	},sFlowName+":预警检查");
+	}else{
+		 AsDialog.PopView("/Common/WorkFlow/FlowBackSubmitDialog.jsp","TaskNo="+sTaskNo+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo,
+					"dialogWidth=850px;dialogHeight=550px;",function(sReturn){
+						if(sReturn.length>0){
+						if(sReturn!="_CANCEL_"){
+						   FlowFunction.successCallBackReload();
+						}}
+		},"退回步骤");
+	}
 };
 
 /*~[Describe=申请详情;InputParam=无;OutPutParam=无;]~*/
diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf
index a30f92442..84b319ff0 100644
--- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf
+++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf
@@ -129,7 +129,7 @@ function backStep(){
 	if(curUser==agentUser){
 		alert("指派的任务不能退回");return false;
 	}
-	FlowFunction.backStep(param["ObjectType"],param["ObjectNo"],param["FlowNo"],param["PhaseNo"],param["TaskNo"],false);
+	FlowFunction.backStep(param["ObjectType"],param["ObjectNo"],param["FlowNo"],param["PhaseNo"],param["TaskNo"],param["FlowName"],false,assignSubmitType);
 }
 function viewHisTab(){
 	 var param=FlowFunction.loadFlowParam();