政策处理（农村/民事）流程

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1142,15 +1142,24 @@ public class ActTaskService extends BaseService {
 	 */
 	@Transactional(readOnly = false)
 	public void artificialTask(Act act) {
+		/*
+		* pass1 = 设计变更
+		* pass2 = 项目关闭
+		* pass3 = 政策处理（城区道路）
+		* pass4 = 完成施工交底
+		* pass5 = 政策处理（农场/民事）
+		* */
 		boolean pass1 = false;
 		boolean pass2 = false;
 		boolean pass3 = false;
 		boolean pass4 = false;
+		boolean pass5 = false;
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass4", false);
 		vars.put("pass1", false);
 		vars.put("pass2", false);
 		vars.put("pass3", false);
+		vars.put("pass5", false);
 		String flag = act.getFlag();
 		String[] split = flag.split(";");
 		for (String a : split) {
@@ -1158,10 +1167,12 @@ public class ActTaskService extends BaseService {
 				pass1 = true;
 			} else if ("pass2".equals(a)) {
 				pass2 = true;
-			}else if ("pass3".equals(a)) {
+			} else if ("pass3".equals(a)) {
 				pass3 = true;
-			}else if ("pass4".equals(a)) {
+			} else if ("pass4".equals(a)) {
 				pass4 = true;
+			} else if ("pass5".equals(a)) {
+				pass5 = true;
 			}
 		}
 		if (pass4 == true) {
@@ -1185,6 +1196,10 @@ public class ActTaskService extends BaseService {
 				vars.put("pass3", true);
 				vars.put("policy", "");
 			}
+			if (pass5 == true) {
+				vars.put("pass5", true);
+				vars.put("policy", "政策处理");
+			}
 			act.setComment("[存在问题]" + act.getComment());
 			act.preUpdate();
 			// 对不同环节的业务逻辑进行操作
@@ -1414,6 +1429,160 @@ public class ActTaskService extends BaseService {
 		vars.put("systemYes","yes".equals(act.getFlag())?true:false);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
+
+	/**
+	 * 是否可以政策处理（农场/民事）
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void policiesChange(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		vars.put("pass1", false);
+		vars.put("pass2", false);
+		vars.put("pass3", false);
+		vars.put("reject", false);
+		String flag = act.getFlag();
+		if ("pass3".equals(flag)) {
+			vars.put("pass3", true);
+			vars.put("policy", UserUtils.getUser().getLoginName());
+			act.setComment("[通过]"+act.getComment());
+		} else if ("pass1".equals(flag)) {
+			vars.put("pass1", true);
+			vars.put("design", "运行人员");
+			act.setComment("[设计变更]"+act.getComment());
+		} else if ("pass2".equals(flag)) {
+			vars.put("pass2", true);
+			vars.put("itemClose", "配网系统专职");
+			act.setComment("[项目关闭]"+act.getComment());
+		} else if ("reject".equals(flag)) {
+			vars.put("reject", true);
+			vars.put("policy", "项目经理");
+			act.setComment("[驳回]"+act.getComment());
+		}
+		// 设置意见
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 项目经理重新审核是否可以政策处理
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void managerPolicesChange(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+			vars.put("policy", "政策处理");
+			act.setComment("【需要政策处理】" + act.getComment());
+		} else {
+			act.setComment("【无需政策处理】" + act.getComment());
+		}
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		vars.put("pass", "yes".equals(flag)? true : false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+
+	/**
+	 * 上传未签字版政策处理清单
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void notSignUpload(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+			vars.put("policy", UserUtils.getUser().getLoginName());
+			act.setComment("【未签字版清单】" + act.getComment());
+		} else {
+			vars.put("policy", UserUtils.getUser().getLoginName());
+			act.setComment("【驳回】" + act.getComment());
+		}
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		vars.put("pass", "yes".equals(flag)? true : false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 上传签字版政策处理清单
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void signUploadList(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+			vars.put("policy", UserUtils.getUser().getLoginName());
+			act.setComment("【签字版清单】" + act.getComment());
+		} else {
+			vars.put("policy", UserUtils.getUser().getLoginName());
+			act.setComment("【驳回】" + act.getComment());
+		}
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		vars.put("pass", "yes".equals(flag)? true : false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+
+	/**
+	 * 上传签字版合同
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void contractUploadList(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+			vars.put("policy", UserUtils.getUser().getLoginName());
+			act.setComment("【签字版合同】" + act.getComment());
+		} else {
+			vars.put("policy", UserUtils.getUser().getLoginName());
+			act.setComment("【驳回】" + act.getComment());
+		}
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		vars.put("pass", "yes".equals(flag)? true : false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 上传签字版合同
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void loanUploadList(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+			act.setComment("【完成政策处理】" + act.getComment());
+		} else {
+			vars.put("policy", UserUtils.getUser().getLoginName());
+			act.setComment("【驳回】" + act.getComment());
+		}
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		vars.put("pass", "yes".equals(flag)? true : false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+
 	/**
 	 * 保存项目关闭 运行人员审批意见
 	 * @param act

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -434,6 +434,138 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 是否可以政策处理（农场/民事）
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "policiesChange")
+	public AjaxJson policiesChange(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.policiesChange(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 上传借款单据
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "loanUploadList")
+	public AjaxJson loanUploadList(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.loanUploadList(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 项目经理重新审核是否可以政策处理（农场/民事）
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "managerPolicesChange")
+	public AjaxJson managerPolicesChange(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.managerPolicesChange(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 上传未签字版政策处理清单
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "notSignUpload")
+	public AjaxJson notSignUpload(Act act, String pic, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.notSignUpload(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+
+	/**
+	 * 上传签字版政策处理清单
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "signUploadList")
+	public AjaxJson signUploadList(Act act, String pic, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.signUploadList(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 上传签字版合同
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "contractUploadList")
+	public AjaxJson contractUploadList(Act act, String pic, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.contractUploadList(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
 
 	/**
 	 * 运行人员设计变更页面

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/UploadImagesMapper.xml

@@ -94,6 +94,7 @@
 	
 	<update id="update">
 		UPDATE xm_upolad_images SET
+			path = #{path},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -160,7 +160,6 @@ public class ConstructionController extends BaseController {
 //        String pInId = construction.getProcInsId();
 //        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
 //        RepositoryService rs = processEngine.getRepositoryService();
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/artificialJudgment";
     }
@@ -173,7 +172,6 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "operatorDesignChange")
     public String form3(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/operatorDesignChange";
     }
@@ -182,7 +180,6 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "speciallyForm")
     public String speciallyForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/speciallyForm";
     }
@@ -200,17 +197,15 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "memberForm")
     public String memberForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/memberForm";
     }
 
-    /*
-       项目关闭，配网系统专职
+    /**
+     *   项目关闭，配网系统专职
     */
     @RequestMapping(value = "departmentForm")
     public String departmentForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/departmentForm";
     }
@@ -219,7 +214,6 @@ public class ConstructionController extends BaseController {
      * */
     @RequestMapping(value = "economicsDesignChange")
     public String form4(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/economicsDesignChange";
     }
@@ -229,11 +223,29 @@ public class ConstructionController extends BaseController {
      * */
     @RequestMapping(value = "managerDesignChange")
     public String managerDesignChange(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/managerDesignChange";
     }
 
+    /**
+     * 是否可以政策处理（农场/民事）
+     * */
+    @RequestMapping(value = "policiesChange")
+    public String policiesChange(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/policiesChange";
+    }
+
+    /**
+     * 项目经理判断是否继续政策处理（农场/民事）
+     * */
+    @RequestMapping(value = "managerPolicesChange")
+    public String managerPolicesChange(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/managerPolicesChange";
+    }
+
+
 
     /**
      * 保存请假申请

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/UploadController.java

@@ -3,7 +3,6 @@
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
-import com.google.common.collect.Maps;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
@@ -12,14 +11,15 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.test.pic.entity.TestPic;
 import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -117,13 +117,50 @@ public class UploadController extends BaseController {
 		return "modules/sg/managementcenter/activiti/managerUploadList";
 	}
 
+	/**
+	 * 上传未签字版政策处理清单
+	 */
+	@RequestMapping(value = {"notSignUpload"})
+	public String notSignUpload(UploadImages uploadImages, Model model) {
+		model.addAttribute("uploadImages", uploadImages);
+		return "modules/sg/managementcenter/activiti/notSignUpload";
+	}
+
+	/**
+	 * 上传签字版政策处理清单
+	 */
+	@RequestMapping(value = {"signUploadList"})
+	public String signUploadList(UploadImages uploadImages, Model model) {
+		model.addAttribute("uploadImages", uploadImages);
+		return "modules/sg/managementcenter/activiti/signUploadList";
+	}
+
+
+	/**
+	 * 上传签字版合同
+	 */
+	@RequestMapping(value = {"ContractUploadList"})
+	public String ContractUploadList(UploadImages uploadImages, Model model) {
+		model.addAttribute("uploadImages", uploadImages);
+		return "modules/sg/managementcenter/activiti/contractUploadList";
+	}
+
+	/**
+	 * 上传借款单据
+	 */
+	@RequestMapping(value = {"loanUploadList"})
+	public String loanUploadList(UploadImages uploadImages, Model model) {
+		model.addAttribute("uploadImages", uploadImages);
+		return "modules/sg/managementcenter/activiti/loanUploadList";
+	}
 
 	/**
 	 * 查看，增加，编辑图片管理表单页面
 	 */
 	@RequestMapping(value = "imagesForm")
 	public String form(UploadImages uploadImages, Model model) {
-		model.addAttribute("uploadImages", uploadImages);
+		UploadImages uploadImages1 = uploadImagesService.get(uploadImages.getId());
+		model.addAttribute("uploadImages", uploadImages1);
 		return "modules/sg/managementcenter/activiti/uploadListForm";
 	}
 
@@ -149,9 +186,44 @@ public class UploadController extends BaseController {
 		return getBootstrapData(page);
 	}
 
+	/**
+	 * 保存图片管理
+	 */
+	@ResponseBody
+	@RequestMapping(value = "save")
+	public AjaxJson save(UploadImages uploadImages, Model model) throws Exception{
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(uploadImages);
+		if (StringUtils.isNotBlank(errMsg)){
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+		//新增或编辑表单保存
+		uploadImagesService.save(uploadImages);//保存
+		j.setSuccess(true);
+		j.setMsg("保存图片管理成功");
+		return j;
+	}
 
-	
 
+	/**
+	 * 删除图片管理
+	 */
+	@ResponseBody
+	@RequestMapping(value = "delete")
+	public AjaxJson delete(String ids) {
+		AjaxJson j = new AjaxJson();
+		String idArray[] =ids.split(",");
+		for(String id : idArray){
+			uploadImagesService.delete(uploadImagesService.get(id));
+		}
+		j.setMsg("删除图片管理成功");
+		return j;
+	}
 
 
 

src/main/webapp/webpage/modules/sg/managementcenter/activiti/artificialJudgment.jsp

@@ -101,6 +101,7 @@
 									<input type="checkbox" name="favorite" value="pass1"> 设计变更 &nbsp;
 									<input type="checkbox" name="favorite" value="pass2"> 项目关闭 &nbsp;
 									<input type="checkbox" name="favorite" value="pass3"> 政策处理 &nbsp;
+									<input type="checkbox" name="favorite" value="pass5"> 政策处理(农村/民事) &nbsp;
 								</td>
 							</tr>
 							<tr>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionAudit.jsp

@@ -264,7 +264,7 @@
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="施工单位技术交底" />&nbsp;
 									<input id="agree2" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="项目经理技术交底" />
-									<input id="reject" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳 回" />&nbsp;
+									<input id="reject" class="btn  btn-danger btn-lg btn-danger" type="submit" value="驳 回" />&nbsp;
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/contractUploadList.jsp

@@ -0,0 +1,113 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>上传签字版合同</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="economicsDesignChange.js"%>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+			$("#agree").click(function () {
+				var currentFileValues = $("input[name='pic']").val();
+				if (currentFileValues == "" || currentFileValues == null) {
+					jp.error("请上传文件");
+				} else {
+					jp.prompt("审核意见", function (message) {
+						jp.post("${ctx}/act/task/contractUploadList",
+						{
+							"taskId":"${uploadImages.act.taskId}",
+							"taskName":"${uploadImages.act.taskName}",
+							"taskDefKey":"${uploadImages.act.taskDefKey}",
+							"procInsId":"${uploadImages.act.procInsId}",
+							"procDefId":"${uploadImages.act.procDefId}",
+							"flag":"yes",
+							"pic":currentFileValues,
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+					});
+				}
+			});
+			$("#no").click(function () {
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/contractUploadList",
+						{
+							"taskId":"${uploadImages.act.taskId}",
+							"taskName":"${uploadImages.act.taskName}",
+							"taskDefKey":"${uploadImages.act.taskDefKey}",
+							"procInsId":"${uploadImages.act.procInsId}",
+							"procDefId":"${uploadImages.act.procDefId}",
+							"flag":"no",
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+				});
+			});
+		});
+	</script>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">上传签字版合同</h3>
+	</div>
+	<div class="panel-body">
+	<!-- 表格 -->
+	<table id="testPicTable"   data-toolbar="#toolbar"></table>
+		<div class="panel-body">
+			<form:form id="inputForm" modelAttribute="uploadImages" class="form-horizontal">
+				<form:hidden path="id"/>
+				<form:hidden path="act.taskId"/>
+				<form:hidden path="act.taskName"/>
+				<form:hidden path="act.taskDefKey"/>
+				<form:hidden path="act.procInsId"/>
+				<form:hidden path="act.procDefId"/>
+				<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+				<table class="table table-bordered">
+					<tbody>
+					<tr>
+						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>
+						<td class="width-35">
+							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+			</form:form>
+			<div class="row">
+				<div class="col-sm-3"></div>
+				<div class="col-sm-6">
+					<div class="form-group text-center">
+						<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
+						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
+					</div>
+				</div>
+			</div>
+			<c:if test="${not empty uploadImages.id}">
+				<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
+				<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
+			</c:if>
+		</div>
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideAudit.jsp

@@ -250,8 +250,8 @@
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">
 								<div class="form-group text-center">
-									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="没有问题" />&nbsp;
 									<input id="reject" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="存在问题" />
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="没有问题" />&nbsp;
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/economicsDesignChange.jsp

@@ -327,7 +327,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />&nbsp;
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/loanUploadList.jsp

@@ -0,0 +1,113 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>上传借款单据</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="economicsDesignChange.js"%>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$("#agree").click(function () {
+				var currentFileValues = $("input[name='pic']").val();
+				if (currentFileValues == "" || currentFileValues == null) {
+					jp.error("请上传文件");
+				} else {
+					jp.prompt("审核意见", function (message) {
+						jp.post("${ctx}/act/task/loanUploadList",
+						{
+							"taskId":"${uploadImages.act.taskId}",
+							"taskName":"${uploadImages.act.taskName}",
+							"taskDefKey":"${uploadImages.act.taskDefKey}",
+							"procInsId":"${uploadImages.act.procInsId}",
+							"procDefId":"${uploadImages.act.procDefId}",
+							"flag":"yes",
+							"pic":currentFileValues,
+							"design":design,
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+					});
+				}
+			});
+			$("#no").click(function () {
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/loanUploadList",
+						{
+							"taskId":"${uploadImages.act.taskId}",
+							"taskName":"${uploadImages.act.taskName}",
+							"taskDefKey":"${uploadImages.act.taskDefKey}",
+							"procInsId":"${uploadImages.act.procInsId}",
+							"procDefId":"${uploadImages.act.procDefId}",
+							"flag":"no",
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+				});
+			});
+		});
+	</script>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">上传借款单据</h3>
+	</div>
+	<div class="panel-body">
+	<!-- 表格 -->
+	<table id="testPicTable"   data-toolbar="#toolbar"></table>
+		<div class="panel-body">
+			<form:form id="inputForm" modelAttribute="uploadImages" class="form-horizontal">
+				<form:hidden path="id"/>
+				<form:hidden path="act.taskId"/>
+				<form:hidden path="act.taskName"/>
+				<form:hidden path="act.taskDefKey"/>
+				<form:hidden path="act.procInsId"/>
+				<form:hidden path="act.procDefId"/>
+				<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+				<table class="table table-bordered">
+					<tbody>
+					<tr>
+						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>
+						<td class="width-35">
+							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+			</form:form>
+			<div class="row">
+				<div class="col-sm-3"></div>
+				<div class="col-sm-6">
+					<div class="form-group text-center">
+						<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
+						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
+					</div>
+				</div>
+			</div>
+			<c:if test="${not empty uploadImages.id}">
+				<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
+				<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
+			</c:if>
+		</div>
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerPolicesChange.jsp

@@ -0,0 +1,325 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目经理判断是否继续政策处理</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#agree").click(function () {
+				jp.prompt("需要政策处理", function (message) {
+					jp.post("${ctx}/act/task/managerPolicesChange",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":"yes",
+						"projectName":"${fns:unescapeHtml(construction.projectName)}",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				});
+			});
+			$("#no").click(function () {
+				jp.prompt("取消政策处理", function (message) {
+					jp.post("${ctx}/act/task/managerPolicesChange",
+							{
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
+								"flag":"no",
+								"projectName":"${fns:unescapeHtml(construction.projectName)}",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				});
+			});
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
+					<form:hidden path="id"/>
+<%--						<input id="procInsId" type="text" value="${fns:unescapeHtml(construction.procInsId)}">
+						<input id="projectName" type="text" value="${fns:unescapeHtml(construction.projectName)}">
+						<input type="text" value="${fns:unescapeHtml(construction.id)}">--%>
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectId)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+								<td class="width-35">
+									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
+								<td class="width-35">
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.blackoutArea)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.preliminaryJudgment)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.civilEngineering)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.baseType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.planApproval)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationEquipment)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.newNamed)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.putInto)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.electricalConstruction)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.theAssignment)}
+							</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.automation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.remote)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.communicationMode)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.inSitu)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.networkCabinet)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.station)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerFailure)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
+								<td class="width-35">
+										${construction.disclose.channel}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacity}
+										<%--<select id="capacity"  maxlength="100"  class=" form-control">
+										<option value="是">是</option>
+										<option value="否">否</option>
+									</select>--%>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.sceneSize}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacitySize}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
+								<td class="width-35">
+										${construction.disclose.hiddenDanger}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-35">
+										${construction.disclose.influenceConstruction}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
+								<td class="width-35">
+										${construction.disclose.projectRepetition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-35">
+										${construction.disclose.implemented}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
+								<td class="width-35">
+										${construction.disclose.transformer}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
+								<td class="width-35">
+										${construction.disclose.quantities}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.rodNumber}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+								<td class="width-35">
+										${construction.disclose.administrationType}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-35">
+										${construction.disclose.politicalProblem}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<td class="width-35">
+										${construction.disclose.precondition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-35">
+										${construction.disclose.placementMode}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
+								<td class="width-35">
+										${construction.disclose.productionDate}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-35">
+										${construction.disclose.integrateModule}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+								<td class="width-35">
+										${construction.disclose.needReplace}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-35">
+										${construction.disclose.overallTransformation}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+
+
+
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<div class="col-sm-6">
+								<div class="form-group text-center">
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="需要设计变更" />&nbsp;
+									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="取消设计变更" />&nbsp;
+<%--									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="判断没有问题" />--%>
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerUploadList.js

@@ -9,17 +9,17 @@ $(document).ready(function() {
                dataType: "json",
                contentType: "application/x-www-form-urlencoded",
                //显示检索按钮
-	           showSearch: true,
+	           showSearch: false,
                //显示刷新按钮
                showRefresh: true,
                //显示切换手机试图按钮
-               showToggle: true,
+               showToggle: false,
                //显示 内容列下拉框
-    	       showColumns: true,
+    	       showColumns: false,
     	       //显示到处按钮
-    	       showExport: true,
+    	       showExport: false,
     	       //显示切换分页按钮
-    	       showPaginationSwitch: true,
+    	       showPaginationSwitch: false,
     	       //最低显示2行
     	       minimumCountColumns: 2,
                //是否显示行间隔色

src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerUploadList.jsp

@@ -105,7 +105,7 @@
 				<div class="col-sm-6">
 					<div class="form-group text-center">
 						<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="完成" />&nbsp;
-						<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />&nbsp;
+						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/memberForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>运行人员设计变更页面</title>
+	<title>配网运行人员判定设计变更页面</title>
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
@@ -322,7 +322,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核通过" />&nbsp;
-									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
+									<input id="no" class="btn  btn-danger btn-lg btn-danger" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/notSignUpload.jsp

@@ -0,0 +1,115 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>上传未签字版政策处理清单</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<%@include file="economicsDesignChange.js"%>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+			$("#agree").click(function () {
+				var currentFileValues = $("input[name='pic']").val();
+				if (currentFileValues==""||currentFileValues==null) {
+					jp.error("请上传文件");
+				}else {
+					jp.prompt("上传完成", function (message) {
+						jp.post("${ctx}/act/task/notSignUpload",
+							{
+								"taskId":"${uploadImages.act.taskId}",
+								"taskName":"${uploadImages.act.taskName}",
+								"taskDefKey":"${uploadImages.act.taskDefKey}",
+								"procInsId":"${uploadImages.act.procInsId}",
+								"procDefId":"${uploadImages.act.procDefId}",
+								"flag":"yes",
+								"pic":currentFileValues,
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+					});
+				}
+			});
+
+			$("#no").click(function () {
+				jp.prompt("驳回意见", function (message) {
+					jp.post("${ctx}/act/task/notSignUpload",
+							{
+								"taskId":"${uploadImages.act.taskId}",
+								"taskName":"${uploadImages.act.taskName}",
+								"taskDefKey":"${uploadImages.act.taskDefKey}",
+								"procInsId":"${uploadImages.act.procInsId}",
+								"procDefId":"${uploadImages.act.procDefId}",
+								"flag":"no",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				});
+			});
+		});
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<table id="testPicTable"   data-toolbar="#toolbar"></table>
+					<form:form id="inputForm" modelAttribute="uploadImages" class="form-horizontal">
+						<form:hidden path="id"/>
+						<form:hidden path="act.taskId"/>
+						<form:hidden path="act.taskName"/>
+						<form:hidden path="act.taskDefKey"/>
+						<form:hidden path="act.procInsId"/>
+						<form:hidden path="act.procDefId"/>
+						<form:hidden id="flag" path="act.flag" />
+						<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>
+								<td class="width-35">
+									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+					<div class="row">
+						<div class="col-sm-3"></div>
+						<div class="col-sm-6">
+							<div class="form-group text-center">
+								<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
+								<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
+							</div>
+						</div>
+					</div>
+					<c:if test="${not empty uploadImages.id}">
+						<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
+						<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorDesignChange.jsp

@@ -354,7 +354,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />&nbsp;
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
 <%--									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="判断没有问题" />--%>
 								</div>
 							</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadList.jsp

@@ -131,7 +131,7 @@
 				<div class="col-sm-6">
 					<div class="form-group text-center">
 						<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-						<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />&nbsp;
+						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/policiesChange.jsp

@@ -0,0 +1,371 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>是否可以政策处理（农场/民事）</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#pass3").click(function () {
+				jp.prompt("通过", function (message) {
+					jp.post("${ctx}/act/task/policiesChange",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":"pass3",
+						"projectName":"${fns:unescapeHtml(construction.projectName)}",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				});
+			});
+
+			$("#pass1").click(function () {
+				jp.prompt("设计变更", function (message) {
+					jp.post("${ctx}/act/task/policiesChange",
+							{
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
+								"flag":"pass1",
+								"projectName":"${fns:unescapeHtml(construction.projectName)}",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				});
+			});
+
+			$("#pass2").click(function () {
+				jp.prompt("项目关闭", function (message) {
+					jp.post("${ctx}/act/task/policiesChange",
+							{
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
+								"flag":"pass2",
+								"projectName":"${fns:unescapeHtml(construction.projectName)}",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				});
+			});
+			$("#no").click(function () {
+				jp.prompt("驳回", function (message) {
+					jp.post("${ctx}/act/task/policiesChange",
+							{
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
+								"flag":"reject",
+								"projectName":"${fns:unescapeHtml(construction.projectName)}",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				});
+			});
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
+					<form:hidden path="id"/>
+						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
+						<input id="projectName" type="hidden" value="${fns:unescapeHtml(construction.projectName)}">
+						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectId)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+								<td class="width-35">
+									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.userName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.blackoutArea)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.preliminaryJudgment)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.civilEngineering)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.baseType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.planApproval)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationEquipment)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.newNamed)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.putInto)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.electricalConstruction)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.theAssignment)}
+							</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.automation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.remote)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.communicationMode)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.inSitu)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.networkCabinet)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.station)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerFailure)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
+								<td class="width-35">
+										${construction.disclose.channel}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacity}
+										<%--<select id="capacity"  maxlength="100"  class=" form-control">
+										<option value="是">是</option>
+										<option value="否">否</option>
+									</select>--%>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.sceneSize}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacitySize}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
+								<td class="width-35">
+										${construction.disclose.hiddenDanger}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-35">
+										${construction.disclose.influenceConstruction}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
+								<td class="width-35">
+										${construction.disclose.projectRepetition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-35">
+										${construction.disclose.implemented}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
+								<td class="width-35">
+										${construction.disclose.transformer}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
+								<td class="width-35">
+										${construction.disclose.quantities}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.rodNumber}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+								<td class="width-35">
+										${construction.disclose.administrationType}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-35">
+										${construction.disclose.politicalProblem}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<td class="width-35">
+										${construction.disclose.precondition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-35">
+										${construction.disclose.placementMode}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
+								<td class="width-35">
+										${construction.disclose.productionDate}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-35">
+										${construction.disclose.integrateModule}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+								<td class="width-35">
+										${construction.disclose.needReplace}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-35">
+										${construction.disclose.overallTransformation}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+
+
+
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<div class="col-sm-6">
+								<div class="form-group text-center">
+									<input id="pass3" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="通过" />&nbsp;
+									<input id="pass1" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="设计变更" />
+									<input id="pass2" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="项目关闭" />
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
+<%--									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="判断没有问题" />--%>
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/signUploadList.jsp

@@ -0,0 +1,119 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>上传签字版政策处理清单</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="economicsDesignChange.js"%>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$("#agree").click(function () {
+				var currentFileValues = $("input[name='pic']").val();
+				if (currentFileValues == "" || currentFileValues == null) {
+					jp.error("请上传文件");
+				} else {
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/signUploadList",
+					{
+						"taskId":"${uploadImages.act.taskId}",
+						"taskName":"${uploadImages.act.taskName}",
+						"taskDefKey":"${uploadImages.act.taskDefKey}",
+						"procInsId":"${uploadImages.act.procInsId}",
+						"procDefId":"${uploadImages.act.procDefId}",
+						"flag":"yes",
+						"pic":currentFileValues,
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				});
+				}
+			});
+			$("#no").click(function () {
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/signUploadList",
+					{
+						"taskId":"${uploadImages.act.taskId}",
+						"taskName":"${uploadImages.act.taskName}",
+						"taskDefKey":"${uploadImages.act.taskDefKey}",
+						"procInsId":"${uploadImages.act.procInsId}",
+						"procDefId":"${uploadImages.act.procDefId}",
+						"flag":"no",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				});
+			});
+		});
+	</script>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">上传签字版政策处理清单</h3>
+	</div>
+	<div class="panel-body">
+	<!-- 表格 -->
+		<table id="testPicTable"   data-toolbar="#toolbar"></table>
+		<div class="panel-body">
+			<form:form id="inputForm" modelAttribute="uploadImages" class="form-horizontal">
+				<form:hidden path="id"/>
+				<form:hidden path="act.taskId"/>
+				<form:hidden path="act.taskName"/>
+				<form:hidden path="act.taskDefKey"/>
+				<form:hidden path="act.procInsId"/>
+				<form:hidden path="act.procDefId"/>
+				<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+				<table class="table table-bordered">
+					<tbody>
+					<tr>
+						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>
+						<td class="width-35">
+							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+				<div class="form-group">
+					<div class="col-lg-3"></div>
+					<div class="col-lg-6">
+						<div class="form-group text-center">
+						</div>
+					</div>
+				</div>
+			</form:form>
+			<div class="row">
+				<div class="col-sm-3"></div>
+				<div class="col-sm-6">
+					<div class="form-group text-center">
+						<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
+						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
+					</div>
+				</div>
+			</div>
+			<c:if test="${not empty uploadImages.id}">
+				<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
+				<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
+			</c:if>
+		</div>
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/speciallyForm.jsp

