设计变更模块流程

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

@@ -1094,6 +1094,31 @@ public class ActTaskService extends BaseService {
 
 
 	/**
+	 * 保存审核意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void economics(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+			act.setComment("[同意] " + act.getComment());
+			vars.put("design", "设计单位人员");
+		} else {
+			act.setComment("[驳回] " + act.getComment());
+			vars.put("design", "运行人员");
+		}
+		// 设置意见
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		vars.put("pass", "yes".equals(act.getFlag())? true : false);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+
+	/**
 	 * 施工保存审核意见
 	 * @param act
 	 */
@@ -1178,17 +1203,64 @@ public class ActTaskService extends BaseService {
 	public void operator(Act act,String design) {
 		Map<String, Object> vars = Maps.newHashMap();
 		//根据登陆查询所属的角色
+		String flag = act.getFlag();
 		String s = constructionService.nameFindOffice(design);
 		vars.put("jys", false);
 		vars.put("des", false);
-		if ("经研所".equals(s)) {
-			vars.put("jys", true);
-		} else if ("设计单位人员".equals(s)) {
-			vars.put("des", true);
+		vars.put("manager", false);
+		if ("yes".equals(flag)) {
+			if ("经研所".equals(s)) {
+				vars.put("jys", true);
+			} else if ("设计单位人员".equals(s)) {
+				vars.put("des", true);
+			}
+			vars.put("design", design);
+		} else {
+			vars.put("manager", true);
+			vars.put("design", "项目经理");
 		}
+		// 设置意见
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 项目经理判定是否需要设计变更
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void managerDesign(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据登陆查询所属的角色
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+			vars.put("design", "运行人员");
+		} else {
+
+		}
+		vars.put("pass", "yes".equals(act.getFlag())? true : false);
+		// 设置意见
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 设计单位人员提交文件
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void designUpload(Act act,String design) {
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据登陆查询所属的角色
 		vars.put("design", design);
+		vars.put("pass", "yes".equals(act.getFlag())? true : false);
 		// 设置意见
-		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
@@ -1197,6 +1269,53 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
+	 * 配网运行人员判断变更后材料
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void operatorUpload(Act act,String design) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+			vars.put("design", design);
+		} else {
+			vars.put("design", "设计单位人员");
+		}
+		//根据登陆查询所属的角色
+		vars.put("pass", "yes".equals(flag)? true : false);
+		// 设置意见
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 配网项目经理判断变更后材料
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void managerUpload(Act act,String design) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		if ("yes".equals(flag)) {
+
+		} else {
+			vars.put("design", "运行人员");
+		}
+		//根据登陆查询所属的角色
+		vars.put("pass", "yes".equals(flag)? true : false);
+		// 设置意见
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+
+	/**
 	 * 经理保存审核意见
 	 * @param act
 	 */

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

@@ -386,6 +386,26 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+
+	/**
+	 * 审批
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "economics")
+	public AjaxJson economics(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.economics(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
 	/**
 	 * 人工选择问题类型审批
 	 * @param act
@@ -415,10 +435,12 @@ public class ActTaskController extends BaseController {
 	public AjaxJson operator(Act act, String design, String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
-			uploadImages.setPath(pic);
-			uploadImages.setProcInsId(uploadImages.getAct().getTaskId());
-			uploadImages.setuId(UserUtils.getUser().getLoginName());
-			uploadImagesService.save(uploadImages);
+			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.operator(act,design);
@@ -430,6 +452,88 @@ public class ActTaskController extends BaseController {
 	}
 
 	/**
+	 * 项目经理判断是否需要设计变更
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "managerDesign")
+	public AjaxJson managerDesign(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.managerDesign(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 设计单位人员提交文件
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "designUpload")
+	public AjaxJson designUpload(Act act, String design, 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.designUpload(act,design);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 配网运行人员判断变更后材料
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "operatorUpload")
+	public AjaxJson operatorUpload(Act act, String design) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.operatorUpload(act,design);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 配网项目经理判断变更后材料
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "managerUpload")
+	public AjaxJson managerUpload(Act act, String design) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.managerUpload(act,design);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
 	 * 施工审批
 	 * @param act
 	 */

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

@@ -189,6 +189,16 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/economicsDesignChange";
     }
 
+    /**
+     * 项目经理判断是否继续设计变更
+     * */
+    @RequestMapping(value = "managerDesignChange")
+    public String managerDesignChange(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/managerDesignChange";
+    }
+
 
     /**
      * 保存请假申请

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

@@ -91,7 +91,7 @@ public class UploadController extends BaseController {
 	}
 
 	/**
-	 * 配网运行人员|配网项目经理查看图片
+	 * 配网运行人员查看图片
 	 */
 	@RequestMapping(value = {"operatorUploadList"})
 	public String operatorUploadList(UploadImages uploadImages, Model model) {
@@ -99,6 +99,24 @@ public class UploadController extends BaseController {
 		return "modules/sg/managementcenter/activiti/operatorUploadList";
 	}
 
+	/**
+	 * 经研所查看上传文件
+	 */
+	@RequestMapping(value = {"economicsDesignChange"})
+	public String economicsDesignChange(UploadImages uploadImages, Model model) {
+		model.addAttribute("uploadImages", uploadImages);
+		return "modules/sg/managementcenter/activiti/economicsDesignChange";
+	}
+
+	/**
+	 * 配网项目经理查看图片
+	 */
+	@RequestMapping(value = {"managerUploadList"})
+	public String managerUploadList(UploadImages uploadImages, Model model) {
+		model.addAttribute("uploadImages", uploadImages);
+		return "modules/sg/managementcenter/activiti/managerUploadList";
+	}
+
 
 	/**
 	 * 查看，增加，编辑图片管理表单页面
@@ -116,7 +134,9 @@ public class UploadController extends BaseController {
 	@ResponseBody
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model,String procInsId) {
-
+		if (procInsId!=null&&procInsId!="") {
+			uploadImages.setProcInsId(procInsId);
+		}
 		Page<UploadImages> page = uploadImagesService.findPage(new Page<UploadImages>(request, response), uploadImages);
 		//当判定系统为linux的时候
 		if (Global.SYS_TYPE.equals("2")) {

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -104,7 +104,7 @@ public class UserController extends BaseController {
     @ResponseBody
     @RequestMapping(value = {"list", ""})
     public Map<String, Object> list(User user, HttpServletRequest request, HttpServletResponse response, Model model,String roleNeedName) {
-        if (roleNeedName != null) {
+        if (roleNeedName != null&&!roleNeedName.equals("")) {
             Role role = null;
             String[] split = roleNeedName.split(";");
             List<Role> roleList = new ArrayList<>();

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

@@ -20,7 +20,7 @@
 				} else {
 					console.log("cValue="+cValue);
 					console.log("nValue="+nValue.size());
-					jp.prompt("驳回, 审批意见", function (message) {
+					jp.prompt(" 审批意见", function (message) {
 						jp.post("${ctx}/act/task/artificialTask",
 						{
 							"taskId":"${construction.act.taskId}",

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

@@ -9,51 +9,36 @@
 	<script type="text/javascript">
 
 		$(document).ready(function() {
-			jp.ajaxForm("#inputForm",function(data){
-				if(data.success){
-					jp.success(data.msg);
-					jp.go("${ctx}"+ data.body.targetUrl);
-				}else{
-					jp.error(data.msg);
-					$("#inputForm").find("button:submit").button("reset");
-				}
-			});
-
 
-			$('#acceptDate').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			$('#examineDate').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			//富文本初始化
-			$('#reason').summernote({
-				height: 300,
-				lang: 'zh-CN',
-				callbacks: {
-					onChange: function(contents, $editable) {
-						$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
-					}
+			$("#agree").click(function () {
+				var design = $("#tuserName").val();
+				var currentFileValues = $("input[name='pic']").val();
+				if (design == "" || design == null) {
+					jp.error("请选择用户");
+				} else if (currentFileValues==""||currentFileValues==null) {
+					jp.error("请上传文件");
 				}
-			});
-
-			$("#${id}Button, #${id}Name").click(function(){
-				// 是否限制选择，如果限制，设置为disabled
-				if ($("#${id}Button").hasClass("disabled")){
-					return true;
-				}
-			});
-
-			$("#${id}DelButton").click(function(){
-				// 是否限制选择，如果限制，设置为disabled
-				if ($("#${id}Button").hasClass("disabled")){
-					return true;
-				}
-				// 清除
-				$("#${id}Id").val("");
-				$("#${id}Name").val("");
-				$("#${id}Name").focus();
-
+				// alert(design);
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/designUpload",
+							{
+								"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")
+								}
+							})
+				});
 			});
 		});
 	</script>
@@ -69,7 +54,7 @@
 					</h3>
 				</div>
 				<div class="panel-body">
-					<form:form id="inputForm" modelAttribute="uploadImages" action="${ctx}/managementcenter/upload/uploadSave" method="post" class="form-horizontal">
+					<form:form id="inputForm" modelAttribute="uploadImages" class="form-horizontal">
 						<form:hidden path="id"/>
 						<form:hidden path="act.taskId"/>
 						<form:hidden path="act.taskName"/>
@@ -78,15 +63,21 @@
 						<form:hidden path="act.procDefId"/>
 						<form:hidden id="flag" path="act.flag" />
 						<div class="form-group text-center">
-							<h3> 施工交底申请</h3>
+							<h3> 设计单位人员上传</h3>
 						</div>
 						<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-15 active"><label class="pull-right"><font color="red">*</font>配网运行人员：</label></td>
 								<td class="width-35">
-									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
+									<sys:userselect roleName="配网运行人员"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+													cssClass="form-control required"/>
 								</td>
+
+<%--								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
+								<td class="width-35">
+									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
+								</td>--%>
 								<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>
@@ -99,12 +90,22 @@
 								<div class="col-lg-6">
 									<div class="form-group text-center">
 										<div>
-											<button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>
+<%--											<input id="agree" class="btn  btn-primary btn-lg btn-parsley" value="审核" />&nbsp;--%>
+<%--											<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;--%>
+<%--											<button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>--%>
 										</div>
 									</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;
+							</div>
+						</div>
+					</div>
 					<c:if test="${not empty uploadImages.id}">
 						<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
 						<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />

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

@@ -1,6 +1,8 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
 $(document).ready(function() {
+	var procInsId = $("#procInsId").val();
+	// alert(procInsId);
 	$('#testPicTable').bootstrapTable({
 		  //请求方法
                method: 'post',
@@ -36,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data",
+               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -120,7 +122,7 @@ $(document).ready(function() {
 		       
 		    },{
 				   field: 'uId',
-				   title: '删除人员',
+				   title: '上传人员',
 				   sortable: true,
 				   sortName: 'uId',
 			   }]

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

@@ -10,34 +10,15 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
-
-				var design = $("#design").val();
-				var fabg = $("#fabg").val();
-				var pic = $("#pic").val();
-				var process = "";
-				if (fabg=="是") {
-					if (pic == "" || pic == null) {
-						jp.error("请上传方案图");
-					} else {
-						jp.success("上传成功");
-					}
-				}
-				if (design == "经研所") {
-					design = "jys";
-				} else {
-					design = "sjry";
-				}
 				jp.prompt("审核", function (message) {
-					jp.post("${ctx}/act/task/artificialTask",
+					jp.post("${ctx}/act/task/economics",
 					{
 						"taskId":"${construction.act.taskId}",
 						"taskName":"${construction.act.taskName}",
 						"taskDefKey":"${construction.act.taskDefKey}",
 						"procInsId":"${construction.act.procInsId}",
 						"procDefId":"${construction.act.procDefId}",
-						"flag":yes,
-						"design":
-						"projectName":"${fns:unescapeHtml(construction.projectName)}",
+						"flag":"yes",
 						"comment":window.encodeURI(message)
 					},
 					function (data) {
@@ -48,6 +29,27 @@
 					})
 				});
 			});
+
+			$("#no").click(function () {
+				jp.prompt("驳回", function (message) {
+					jp.post("${ctx}/act/task/economics",
+							{
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.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>
@@ -66,12 +68,13 @@
 				<div class="panel-body">
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 					<form:hidden path="id"/>
-						<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
-						<input type="text" id="procInsId" name="procInsId" value="${construction.act.procInsId}"/>
-						<form:form>
+					<input type="hidden" id="procInsId" name="procInsId" value="${construction.act.procInsId}"/>
 						<table class="table table-bordered">
 							<tbody>
 							<tr>
+
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.projectId)}

src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerDesignChange.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/managerDesign",
+					{
+						"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/managerDesign",
+							{
+								"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

@@ -0,0 +1,243 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#testPicTable').bootstrapTable({
+		 
+		  //请求方法
+               method: 'post',
+               //类型json
+               dataType: "json",
+               contentType: "application/x-www-form-urlencoded",
+               //显示检索按钮
+	           showSearch: true,
+               //显示刷新按钮
+               showRefresh: true,
+               //显示切换手机试图按钮
+               showToggle: true,
+               //显示 内容列下拉框
+    	       showColumns: true,
+    	       //显示到处按钮
+    	       showExport: true,
+    	       //显示切换分页按钮
+    	       showPaginationSwitch: true,
+    	       //最低显示2行
+    	       minimumCountColumns: 2,
+               //是否显示行间隔色
+               striped: true,
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+               cache: false,    
+               //是否显示分页（*）  
+               pagination: true,   
+                //排序方式 
+               sortOrder: "asc",  
+               //初始化加载第一页，默认第一页
+               pageNumber:1,   
+               //每页的记录行数（*）   
+               pageSize: 10,  
+               //可供选择的每页的行数（*）    
+               pageList: [10, 25, 50, 100],
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               url: "${ctx}/managementcenter/upload/data",
+               //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+               //queryParamsType:'',   
+               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               queryParams : function(params) {
+               	var searchParam = $("#searchForm").serializeJSON();
+               	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+               	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+               	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+                   return searchParam;
+               },
+               //分页方式：client客户端分页，server服务端分页（*）
+               sidePagination: "server",
+               contextMenuTrigger:"right",//pc端 按右键弹出菜单
+               contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+               contextMenu: '#context-menu',
+               onContextMenuItem: function(row, $el){
+                   if($el.data("item") == "edit"){
+                   		edit(row.id);
+                   }else if($el.data("item") == "view"){
+                       view(row.id);
+                   } else if($el.data("item") == "delete"){
+                        jp.confirm('确认要删除该图片管理记录吗？', function(){
+                       	jp.loading();
+                       	jp.get("${ctx}/test/pic/testPic/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#testPicTable').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+                   	   
+                   	});
+                      
+                   } 
+               },
+              
+               onClickRow: function(row, $el){
+               },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+               columns: [/*{
+				   field: 'uId',
+				   title: '标题',
+				   sortable: true,
+				   sortName: 'uId'
+				   ,formatter:function(value, row , index){
+					   value = jp.unescapeHTML(value);
+				   <c:choose>
+					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
+					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
+				   </c:when>
+					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
+					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+				   </c:when>
+					   <c:otherwise>
+					   return value;
+				   </c:otherwise>
+					   </c:choose>
+				   }
+
+			   },*/{
+		        field: 'path',
+		        title: '图片路径',
+		        sortable: true,
+		        sortName: 'path',
+		        formatter:function(value, row , index){
+		        	var valueArray = value.split("|");
+		        	var labelArray = [];
+		        	for(var i =0 ; i<valueArray.length; i++){
+		        		if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
+		        		{
+		        			labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
+		        		}else{
+		        			labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+		        		}
+		        	}
+		        	return labelArray.join(" ");
+		        }
+		       
+		    },{
+				   field: 'uId',
+				   title: '上传人员',
+				   sortable: true,
+				   sortName: 'uId',
+			   }]
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#testPicTable').bootstrapTable("toggleView");
+		}
+	  
+	  $('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#testPicTable').bootstrapTable('getSelections').length!=1);
+        });
+		  
+		$("#btnImport").click(function(){
+			jp.open({
+			    type: 2,
+                area: [500, 200],
+                auto: true,
+			    title:"导入数据",
+			    content: "${ctx}/tag/importExcel" ,
+			    btn: ['下载模板','确定', '关闭'],
+				    btn1: function(index, layero){
+					  jp.downloadFile('${ctx}/test/pic/testPic/import/template');
+				  },
+			    btn2: function(index, layero){
+				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+						iframeWin.contentWindow.importExcel('${ctx}/test/pic/testPic/import', function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								refresh();
+							}else{
+								jp.error(data.msg);
+							}
+                            jp.close(index);
+                        });//调用保存事件
+                    return false;
+				  },
+				 
+				  btn3: function(index){ 
+					  jp.close(index);
+	    	       }
+			}); 
+		});
+		
+		
+	 $("#export").click(function(){//导出Excel文件
+			jp.downloadFile('${ctx}/test/pic/testPic/export');
+	  });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#testPicTable').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#testPicTable').bootstrapTable('refresh');
+		});
+		
+		
+	});
+		
+  function getIdSelections() {
+        return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除该图片管理记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#testPicTable').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#testPicTable').bootstrapTable('refresh');
+  }
+  
+   function add(){
+	  jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
+  }
+
+
+  
+   function edit(id){//没有权限时，不显示确定按钮
+       if(id == undefined){
+	      id = getIdSelections();
+	}
+	jp.openSaveDialog('编辑图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
+  }
+  
+ function view(id){//没有权限时，不显示确定按钮
+      if(id == undefined){
+             id = getIdSelections();
+      }
+        jp.openViewDialog('查看图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
+ }
+
+
+
+</script>

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

@@ -0,0 +1,124 @@
+<%@ 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="operatorUploadList.js" %>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$("#agree").click(function () {
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/managerUpload",
+					{
+						"taskId":"${uploadImages.act.taskId}",
+						"taskName":"${uploadImages.act.taskName}",
+						"taskDefKey":"${uploadImages.act.taskDefKey}",
+						"procInsId":"${uploadImages.act.procInsId}",
+						"procDefId":"${uploadImages.act.procDefId}",
+						"flag":"yes",
+						"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/managerUpload",
+						{
+							"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">
+	
+	<!-- 搜索 -->
+	<div id="search-collapse" class="collapse">
+		<div class="accordion-inner">
+	<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
+		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+<%--		<input type="text" id="path" name="path" value="${uploadImages.path}">
+		 <div class="col-xs-12 col-sm-6 col-md-4">
+			<div style="margin-top:26px">
+			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+			 </div>
+	    </div>	--%>
+	</form:form>
+	</div>
+	</div>
+	
+	<!-- 工具栏 -->
+	<div id="toolbar">
+
+		    </div>
+		
+	<!-- 表格 -->
+	<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"/>
+				<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-parsley" 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/operatorDesignChange.jsp

@@ -9,10 +9,10 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
-
 				var design = $("#tuserName").val();
 				var fabg = $("#fabg").val();
 				var pic = $("#pic").val();
+				var currentFileValues = $("input[name='pic']").val();
 				if (design==""||design==null) {
 					jp.error("请选择用户")
 					return;
@@ -34,6 +34,7 @@
 						"procInsId":"${construction.act.procInsId}",
 						"procDefId":"${construction.act.procDefId}",
 						"flag":"yes",
+						"pic":currentFileValues,
 						"design":design,
 						"projectName":"${fns:unescapeHtml(construction.projectName)}",
 						"comment":window.encodeURI(message)
@@ -46,6 +47,28 @@
 					})
 				});
 			});
+			$("#no").click(function () {
+				// alert(design);
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/operator",
+							{
+								"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>
@@ -111,7 +134,7 @@
 										<option>否</option>
 									</select>
 								</td>
-								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-15 active"><label class="pull-right">上传新方案图纸：</label></td>
 								<td class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
@@ -331,6 +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-parsley" type="submit" value="判断没有问题" />--%>
 								</div>
 							</div>

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

@@ -121,7 +121,7 @@ $(document).ready(function() {
 		       
 		    },{
 				   field: 'uId',
-				   title: '删除人员',
+				   title: '上传人员',
 				   sortable: true,
 				   sortName: 'uId',
 			   }]

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

@@ -2,18 +2,77 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>图片管理管理</title>
+	<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="operatorUploadList.js" %>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+			$("#agree").click(function () {
+				var design = $("#tuserName").val();
+				var currentFileValues = $("input[name='pic']").val();
+				if (design == "" || design == null) {
+					jp.error("请选择用户");
+				} else {
+					jp.prompt("审核意见", function (message) {
+						jp.post("${ctx}/act/task/operatorUpload",
+						{
+							"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")
+							}
+						})
+					});
+				}
+				// alert(design);
+			});
+			$("#no").click(function () {
+				var design = $("#tuserName").val();
+				var currentFileValues = $("input[name='pic']").val();
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/operatorUpload",
+						{
+							"taskId":"${uploadImages.act.taskId}",
+							"taskName":"${uploadImages.act.taskName}",
+							"taskDefKey":"${uploadImages.act.taskDefKey}",
+							"procInsId":"${uploadImages.act.procInsId}",
+							"procDefId":"${uploadImages.act.procDefId}",
+							"flag":"no",
+							"pic":currentFileValues,
+							"design":design,
+							"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>
+		<h3 class="panel-title">配网运行人员判断变更后材料</h3>
 	</div>
 	<div class="panel-body">
 	
@@ -21,14 +80,14 @@
 	<div id="search-collapse" class="collapse">
 		<div class="accordion-inner">
 	<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
-		<input type="text" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
-		<input type="text" id="path" name="path" value="${uploadImages.path}">
+		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+<%--		<input type="text" id="path" name="path" value="${uploadImages.path}">
 		 <div class="col-xs-12 col-sm-6 col-md-4">
 			<div style="margin-top:26px">
 			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
 			 </div>
-	    </div>	
+	    </div>	--%>
 	</form:form>
 	</div>
 	</div>
@@ -40,7 +99,47 @@
 		
 	<!-- 表格 -->
 	<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"/>
+				<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:userselect roleName="项目经理"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+											cssClass="form-control required"/>
+						</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-parsley" 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>  

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

@@ -121,7 +121,7 @@ $(document).ready(function() {
 		       
 		    },{
 				   field: 'uId',
-				   title: '删除人员',
+				   title: '上传人员',
 				   sortable: true,
 				   sortName: 'uId',
 			   }]