修改合同

src/main/contract/com/yw/contract/common/util/ContractConstant.java

@@ -104,5 +104,5 @@ public class ContractConstant {
 		/**
 		 * 合同添加审批流程
 		 */
-		public static final String CONTRACT_ADD= "CONTRACT_ADD";//合同添加审批流程
+		public static final String CONTRACT_ADD= "CONTRACT_ADD";//合同审批流程
 }

src/main/contract/com/yw/contract/contract/action/ContractEntryAction.java

@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -144,6 +145,8 @@ public class ContractEntryAction extends ContractFlowAction {
 		info.setSecondparty_name(request.getParameter("secondparty_name"));
 
 		//ContractInfo oldInfo = new ContractInfo();
+		String flowOnOff = request.getParameter("flowOnOff");
+		request.setAttribute("flowOnOff", flowOnOff); 
 		try {
 			int isExist = contractEntryService.isExistEditContractNumber(info, oasession);
 			if (isExist > 0) {
@@ -151,33 +154,39 @@ public class ContractEntryAction extends ContractFlowAction {
 				return "contractEntry.do?task=toEditContractEntry&id=" + info.getUniversalid();
 			}
 			//oldInfo = contractEntryService.toEditContractEntry(info.getUniversalid(), oasession); 
-			String insName = "合同审批["+info.getUniversalid()+"]";
+			Map<String, Object> flow_params = null;
+			if(!Objects.equals(flowOnOff,"off")){
+				String insName = "合同审批["+info.getContract_name()+"]";
+				
+				String flow_json = request.getParameter("flow_json");
+				flow_params = new HashMap<String, Object>();
+				if (!StringUtil.isEmpty(flow_json)) {
+					JSONArray jsonArray = JSONArray.fromObject(URLDecoder.decode(flow_json, "utf-8"));
+					List<Map<String, Object>> flow_list = JSONArray.toList(jsonArray, Map.class);
+					flow_params = flow_list.get(0);
+				}
+				flow_params.put("flag", ContractConstant.CONTRACT_ADD);
+				flow_params.put("business_id", info.getUniversalid());
+				flow_params.put("is_config", true);
+				flow_params.put("oasession", oasession);
+				flow_params.put("insName", insName);	
+			}
 			
-			String flow_json = request.getParameter("flow_json");
-			Map<String, Object> flow_params = new HashMap<String, Object>();
-			if (!StringUtil.isEmpty(flow_json)) {
-				JSONArray jsonArray = JSONArray.fromObject(URLDecoder.decode(flow_json, "utf-8"));
-				List<Map<String, Object>> flow_list = JSONArray.toList(jsonArray, Map.class);
-				flow_params = flow_list.get(0);
-			}
-			flow_params.put("flag", ContractConstant.CONTRACT_ADD);
-			flow_params.put("business_id", info.getUniversalid());
-			flow_params.put("is_config", true);
-			flow_params.put("oasession", oasession);
-			flow_params.put("insName", insName);	
 			int rs = contractEntryService.editContractEntry(info);
 			if (rs > 0) {
 				int rz = contractEntryService.changeDraftToContract(info,flow_params);
 				if (rz > 0) {
-					//this.addInfo("修改成功");
-					request.setAttribute("theme", flowTitle); //流程主题
-					request.setAttribute("flow_contract_id", info.getUniversalid()); //申请合同流程ID
-					request.setAttribute("flow_type", ContractConstant.CONTRACT_ADD_MODELTYPE); //合同流程关联模板配置ID 
-					//流程运转结束
-					request.setAttribute("finish", "finish"); 
-					//启动流程开始   
-					//传入合同申请单流程模板ID号
-					this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE);
+					this.addInfo("修改成功");
+					if(!Objects.equals(flowOnOff,"off")){
+						request.setAttribute("theme", flowTitle); //流程主题
+						request.setAttribute("flow_contract_id", info.getUniversalid()); //申请合同流程ID
+						request.setAttribute("flow_type", ContractConstant.CONTRACT_ADD_MODELTYPE); //合同流程关联模板配置ID 
+						//流程运转结束
+						request.setAttribute("finish", "finish"); 
+						//启动流程开始   
+						//传入合同申请单流程模板ID号
+						this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE);
+					}
 				}
 			} else {
 				this.addError("修改失败");
@@ -225,7 +234,7 @@ public class ContractEntryAction extends ContractFlowAction {
 			
 			CodeFlowServiceIface ifaceCodeFlowService=this.getBean(IfaceCodeFlowService.class, "ifaceCodeFlowService");
 			Map<String, Object> resultMap=ifaceCodeFlowService.toStartFlow(ContractConstant.CONTRACT_ADD,oasession.getUnit().getId());
-			//流程模版 未关联   不能发起申请
+			/*//流程模版 未关联   不能发起申请
 			if (resultMap.get("result") != null) {
 				Map<String, Object> result = (Map<String, Object>) resultMap.get("result");
 				request.setAttribute("tache", result.get("tinstance"));
@@ -236,7 +245,8 @@ public class ContractEntryAction extends ContractFlowAction {
 				request.setAttribute("nextHandTmodels", result.get("nextHandTmodels"));
 				request.setAttribute("tList", result.get("tList"));
 			}
-			request.setAttribute("flowOnOff", resultMap.get("flowOnOff"));
+			request.setAttribute("flowOnOff", resultMap.get("flowOnOff"));*/ 
+			this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE); 
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -718,6 +728,8 @@ public class ContractEntryAction extends ContractFlowAction {
 		info.setFirstparty_name(request.getParameter("firstparty_name"));
 		info.setSecondparty_name(request.getParameter("secondparty_name"));
 		String draftId = request.getParameter("draftId"); 
+		String flowOnOff = request.getParameter("flowOnOff");
+		request.setAttribute("flowOnOff", flowOnOff); 
 		if ("".equals(draftId)) {// 没有草稿等情况
 			int rs;
 			try {
@@ -731,31 +743,36 @@ public class ContractEntryAction extends ContractFlowAction {
 				// } 
 				Long ID = StringUtil.getSeq();
 				info.setUniversalid(ID);
-				String insName = "合同审批["+ID+"]";
-				
-				String flow_json = request.getParameter("flow_json");
-				Map<String, Object> flow_params = new HashMap<String, Object>();
-				if (!StringUtil.isEmpty(flow_json)) {
-					JSONArray jsonArray = JSONArray.fromObject(URLDecoder.decode(flow_json, "utf-8"));
-					List<Map<String, Object>> flow_list = JSONArray.toList(jsonArray, Map.class);
-					flow_params = flow_list.get(0);
-				}
-				flow_params.put("flag", ContractConstant.CONTRACT_ADD);
-				flow_params.put("business_id", ID);
-				flow_params.put("is_config", true);
-				flow_params.put("oasession", oasession);
-				flow_params.put("insName", insName);	
+				Map<String, Object> flow_params = null;
+				if(!Objects.equals(flowOnOff,"off")){
+					flow_params = new HashMap<String, Object>();
+					String insName = "合同审批["+info.getContract_name()+"]"; 
+					String flow_json = request.getParameter("flow_json");
+					
+					if (!StringUtil.isEmpty(flow_json)) {
+						JSONArray jsonArray = JSONArray.fromObject(URLDecoder.decode(flow_json, "utf-8"));
+						List<Map<String, Object>> flow_list = JSONArray.toList(jsonArray, Map.class);
+						flow_params = flow_list.get(0);
+					}
+					flow_params.put("flag", ContractConstant.CONTRACT_ADD);
+					flow_params.put("business_id", ID);
+					flow_params.put("is_config", true);
+					flow_params.put("oasession", oasession);
+					flow_params.put("insName", insName);	
+				}  
 				rs = contractEntryService.addContractEntry(info,flow_params);
 				if (rs > 0) {
 					this.addInfo("添加成功！");
-					request.setAttribute("theme", flowTitle); //流程主题
-					request.setAttribute("flow_contract_id", ID); //申请合同流程ID
-					request.setAttribute("flow_type", ContractConstant.CONTRACT_ADD_MODELTYPE); //合同流程关联模板配置ID 
-					//流程运转结束
-					request.setAttribute("finish", "finish"); 
-					//启动流程开始   
-					//传入合同申请单流程模板ID号
-					this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE); 
+					if(!Objects.equals(flowOnOff,"off")){
+						request.setAttribute("theme", flowTitle); //流程主题
+						request.setAttribute("flow_contract_id", ID); //申请合同流程ID
+						request.setAttribute("flow_type", ContractConstant.CONTRACT_ADD_MODELTYPE); //合同流程关联模板配置ID 
+						//流程运转结束
+						request.setAttribute("finish", "finish"); 
+						//启动流程开始   
+						//传入合同申请单流程模板ID号
+						this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE); 
+					} 
 				} else {
 					this.addError("添加失败！");
 					ContractInfo infoRecord = new ContractInfo();
@@ -771,31 +788,37 @@ public class ContractEntryAction extends ContractFlowAction {
 			try {
 				int rs = contractEntryService.editContractEntry(info);
 				if (rs > 0) {  
-					String insName = "合同审批["+info.getUniversalid()+"]";
+					String insName = "合同审批["+info.getContract_name()+"]";
 					
 					String flow_json = request.getParameter("flow_json");
-					Map<String, Object> flow_params = new HashMap<String, Object>();
-					if (!StringUtil.isEmpty(flow_json)) {
-						JSONArray jsonArray = JSONArray.fromObject(URLDecoder.decode(flow_json, "utf-8"));
-						List<Map<String, Object>> flow_list = JSONArray.toList(jsonArray, Map.class);
-						flow_params = flow_list.get(0);
+					Map<String, Object> flow_params = null;
+					if(!Objects.equals(flowOnOff,"off")){
+						flow_params = new HashMap<String, Object>();
+						if (!StringUtil.isEmpty(flow_json)) {
+							JSONArray jsonArray = JSONArray.fromObject(URLDecoder.decode(flow_json, "utf-8"));
+							List<Map<String, Object>> flow_list = JSONArray.toList(jsonArray, Map.class);
+							flow_params = flow_list.get(0);
+						}
+						flow_params.put("flag", ContractConstant.CONTRACT_ADD);
+						flow_params.put("business_id", info.getUniversalid());
+						flow_params.put("is_config", true);
+						flow_params.put("oasession", oasession);
+						flow_params.put("insName", insName);	
 					}
-					flow_params.put("flag", ContractConstant.CONTRACT_ADD);
-					flow_params.put("business_id", info.getUniversalid());
-					flow_params.put("is_config", true);
-					flow_params.put("oasession", oasession);
-					flow_params.put("insName", insName);	
+					
 					int rz = contractEntryService.changeDraftToContract(info,flow_params);
 					if (rz > 0) {
 						this.addInfo("添加成功！");
-						request.setAttribute("theme", flowTitle); //流程主题
-						request.setAttribute("flow_contract_id", info.getUniversalid()); //申请合同流程ID
-						request.setAttribute("flow_type", ContractConstant.CONTRACT_ADD_MODELTYPE); //合同流程关联模板配置ID 
-						//流程运转结束
-						request.setAttribute("finish", "finish"); 
-						//启动流程开始   
-						//传入合同申请单流程模板ID号
-						this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE);
+						if(!Objects.equals(flowOnOff,"off")){
+							request.setAttribute("theme", flowTitle); //流程主题
+							request.setAttribute("flow_contract_id", info.getUniversalid()); //申请合同流程ID
+							request.setAttribute("flow_type", ContractConstant.CONTRACT_ADD_MODELTYPE); //合同流程关联模板配置ID 
+							//流程运转结束
+							request.setAttribute("finish", "finish"); 
+							//启动流程开始   
+							//传入合同申请单流程模板ID号
+							this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE);
+						} 
 					} else {
 						this.addError("添加失败！");
 						ContractInfo infoRecord = new ContractInfo();
@@ -879,7 +902,7 @@ public class ContractEntryAction extends ContractFlowAction {
 			if (infoList.size() > 0) {
 				request.setAttribute("typeList", infoList);
 			}
-			CodeFlowServiceIface ifaceCodeFlowService=this.getBean(IfaceCodeFlowService.class, "ifaceCodeFlowService");
+			/*CodeFlowServiceIface ifaceCodeFlowService=this.getBean(IfaceCodeFlowService.class, "ifaceCodeFlowService");
 			Map<String, Object> resultMap=ifaceCodeFlowService.toStartFlow(ContractConstant.CONTRACT_ADD,oasession.getUnit().getId());
 			//流程模版 未关联   不能发起申请
 			if (resultMap.get("result") != null) {
@@ -892,7 +915,8 @@ public class ContractEntryAction extends ContractFlowAction {
 				request.setAttribute("nextHandTmodels", result.get("nextHandTmodels"));
 				request.setAttribute("tList", result.get("tList"));
 			}
-			request.setAttribute("flowOnOff", resultMap.get("flowOnOff"));
+			request.setAttribute("flowOnOff", resultMap.get("flowOnOff"));*/
+			this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -916,6 +940,7 @@ public class ContractEntryAction extends ContractFlowAction {
 		String contract_search_firstparty = request.getParameter("contract_search_firstparty");
 		String contract_search_duty_dept = request.getParameter("contract_search_duty_dept");
 		String contract_search_signdate_end = request.getParameter("contract_search_signdate_end");
+		String flowOnOff = request.getParameter("flowOnOff");
 
 		List<ContractInfo> infoList = new ArrayList<ContractInfo>();
 		ContractInfo info = new ContractInfo();
@@ -958,7 +983,9 @@ public class ContractEntryAction extends ContractFlowAction {
 			if (contract_search_signdate_end != null && !"".equals(contract_search_signdate_end)) {
 				ph.setParam("contract_search_signdate_end", contract_search_signdate_end);
 			}
-			ph.setParam("au_state", "2");
+			if(!Objects.equals(flowOnOff, "off")){
+				ph.setParam("au_state", "2");
+			}
 			infoList = contractEntryService.contractEntryList(p, pSize, ph, info, oasession);
 			// 去除不用的参数
 			// params.remove(0);
@@ -982,6 +1009,7 @@ public class ContractEntryAction extends ContractFlowAction {
 			if (infoList.size() > 0) {
 				request.setAttribute("typeList", infoList);
 			}
+			this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE); 
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/contract/com/yw/contract/contract/action/ContractMyLaunchAction.java

@@ -6,6 +6,7 @@ import java.io.UnsupportedEncodingException;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -15,15 +16,19 @@ import org.springframework.context.ApplicationContext;
 
 import com.yw.core.framework.http.PermitDataAction;
 import com.yw.core.session.AppSession;
+import com.yw.core.utils.CommonUtil;
 import com.yw.core.utils.Constant;
 import com.yw.core.utils.DateUtil;
 import com.yw.core.utils.StringUtil;
+import com.yw.iface.bpm.iface.InstanceIface;
 import com.yw.contract.common.util.ContractConstant;
 import com.yw.contract.contract.model.ContractInfo;
 import com.yw.contract.contract.model.ContractMilestone;
 import com.yw.contract.contract.service.ContractConfigurationService;
 import com.yw.contract.contract.service.ContractEntryService;
 import com.yw.contract.contract.service.ContractMyLaunchService;
+import com.yw.contract.flow.model.ErpFlowConf;
+import com.yw.contract.flow.service.ContractFlowService;
 import com.yw.contract.system.model.ContractDataDictionary;
 import com.yw.contract.system.service.ContractDataDictionaryService;
 
@@ -493,6 +498,7 @@ public class ContractMyLaunchAction extends PermitDataAction{
 			if(infoList.size()>0){
 				request.setAttribute("typeList", infoList);
 			}
+			this.toStartFlow(request, response,ContractConstant.CONTRACT_ADD_MODELTYPE); 
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -529,4 +535,31 @@ public class ContractMyLaunchAction extends PermitDataAction{
 		}
 		return "/yw/contract/viewContractInfo.jsp";
 	}
+	
+	public void toStartFlow(HttpServletRequest request,
+			HttpServletResponse response, String modelType) throws Exception {
+		ContractFlowService erpFlowService = this.getBean(ContractFlowService.class, "contractFlowService");
+		InstanceIface ii = (InstanceIface) CommonUtil.getImplBean(InstanceIface.class);
+		ErpFlowConf erpFlowConf = null;
+		String modelId = null;
+		if (StringUtils.isNotEmpty(modelType)) {
+			// 根据模板关系配置类型获取模板id
+			erpFlowConf = new ErpFlowConf();
+			erpFlowConf.setConf_id(StringUtil.strToLong(modelType));// 1表示请购,2表示入库,3表示出库,4表示调拨,5表示物流指令
+			erpFlowConf.setUnit_id(oasession.getUnit().getId());
+			List<ErpFlowConf> listFlowConf = erpFlowService.getErpFlowConf("0","1", erpFlowConf);
+			ErpFlowConf flowConf = listFlowConf.get(0);
+			modelId = String.valueOf(flowConf.getConf_model_id());
+		}
+		if (!"0".equals(modelId) && !StringUtil.isEmpty(modelId)) {
+			Map<String, Object> result = ii.toStart(modelId);
+			request.setAttribute("fmodel", result.get("fmodel"));
+			request.setAttribute("tmodel", result.get("tmodel"));
+			request.setAttribute("nextTmodels", result.get("nextTmodels"));
+			request.setAttribute("nextHandTmodels",result.get("nextHandTmodels"));
+		}else{
+			request.setAttribute("flowOnOff", "off");			
+		}
+		
+	}
 }

src/main/contract/com/yw/contract/flow/action/ContractFlowAction.java

@@ -289,7 +289,7 @@ public class ContractFlowAction extends ContractFlowOpeateAction {
 			ErpFlowConf flowConf = listFlowConf.get(0);
 			modelId = String.valueOf(flowConf.getConf_model_id());
 		}
-		if (!"0".equals(modelId)) {
+		if (!"0".equals(modelId) && !StringUtil.isEmpty(modelId)) {
 			Map<String, Object> result = ii.toStart(modelId);
 			request.setAttribute("fmodel", result.get("fmodel"));
 			request.setAttribute("tmodel", result.get("tmodel"));

src/main/webapp/yw/contract/addContractEntry.jsp

@@ -38,14 +38,14 @@ $(document).ready(function(){
 	var initDialog;
 	var isFinish = "${requestScope.finish }";
 	var isStart = "${requestScope.flowOnOff }";
-	$(function() {
+	/* $(function() {
 		if(isStart == "off"){
 			initDialog = $.ligerDialog({content:"对不起，合同审批流程未配置，请通知流程管理员配置后，再添加！", title:"系统提示",type:"warn",width:300,height:70,allowClose : false,
 	        	buttons:[ { text:"确定",onclick:function(){closeWindow();}}
 	        	]
 	        });
 		}		
-	});
+	}); */
 	$(function() {
 		if(isFinish == "finish"){
 			initDialog = $.ligerDialog({content:"合同审批提交成功！ ", title:"系统提示",type:"success",width:300,height:70,allowClose : false,
@@ -128,7 +128,11 @@ function addContractEntry(){
  	 			});
  	 			$("#relation_ids").val(relation_ids);
  	 			/* $("#addContractEntryForm").submit(); */
- 	 			formJs(submitRquestForms);
+ 	 			 if('${flowOnOff}' == "off"){
+ 	 				$("#addContractEntryForm").submit();
+ 	 			 }else{
+ 	 				formJs(submitRquestForms); 
+ 	 			 } 
  			} 			
 		}
 	});
@@ -769,6 +773,7 @@ body {
 			<!-- 流程ID -->
 			 <input type="hidden" id="flowTitle" name="flowTitle" value="">
 			 <input type="hidden" id="checkValue" name="checkValue" value=""/>
+			 <input type="hidden" name="flowOnOff" id="flowOnOff" value="${flowOnOff}" />
 			<%@include file="/yw/eu/codeflow/workflow/workflow_start_process.jsp"%>
 		</form>
 	</div>

src/main/webapp/yw/contract/contractEntryList.jsp

@@ -81,18 +81,20 @@
 											var html = '<a href=\"#\" onclick=\"viewContractEntry('
 												+ row.universalid
 												+ ')\">查看</a>&nbsp;';
-											/* html += '<a href=\"#\" onclick=\"editContractEntry('
+											if('${flowOnOff}' == "off"){
+												html += '<a href=\"#\" onclick=\"editContractEntry('
 													+ row.universalid
 													+ ')\">编辑</a>&nbsp;';
-											html += '<a href=\"#\" onclick=\"delContractEntry('
+												html += '<a href=\"#\" onclick=\"delContractEntry('
 													+ row.universalid
-													+ ')\">删除</a>&nbsp;';				 */				
+													+ ')\">删除</a>&nbsp;';				
+											}	
 											return html;
 										}
 									} ],
 							pageSize : 20,
 							url : 'contractEntry.do?task=contractEntryList'+params
-									+ '&time='
+									+ '&flowOnOff=${flowOnOff}&time='
 									+ new Date().getTime(),
 							pageParmName : 'p', //页索引参数名，(提交给服务器)
 							pagesizeParmName : 'pSize', //页记录数参数名，(提交给服务器)
@@ -370,5 +372,6 @@ input[type='button']{
 				<div id="contractEntryGrid" style="margin: 0; padding: 0"></div>
 		</div>
 	</div>
+	<input type="hidden" name="flowOnOff" id="flowOnOff" value="${flowOnOff}" />
 </BODY>
 </HTML>

src/main/webapp/yw/contract/contractMyLaunchList.jsp

@@ -83,18 +83,20 @@
 									{display : '审核状态',name : 'au_state',width : 80,
 										render:function(row){
 											var html="";
-											var s=row.au_state;																		
-											if(s==1){	
-												html = '审核中';										
-											}else if(s==2){							
-												var html = '审核成功';									
-											}else if(s==3){							
-												var html = '驳回';										
-											}else if(s==4){							
-												var html = '撤销';										
-											}else if(s=='0'){
-												html ='待审核';
-											}
+											if('${flowOnOff}' != "off"){
+												var s=row.au_state;																		
+												if(s==1){	
+													html = '审核中';										
+												}else if(s==2){							
+													var html = '审核成功';									
+												}else if(s==3){							
+													var html = '驳回';										
+												}else if(s==4){							
+													var html = '撤销';										
+												}else if(s=='0'){
+													html ='待审核';
+												}
+											} 
 											return html;
 									}},
 									
@@ -104,18 +106,27 @@
 										width : 220,
 										render : function(row) {
 											var html = ''; 
-											if(row.au_state == 2){
+											if('${flowOnOff}' == "off"){
 												html += '<a href=\"#\" onclick=\"viewContractMyLaunch('
 													+ row.universalid
 													+ ')\">查看合同信息</a>&nbsp;'; 
 												html += '<a href=\"#\" onclick=\"viewContractStatus('
 													+ row.universalid
-													+ ')\">查看合同执行情况</a>&nbsp;';			
+													+ ')\">查看合同执行情况</a>&nbsp;';		
 											}else{
-												html += '<a href=\"#\" onclick=\"viewContractMyEntry('
-													+ row.universalid
-													+ ')\">查看合同信息</a>&nbsp;'; 
-											}	
+												if(row.au_state == 2){
+													html += '<a href=\"#\" onclick=\"viewContractMyLaunch('
+														+ row.universalid
+														+ ')\">查看合同信息</a>&nbsp;'; 
+													html += '<a href=\"#\" onclick=\"viewContractStatus('
+														+ row.universalid
+														+ ')\">查看合同执行情况</a>&nbsp;';			
+												}else{
+													html += '<a href=\"#\" onclick=\"viewContractMyEntry('
+														+ row.universalid
+														+ ')\">查看合同信息</a>&nbsp;'; 
+												}	
+											} 
 											return html;
 										}
 									} ],
@@ -174,18 +185,20 @@
 									{display : '审核状态',name : 'au_state',width : 80,
 										render:function(row){
 											var html="";
-											var s=row.au_state;																		
-											if(s==1){	
-												html = '审核中';										
-											}else if(s==2){							
-												var html = '审核成功';									
-											}else if(s==3){							
-												var html = '驳回';										
-											}else if(s==4){							
-												var html = '撤销';										
-											}else if(s=='0'){
-												html ='待审核';
-											}
+											if('${flowOnOff}' != "off"){
+												var s=row.au_state;																		
+												if(s==1){	
+													html = '审核中';										
+												}else if(s==2){							
+													var html = '审核成功';									
+												}else if(s==3){							
+													var html = '驳回';										
+												}else if(s==4){							
+													var html = '撤销';										
+												}else if(s=='0'){
+													html ='待审核';
+												}
+											} 
 											return html;
 									}},
 									{
@@ -194,7 +207,7 @@
 										width : 220,
 										render : function(row) {
 											var html = '';
-											if(row.au_state == 2){
+											if('${flowOnOff}' == "off"){
 												html += '<a href=\"#\" onclick=\"viewContractMyLaunch('
 													+ row.universalid
 													+ ')\">查看合同信息</a>&nbsp;';  
@@ -202,10 +215,19 @@
 													+ row.universalid
 													+ ')\">查看合同执行情况</a>&nbsp;';	
 											}else{
-												html += '<a href=\"#\" onclick=\"viewContractMyEntry('
-													+ row.universalid
-													+ ')\">查看合同信息</a>&nbsp;'; 
-											}		
+												if(row.au_state == 2){
+													html += '<a href=\"#\" onclick=\"viewContractMyLaunch('
+														+ row.universalid
+														+ ')\">查看合同信息</a>&nbsp;';  
+													html += '<a href=\"#\" onclick=\"viewContractStatus('
+														+ row.universalid
+														+ ')\">查看合同执行情况</a>&nbsp;';	
+												}else{
+													html += '<a href=\"#\" onclick=\"viewContractMyEntry('
+														+ row.universalid
+														+ ')\">查看合同信息</a>&nbsp;'; 
+												}		
+											} 
 											return html;
 										}
 									} ],
@@ -264,17 +286,19 @@
 									{display : '审核状态',name : 'au_state',width : 80,
 										render:function(row){
 											var html="";
-											var s=row.au_state;																		
-											if(s==1){	
-												html = '<a href=\"#\" onclick=\"viewflow('+ row.flow_id + ')\"><font color=blue>审核中</font></a>&nbsp;';										
-											}else if(s==2){							
-												html = '<a href=\"#\" onclick=\"viewflow('+ row.flow_id + ')\"><font color=blue>审核成功</font></a>&nbsp;';									
-											}else if(s==3){							
-												html = '<a href=\"#\" onclick=\"viewflow('+ row.flow_id + ')\"><font color=blue>驳回</font></a>&nbsp;';										
-											}else if(s==4){							
-												html = '撤销';										
-											}else if(s=='0'){
-												html ='待审核';
+											if('${flowOnOff}' != "off"){
+												var s=row.au_state;																		
+												if(s==1){	
+													html = '<a href=\"#\" onclick=\"viewflow('+ row.flow_id + ')\"><font color=blue>审核中</font></a>&nbsp;';										
+												}else if(s==2){							
+													html = '<a href=\"#\" onclick=\"viewflow('+ row.flow_id + ')\"><font color=blue>审核成功</font></a>&nbsp;';									
+												}else if(s==3){							
+													html = '<a href=\"#\" onclick=\"viewflow('+ row.flow_id + ')\"><font color=blue>驳回</font></a>&nbsp;';										
+												}else if(s==4){							
+													html = '撤销';										
+												}else if(s=='0'){
+													html ='待审核';
+												}
 											}
 											return html;
 									}},
@@ -285,21 +309,25 @@
 										render : function(row) {
 											var html = '<a href=\"#\" onclick=\"viewContractMyEntry('
 												+ row.universalid
-												+ ')\">查看合同信息</a>&nbsp;'; 
-											/* html += '<a href=\"#\" onclick=\"editContractEntry('
+												+ ')\">查看合同信息</a>&nbsp;';
+											if('${flowOnOff}' == "off"){
+												html += '<a href=\"#\" onclick=\"editContractEntry('
 													+ row.universalid
 													+ ')\">编辑</a>&nbsp;';
-											html += '<a href=\"#\" onclick=\"delContractEntry('
-													+ row.universalid
-													+ ')\">删除</a>&nbsp;';		 */		
-											if((row.au_state == 1 || row.au_state == 3) && row.flow_id){
-												html += '<a href=\"#\" onclick=\"cancel_flow('+ row.flow_id + ')\"><font color=blue>撤消</font></a>&nbsp;';
-											}
-											if(row.au_state == 4){ 
 												html += '<a href=\"#\" onclick=\"delContractEntry('
 													+ row.universalid
-													+ ')\">删除</a>&nbsp;';
+													+ ')\">删除</a>&nbsp;';	
+											}else{
+												if((row.au_state == 1 || row.au_state == 3) && row.flow_id){
+													html += '<a href=\"#\" onclick=\"cancel_flow('+ row.flow_id + ')\"><font color=blue>撤消</font></a>&nbsp;';
+												}
+												if(row.au_state == 4){ 
+													html += '<a href=\"#\" onclick=\"delContractEntry('
+														+ row.universalid
+														+ ')\">删除</a>&nbsp;';
+												}
 											}
+											
 											return html;
 										}
 									} ],
@@ -496,6 +524,7 @@ input[type='button']{
 		<!-- <div style="overflow: hidden; clear: both;">
 				<div id="contractMyLaunchGrid" style="margin: 0; padding: 0"></div>
 		</div> -->
+		<input type="hidden" name="flowOnOff" id="flowOnOff" value="${flowOnOff}" />
 	</div>
 </BODY>
 </HTML>

src/main/webapp/yw/contract/editContractDraft.jsp

@@ -48,14 +48,14 @@ $(document).ready(function(){
 	var initDialog;
 	var isFinish = "${requestScope.finish }";
 	var isStart = "${requestScope.flowOnOff }";
-	$(function() {
+	/* $(function() {
 		if(isStart == "off"){
 			initDialog = $.ligerDialog({content:"对不起，合同审批流程未配置，请通知流程管理员配置后，再添加！", title:"系统提示",type:"warn",width:300,height:70,allowClose : false,
 	        	buttons:[ { text:"确定",onclick:function(){closeWindow();}}
 	        	]
 	        });
 		}		
-	});
+	}); */
 	$(function() {
 		if(isFinish == "finish"){
 			initDialog = $.ligerDialog({content:"合同审批提交成功！ ", title:"系统提示",type:"success",width:300,height:70,allowClose : false,
@@ -123,8 +123,12 @@ function editContractEntry(){
  				});
  				$("#relation_ids").val(relation_ids);
 
- 				//$("#editContractEntryForm").submit();
- 				formJs(submitRquestForms);
+ 				//$("#editContractEntryForm").submit(); 
+ 				 if('${flowOnOff}' == "off"){
+  	 				$("#editContractEntryForm").submit();
+  	 			 }else{
+  	 				formJs(submitRquestForms); 
+  	 			 } 
  			}	 			
 		}
 	});
@@ -688,6 +692,7 @@ body {
 			<!-- 流程ID -->
 			 <input type="hidden" id="flowTitle" name="flowTitle" value="">
 			 <input type="hidden" id="checkValue" name="checkValue" value=""/>
+			 <input type="hidden" name="flowOnOff" id="flowOnOff" value="${flowOnOff}" />
 			<%@include file="/yw/eu/codeflow/workflow/workflow_start_process.jsp"%>
 		</form>
 	</div>

src/main/webapp/yw/master1_contract/addContractEntry.jsp

@@ -52,14 +52,14 @@ $(document).ready(function(){
 	var initDialog;
 	var isFinish = "${requestScope.finish }";
 	var isStart = "${requestScope.flowOnOff }"; 
-	$(function() {
+	/* $(function() {
 		if(isStart == "off"){
 			initDialog = $.ligerDialog({content:"对不起，合同审批流程未配置，请通知流程管理员配置后，再添加！", title:"系统提示",type:"warn",width:300,height:70,allowClose : false,
 	        	buttons:[ { text:"确定",onclick:function(){initDialog.close();}}
 	        	]
 	        });
 		}		
-	});
+	}); */
 	$(function() {
 		if(isFinish == "finish"){
 			initDialog = $.ligerDialog({content:"合同审批提交成功！", title:"系统提示",type:"question",width:300,height:70,allowClose : false,
@@ -143,7 +143,11 @@ function addContractEntry(){
  	 			$("#relation_ids").val(relation_ids); 
  	 			
  	 			//$("#addContractEntryForm").submit();
- 	 			formJs(submitRquestForms);
+ 	 			if('${flowOnOff}' == "off"){
+	 				$("#addContractEntryForm").submit();
+	 			 }else{
+	 				formJs(submitRquestForms); 
+	 			 }  
  			} 			
 		}
 	}); 
@@ -612,6 +616,7 @@ body {
 		<!-- 流程ID -->
 		 <input type="hidden" id="flowTitle" name="flowTitle" value="">
 		 <input type="hidden" id="checkValue" name="checkValue" value=""/>
+		 <input type="hidden" name="flowOnOff" id="flowOnOff" value="${flowOnOff}" />
 		<%@include file="/yw/eu/codeflow/workflow/workflow_start_process.jsp"%>
 	</form>
 	<%@ include file="/include/message.jsp"%>

src/main/webapp/yw/master1_contract/contractEntryList.jsp

@@ -33,7 +33,7 @@
 
 		sendAsyncAjax(
 				param,
-				"MTContractEntryAction.do?task=contractEntryList" + s,
+				"MTContractEntryAction.do?task=contractEntryList&flowOnOff=${flowOnOff}" + s,
 				"json",
 				function(data) {
 
@@ -80,12 +80,14 @@
 							html += '</div>';
 							html += '</a>';
 							html += '<div class="tr_rw_btn_new fr">';
-							/* html += '<div class="div_btn"><input type="button" onclick=\'delContractEntry('
+							if('${flowOnOff}' == "off"){
+								html += '<div class="div_btn"><input type="button" onclick=\'delContractEntry('
 								    + arr.universalid
 								    + ')\' class="btn_c" value="删&nbsp;除" /></div>';
-							html += '<div class="div_btn"><input type="button" class="btn_c" onclick=\'item("MTContractEntryAction.do?task=toEditContractEntry&id='
+								html += '<div class="div_btn"><input type="button" class="btn_c" onclick=\'item("MTContractEntryAction.do?task=toEditContractEntry&id='
 									+ arr.universalid
-									+ '");\' value="编&nbsp;辑" /></div>'; */
+									+ '");\' value="编&nbsp;辑" /></div>';
+							}
 							html += '<div class="div_btn"><input type="button" class="btn_c" onclick=\'item("${pageContext.request.contextPath }/MTContractEntryAction.do?task=viewContractEntry&id='
 								+ arr.universalid + '");\' value="查&nbsp;看" /></div>'; 
 							html += '</div>';
@@ -170,6 +172,7 @@
 					<input type="hidden" name="contract_search_duty_man" id="contract_search_duty_man" value="" readonly="readonly"/>
 					<input type="hidden" name="contract_search_signdate" id="contract_search_signdate" value=""/>
 					<input type="hidden" name="contract_search_signdate_end" id="contract_search_signdate_end" value=""/>
+					<input type="hidden" name="flowOnOff" id="flowOnOff" value="${flowOnOff}" />
  				</div>
 				<div class="tr_right_bg">
 					<div id="contentDiv"></div>

src/main/webapp/yw/master1_contract/contractMyLaunchList.jsp

@@ -64,15 +64,17 @@ function searchByKword(s) {
 						
 						var au_state = arr.au_state; 
 						var au_state_str = ""; 
-						if(au_state=="4"){
-							au_state_str = "撤销";
-					 	}else if(au_state=="1"){
-					 		au_state_str = "审核中"; 
-					 	}else if(au_state=="2"){
-					 		au_state_str = "审核成功"; 
-					 	}else if(au_state=="3"){
-					 		au_state_str = "驳回"; 
-					 	} 
+						if('${flowOnOff}' != "off"){
+							if(au_state=="4"){
+								au_state_str = "撤销";
+						 	}else if(au_state=="1"){
+						 		au_state_str = "审核中"; 
+						 	}else if(au_state=="2"){
+						 		au_state_str = "审核成功"; 
+						 	}else if(au_state=="3"){
+						 		au_state_str = "驳回"; 
+						 	} 
+						} 
 						html += '<div class="tr_cont_new mar4 f5_new'+bdiv+'">';
 						html += '<a href="#" onclick=\'item("${pageContext.request.contextPath }/MTContractEntryAction.do?task=viewContractEntry&id='
 								+ arr.universalid + '");\'>';
@@ -90,47 +92,66 @@ function searchByKword(s) {
 						html += '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />'
 								+ arr.contract_name
 								+ '(' + arr.contract_number
-								+ ') 【'+au_state_str+'】</p>';
+								+ ')';
+						if('${flowOnOff}' != "off"){
+							html += '【'+au_state_str+'】'
+						}
+						html += '</p>';
 						html += '<p class="mar5">' + ss + '</p>';
 						html += '</div>';
 						html += '</a>';
 						html += '<div class="tr_rw_btn_new fr" style="width:300px;">';
 						
 						if(contract_oper == "1"){  
-							/* html += '<div class="div_btn"><input type="button" onclick=\'delContractEntry('
+							if('${flowOnOff}' == "off"){
+								html += '<div class="div_btn"><input type="button" onclick=\'delContractEntry('
 							    + arr.universalid
 							    + ')\' class="btn_c" value="删&nbsp;除" /></div>';
 							html += '<div class="div_btn"><input type="button" class="btn_c" onclick=\'item("MTContractEntryAction.do?task=toEditContractEntry&id='
 								+ arr.universalid
-								+ '");\' value="编&nbsp;辑" /></div>'; */
-							if(arr.au_state == 4){
-								html += '<div class="div_btn"><input type="button" onclick=\'delContractEntry('
-								    + arr.universalid
-								    + ')\' class="btn_c" value="删&nbsp;除" /></div>';
-							}
-							if(arr.flow_id){
-								html += '<div class="div_btn"><input type="button" onclick=\'viewflow('
-							    	+ arr.flow_id
-							    	+ ')\' class="btn_c" value="查看流程" /></div>'; 
-							}
-							if((arr.au_state == 1 || arr.au_state == 3) && arr.flow_id){
-								html += '<div class="div_btn"><input type="button" onclick=\'revocationFlow('
-							    	+ arr.flow_id
-							    	+ ')\' class="btn_c" value="撤销流程" /></div>'; 
-							}
-							if(au_state=="2"){
-								html += '<div class="div_btn"><input type="button" onclick=\'viewContractMyEntry('
-								    + arr.universalid
-								    + ')\' class="btn_c" value="合同信息" /></div>';
-							}
+								+ '");\' value="编&nbsp;辑" /></div>';
+							html += '<div class="div_btn"><input type="button" onclick=\'viewContractMyEntry('
+							    + arr.universalid
+							    + ')\' class="btn_c" value="合同信息" /></div>';
+							}else{
+								if(arr.au_state == 4){
+									html += '<div class="div_btn"><input type="button" onclick=\'delContractEntry('
+									    + arr.universalid
+									    + ')\' class="btn_c" value="删&nbsp;除" /></div>';
+								}
+								if(arr.flow_id){
+									html += '<div class="div_btn"><input type="button" onclick=\'viewflow('
+								    	+ arr.flow_id
+								    	+ ')\' class="btn_c" value="查看流程" /></div>'; 
+								}
+								if((arr.au_state == 1 || arr.au_state == 3) && arr.flow_id){
+									html += '<div class="div_btn"><input type="button" onclick=\'revocationFlow('
+								    	+ arr.flow_id
+								    	+ ')\' class="btn_c" value="撤销流程" /></div>'; 
+								}
+								if(au_state=="2"){
+									html += '<div class="div_btn"><input type="button" onclick=\'viewContractMyEntry('
+									    + arr.universalid
+									    + ')\' class="btn_c" value="合同信息" /></div>';
+								}
+							}  
 						}else if(contract_oper == "2" || contract_oper == "3"){ 
-							if(au_state=="2"){
+							if('${flowOnOff}' == "off"){
 								html += '<div class="div_btn"><input type="button" onclick=\'viewContractMyLaunch('
 								    + arr.universalid
 								    + ')\' class="btn_c" value="合同信息" /></div>';
 								html += '<div class="div_btn"><input type="button" onclick=\'viewContractStatus('
 								    + arr.universalid
 								    + ')\' class="btn_c" value="执行情况" /></div>';
+							}else{
+								if(au_state=="2"){
+									html += '<div class="div_btn"><input type="button" onclick=\'viewContractMyLaunch('
+									    + arr.universalid
+									    + ')\' class="btn_c" value="合同信息" /></div>';
+									html += '<div class="div_btn"><input type="button" onclick=\'viewContractStatus('
+									    + arr.universalid
+									    + ')\' class="btn_c" value="执行情况" /></div>';
+								} 
 							} 
 						}
 
@@ -275,5 +296,6 @@ function viewflow(insId){
 		</div>
 		<%@ include file="/yw/master1_contract/leftContractEntry.jsp"%>
 	</div><%@ include file="/include/message.jsp"%>
+	<input type="hidden" name="flowOnOff" id="flowOnOff" value="${flowOnOff}" />
 </BODY>
 </HTML>

src/main/webapp/yw/master1_contract/editContractDraft.jsp

@@ -77,14 +77,14 @@ $(document).ready(function(){
 	var isStart = "${requestScope.flowOnOff }";
 	console.log(isFinish,'isFinish');
 	console.log(isStart,'isStart');
-	$(function() {
+	/* $(function() {
 		if(isStart == "off"){
 			initDialog = $.ligerDialog({content:"对不起，合同审批流程未配置，请通知流程管理员配置后，再添加！", title:"系统提示",type:"warn",width:300,height:70,allowClose : false,
 	        	buttons:[ { text:"确定",onclick:function(){initDialog.close();}}
 	        	]
 	        });
 		}		
-	});
+	}); */
 	$(function() {
 		if(isFinish == "finish"){
 			initDialog = $.ligerDialog({content:"合同审批提交成功！", title:"系统提示",type:"question",width:300,height:70,allowClose : false,
@@ -162,7 +162,11 @@ function editContractEntry(){
  				$("#relation_ids").val(relation_ids);
 
  				//$("#editContractEntryForm").submit();
- 				formJs(submitRquestForms);
+ 				if('${flowOnOff}' == "off"){
+	 				$("#editContractEntryForm").submit();
+	 			 }else{
+	 				formJs(submitRquestForms); 
+	 			 } 
  			}	 			
 		}
 	});
@@ -648,6 +652,7 @@ function viewRelationContract(contractId){
 	<!-- 流程ID -->
 	 <input type="hidden" id="flowTitle" name="flowTitle" value="">
 	 <input type="hidden" id="checkValue" name="checkValue" value=""/>
+	 <input type="hidden" name="flowOnOff" id="flowOnOff" value="${flowOnOff}" />
 	<%@include file="/yw/eu/codeflow/workflow/workflow_start_process.jsp"%>
 	<%@ include file="/include/message.jsp"%>
 </body>