@@ -321,7 +321,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核通过" />&nbsp;
-									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
+									<input id="no" class="btn  btn-danger btn-lg btn-danger" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/uploadList.js

@@ -61,7 +61,7 @@ $(document).ready(function() {
                    } else if($el.data("item") == "delete"){
                         jp.confirm('确认要删除该图片管理记录吗？', function(){
                        	jp.loading();
-                       	jp.get("${ctx}/test/pic/testPic/delete?id="+row.id, function(data){
+                       	jp.get("${ctx}/managementcenter/upload/delete?id="+row.id, function(data){
                    	  		if(data.success){
                    	  			$('#testPicTable').bootstrapTable('refresh');
                    	  			jp.success(data.msg);
@@ -80,7 +80,11 @@ $(document).ready(function() {
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-               columns: [/*{
+               columns: [
+				   {
+					checkbox: true
+					},
+				   /*{
 				   field: 'uId',
 				   title: '标题',
 				   sortable: true,
@@ -124,7 +128,12 @@ $(document).ready(function() {
 				   title: '上传人员',
 				   sortable: true,
 				   sortName: 'uId',
-			   }]
+			   },{
+					   field: 'procInsId',
+					   title: '流程id',
+					   sortable: true,
+					   sortName: 'procInsId',
+				   }]
 		});
 		
 		  
@@ -198,10 +207,9 @@ $(document).ready(function() {
     }
   
   function deleteAll(){
-
 		jp.confirm('确认要删除该图片管理记录吗？', function(){
 			jp.loading();  	
-			jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
+			jp.get("${ctx}/managementcenter/upload/delete?ids=" + getIdSelections(), function(data){
          	  		if(data.success){
          	  			$('#testPicTable').bootstrapTable('refresh');
          	  			jp.success(data.msg);
@@ -219,7 +227,7 @@ $(document).ready(function() {
   }
   
    function add(){
-	  jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
+	  jp.openSaveDialog('新增图片管理', "${ctx}/managementcenter/upload/list",'800px', '500px');
   }
 
 

src/main/webapp/webpage/modules/sg/managementcenter/activiti/uploadList.jsp

@@ -32,12 +32,16 @@
 	</form:form>
 	</div>
 	</div>
-	
-	<!-- 工具栏 -->
-	<div id="toolbar">
 
-		    </div>
-		
+		<!-- 工具栏 -->
+		<div id="toolbar">
+				<button id="edit" class="btn btn-success" disabled onclick="edit()">
+					<i class="glyphicon glyphicon-edit"></i> 修改
+				</button>
+				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+					<i class="glyphicon glyphicon-remove"></i> 删除
+				</button>
+		</div>
 	<!-- 表格 -->
 	<table id="testPicTable"   data-toolbar="#toolbar"></table>
 

src/main/webapp/webpage/modules/sg/managementcenter/activiti/uploadListForm.jsp

@@ -10,12 +10,49 @@
 
 		});
 		function save() {
+			var isValidate = jp.validateForm('#inputForm');//校验表单
+			var path = $("input[name='pic']").val();
+			var procInsId = $("#procInsId").val();
+			var id = $("#xmImgId").val();
+			// alert(path);
+			if(!isValidate){
+				return false;
+			}else{
+				jp.loading();
+				jp.post("${ctx}/managementcenter/upload/save",
+						{
+							"path": path,
+							"procInsId":procInsId,
+							"id":id
+						}
+						,function(data){
+					if(data.success){
+						jp.getParent().refresh();
+						var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+						parent.layer.close(dialogIndex);
+						jp.success(data.msg)
+
+					}else{
+						jp.error(data.msg);
+					}
+				})
+			}
+		}
+		/*function save() {
             var isValidate = jp.validateForm('#inputForm');//校验表单
+			// var currentFileValues = $("input[name='pic']").val();
             if(!isValidate){
                 return false;
 			}else{
                 jp.loading();
-                jp.post("${ctx}/managementcenter/upload/uploadSave",$('#inputForm').serialize(),function(data){
+                jp.post("${ctx}/managementcenter/upload/save",
+				{
+					"path": currentFileValues,
+					"procInsId":${uploadImages.procInsId},
+					"uId":${uploadImages.uId},
+					"id":${uploadImages.id}
+				},
+				function(data){
                     if(data.success){
                         jp.getParent().refresh();
                         var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
@@ -26,19 +63,20 @@
                     }
                 })
 			}
-
-        }
+        }*/
 	</script>
 </head>
 <body class="bg-white">
 		<form:form id="inputForm" modelAttribute="uploadImages" class="form-horizontal">
-		<form:hidden path="id"/>	
+		<form:hidden path="id"/>
+			<input id="procInsId" type="hidden" value="${uploadImages.procInsId}">
+			<input id="xmImgId" type="hidden" value="${uploadImages.id}">
 		<table class="table table-bordered">
 		   <tbody>
 				<tr>
 					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>图片路径：</label></td>
 					<td class="width-35">
-						<sys:fileUpload path="pic"  value="${uploadImages.path}" type="file" uploadPath="/list"/>
+						<sys:fileUpload  path="pic"  value="${uploadImages.path}" type="file" uploadPath="/list"/>
 					</td>
 				</tr>
 		 	</tbody>