工作流程-施工验收模块

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

@@ -2759,4 +2759,179 @@ public class ActTaskService extends BaseService {
 		vars.put("manager", user.getConstructionUnitManage());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
+
+	/**
+	 * 施工单位项目经理非涉电开工流程提交文件
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void nonPowerMiddleTask(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据流程实例id查询项目的相关信息
+		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+		//根据项目设置的流转人员，流转对应人员
+		vars.put("manager", user.getConstructionUnitManage());
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 施工单位项目经理非涉电开工流程提交文件
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void nonPowerEndTask(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据流程实例id查询项目的相关信息
+		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+		//根据项目设置的流转人员，流转对应人员
+		vars.put("manager", user.getProjectManageRole());
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 配网项目经理判断是否完成非涉电工作
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void nonPowerWhetherTask(Act act) {
+		String flag = act.getFlag();
+		// 设置意见
+		act.setComment(("yes".equals(flag)?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据流程实例id查询项目的相关信息
+		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+		if ("yes".equals(flag)) {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", user.getConstructionUnitManage());
+			vars.put("yes", true);
+			vars.put("no", false);
+		} else {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", user.getConstructionUnitManage());
+			vars.put("yes", false);
+			vars.put("no", true);
+		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 施工单位项目经理判断是否包含涉电工作
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void managerWhetherTask(Act act) {
+		String flag = act.getFlag();
+		// 设置意见
+		act.setComment(("yes".equals(flag)?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据流程实例id查询项目的相关信息
+		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+		if ("yes".equals(flag)) {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", user.getConstructionUnitManage());
+			vars.put("yes", true);
+			vars.put("no", false);
+		} else {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("yes", false);
+			vars.put("no", true);
+		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 施工单位项目经理 涉电开工流程提交文件
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void PowerStartTask(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据流程实例id查询项目的相关信息
+		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+		//根据项目设置的流转人员，流转对应人员
+		vars.put("manager", user.getConstructionUnitManage());
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 施工单位项目经理 涉电开工流程提交文件
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void PowerEndTask(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据流程实例id查询项目的相关信息
+		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+		//根据项目设置的流转人员，流转对应人员
+		vars.put("manager", user.getProjectManageRole());
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 配网项目经理判断涉电工作
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void PowerWhetherTask(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		//根据流程实例id查询项目的相关信息
+		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+		String flag = act.getFlag();
+		if ("finish".equals(flag)) {
+			act.setComment("[无二次涉电]"+act.getComment());
+			vars.put("finish", true);
+			vars.put("second", false);
+			vars.put("no", false);
+		} else if ("second".equals(flag)) {
+			act.setComment("[纯在二次涉电]"+act.getComment());
+			vars.put("finish", false);
+			vars.put("second", true);
+			vars.put("no", false);
+			vars.put("manager", user.getConstructionUnitManage());
+		} else {
+			act.setComment("[审核不通过]"+act.getComment());
+			vars.put("finish", false);
+			vars.put("second", false);
+			vars.put("no", true);
+			vars.put("manager", user.getConstructionUnitManage());
+		}
+		// 设置意见
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
 }

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

@@ -1454,4 +1454,158 @@ public class ActTaskController extends BaseController {
 		j.setMsg("审批成功");
 		return j;
 	}
+
+	/**
+	 * 施工单位项目经理非涉电施工中流程提交文件
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "nonPowerMiddleTask")
+	public AjaxJson nonPowerMiddleTask(Act act,String pic, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传非涉电施工中流程");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.nonPowerMiddleTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 施工单位项目经理非涉电竣工流程提交文件
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "nonPowerEndTask")
+	public AjaxJson nonPowerEndTask(Act act,String pic, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传非涉电竣工流程");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.nonPowerEndTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 配网项目经理判断是否完成非涉电工作
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "nonPowerWhetherTask")
+	public AjaxJson nonPowerWhetherTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.nonPowerWhetherTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 施工单位项目经理判断是否包含涉电工作
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "managerWhetherTask")
+	public AjaxJson managerWhetherTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.managerWhetherTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 施工单位项目经理上传涉电项目开工流程工作
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "PowerStartTask")
+	public AjaxJson PowerStartTask(Act act,String pic, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传涉电开工流程");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.PowerStartTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 施工单位项目经理上传涉电项目竣工流程工作
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "PowerEndTask")
+	public AjaxJson PowerEndTask(Act act,String pic, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传涉电竣工流程");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.PowerEndTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 配网项目经理判断涉电工作
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "PowerWhetherTask")
+	public AjaxJson PowerWhetherTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.PowerWhetherTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
 }

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

@@ -7,6 +7,8 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 
+import java.util.List;
+
 /**
  * 施工交底MAPPER接口
  * @author
@@ -15,5 +17,5 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 
 @MyBatisMapper
 public interface UploadImagesMapper extends BaseMapper<UploadImages> {
-    
+    List<UploadImages> findMaterialImg(UploadImages entity);
 }

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

@@ -47,6 +47,10 @@
 			</otherwise>
 		</choose>
 	</select>
+
+	<select id="findMaterialImg" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages">
+		select imgName,path,proc_ins_id,uId from xm_upolad_images where proc_ins_id = #{procInsId}
+	</select>
 	
 	<select id="findAllList" resultType="UploadImages" >
 		SELECT *

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/UploadImagesService.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.service;
 
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
@@ -57,4 +58,12 @@ public class UploadImagesService extends CrudService<UploadImagesMapper, UploadI
 		entity.preInsert();
 		uploadImagesMapper.insert(entity);
 	}
+
+	public Page<UploadImages> findMaterialImg(Page<UploadImages> page, UploadImages entity) {
+		dataRuleFilter(entity);
+		entity.setPage(page);
+		page.setList(mapper.findMaterialImg(entity));
+		return page;
+	}
+
 }

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

@@ -210,6 +210,27 @@ public class UploadController extends BaseController {
 	}
 
 	/**
+	 * 文件管理列表数据
+	 */
+	@ResponseBody
+	@RequestMapping(value = "materialUploadData")
+	public Map<String, Object> materialUploadData(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model,String procInsId) {
+		if (procInsId!=null&&procInsId!="") {
+			uploadImages.setProcInsId(procInsId);
+		}
+		Page<UploadImages> page = uploadImagesService.findMaterialImg(new Page<UploadImages>(request, response), uploadImages);
+		//当判定系统为linux的时候
+		if (Global.SYS_TYPE.equals("2")) {
+			List<UploadImages> list = page.getList();
+			for (UploadImages upload:
+					list) {
+				upload.setPath("http://" + request.getServerName()  +upload.getPath());
+			}
+		}
+		return getBootstrapData(page);
+	}
+
+	/**
 	 * 保存图片管理
 	 */
 	@ResponseBody

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/web/MaterialModuleController.java

@@ -64,8 +64,8 @@ public class MaterialModuleController extends BaseController {
     @RequestMapping(value = "nonPowerStart")
     public String nonPowerStart(MaterialModule materialModule, Model model) {
         MaterialModule materialShow = materialModuleService.get(materialModule.getAct().getProcInsId());
-        model.addAttribute("materialModule", materialModule);
         model.addAttribute("materialShow", materialShow);
+        model.addAttribute("materialModule", materialModule);
         return "modules/sg/materialmodule/activiti/nonPowerStart";
     }
 
@@ -74,6 +74,8 @@ public class MaterialModuleController extends BaseController {
      */
     @RequestMapping(value = "nonPowerMiddle")
     public String nonPowerMiddle(MaterialModule materialModule, Model model) {
+        MaterialModule materialShow = materialModuleService.get(materialModule.getAct().getProcInsId());
+        model.addAttribute("materialShow", materialShow);
         model.addAttribute("materialModule", materialModule);
         return "modules/sg/materialmodule/activiti/nonPowerMiddle";
     }
@@ -83,6 +85,8 @@ public class MaterialModuleController extends BaseController {
      */
     @RequestMapping(value = "nonPowerEnd")
     public String nonPowerEnd(MaterialModule materialModule, Model model) {
+        MaterialModule materialShow = materialModuleService.get(materialModule.getAct().getProcInsId());
+        model.addAttribute("materialShow", materialShow);
         model.addAttribute("materialModule", materialModule);
         return "modules/sg/materialmodule/activiti/nonPowerEnd";
     }
@@ -92,6 +96,8 @@ public class MaterialModuleController extends BaseController {
      */
     @RequestMapping(value = "nonPowerWhether")
     public String nonPowerWhether(MaterialModule materialModule, Model model) {
+        MaterialModule materialShow = materialModuleService.get(materialModule.getAct().getProcInsId());
+        model.addAttribute("materialShow", materialShow);
         model.addAttribute("materialModule", materialModule);
         return "modules/sg/materialmodule/activiti/nonPowerWhether";
     }
@@ -101,6 +107,8 @@ public class MaterialModuleController extends BaseController {
      */
     @RequestMapping(value = "PowerStart")
     public String PowerStart(MaterialModule materialModule, Model model) {
+        MaterialModule materialShow = materialModuleService.get(materialModule.getAct().getProcInsId());
+        model.addAttribute("materialShow", materialShow);
         model.addAttribute("materialModule", materialModule);
         return "modules/sg/materialmodule/activiti/PowerStart";
     }
@@ -110,6 +118,8 @@ public class MaterialModuleController extends BaseController {
      */
     @RequestMapping(value = "PowerEnd")
     public String PowerEnd(MaterialModule materialModule, Model model) {
+        MaterialModule materialShow = materialModuleService.get(materialModule.getAct().getProcInsId());
+        model.addAttribute("materialShow", materialShow);
         model.addAttribute("materialModule", materialModule);
         return "modules/sg/materialmodule/activiti/PowerEnd";
     }
@@ -119,11 +129,25 @@ public class MaterialModuleController extends BaseController {
      */
     @RequestMapping(value = "PowerWhether")
     public String PowerWhether(MaterialModule materialModule, Model model) {
+        MaterialModule materialShow = materialModuleService.get(materialModule.getAct().getProcInsId());
+        model.addAttribute("materialShow", materialShow);
         model.addAttribute("materialModule", materialModule);
         return "modules/sg/materialmodule/activiti/PowerWhether";
     }
 
     /**
+     * 施工单位项目经理判断项目是否包含涉电工作
+     */
+    @RequestMapping(value = "managerWhether")
+    public String managerWhether(MaterialModule materialModule, Model model) {
+        MaterialModule materialShow = materialModuleService.get(materialModule.getAct().getProcInsId());
+        model.addAttribute("materialShow", materialShow);
+        model.addAttribute("materialModule", materialModule);
+        return "modules/sg/materialmodule/activiti/managerWhether";
+    }
+
+
+    /**
      * 施工流程发起
      */
     @ResponseBody

src/main/webapp/webpage/modules/sg/materialmodule/activiti/PowerEnd.js

@@ -38,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
+               url: "${ctx}/managementcenter/upload/materialUploadData?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -80,27 +80,7 @@ $(document).ready(function() {
                	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>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,
@@ -156,7 +136,35 @@ $(document).ready(function() {
 		  $("#searchForm  .select-item").html("");
 		  $('#testPicTable').bootstrapTable('refresh');
 		});
+
+	$("#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/PowerEndTask",
+					{
+						"taskId":"${materialModule.act.taskId}",
+						"taskName":"${materialModule.act.taskName}",
+						"taskDefKey":"${materialModule.act.taskDefKey}",
+						"procInsId":"${materialModule.act.procInsId}",
+						"procDefId":"${materialModule.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")
+						}
+					})
+			});
+		}
 	});
+
+});
 		
   function getIdSelections() {
         return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {

src/main/webapp/webpage/modules/sg/materialmodule/activiti/PowerEnd.jsp

@@ -7,38 +7,7 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="nonPowerEnd.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")
-							}
-						})
-					});
-				}
-			});
-		});
-	</script>
+	<%@include file="PowerEnd.js"%>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -61,6 +30,10 @@
 				<table class="table table-bordered">
 					<tbody>
 					<tr>
+						<td class="width-35 active" style="text-align: right">项目名称：${materialShow.projectName}</td>
+						<td class="width-35">项目类型：${materialShow.projectType}</td>
+					</tr>
+					<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="/materialModule"></sys:fileUpload>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/PowerStart.js

@@ -2,7 +2,6 @@
 <script>
 $(document).ready(function() {
 	var procInsId = $("#procInsId").val();
-	// alert(procInsId);
 	$('#testPicTable').bootstrapTable({
 		  //请求方法
                method: 'post',
@@ -38,7 +37,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
+               url: "${ctx}/managementcenter/upload/materialUploadData?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -80,27 +79,7 @@ $(document).ready(function() {
                	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>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,
@@ -156,7 +135,34 @@ $(document).ready(function() {
 		  $("#searchForm  .select-item").html("");
 		  $('#testPicTable').bootstrapTable('refresh');
 		});
+
+	$("#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/PowerStartTask",
+					{
+						"taskId":"${materialModule.act.taskId}",
+						"taskName":"${materialModule.act.taskName}",
+						"taskDefKey":"${materialModule.act.taskDefKey}",
+						"procInsId":"${materialModule.act.procInsId}",
+						"procDefId":"${materialModule.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")
+					}
+				})
+			});
+		}
 	});
+});
 		
   function getIdSelections() {
         return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {

src/main/webapp/webpage/modules/sg/materialmodule/activiti/PowerStart.jsp

@@ -2,41 +2,16 @@
 <%@ 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="nonPowerStart.js"%>
+	<%@include file="PowerStart.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")
-							}
-						})
-					});
-				}
-			});
+
 		});
 	</script>
 </head>
@@ -44,7 +19,7 @@
 	<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">
 	<!-- 表格 -->
@@ -61,6 +36,10 @@
 				<table class="table table-bordered">
 					<tbody>
 					<tr>
+						<td class="width-35 active" style="text-align: right">项目名称：${materialShow.projectName}</td>
+						<td class="width-35">项目类型：${materialShow.projectType}</td>
+					</tr>
+					<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="/materialModule"></sys:fileUpload>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/PowerWhether.js

@@ -38,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
+               url: "${ctx}/managementcenter/upload/materialUploadData?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -80,27 +80,7 @@ $(document).ready(function() {
                	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>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,
@@ -156,7 +136,70 @@ $(document).ready(function() {
 		  $("#searchForm  .select-item").html("");
 		  $('#testPicTable').bootstrapTable('refresh');
 		});
+
+	$("#finish").click(function () {
+		jp.prompt("审核意见", function (message) {
+			jp.post("${ctx}/act/task/PowerWhetherTask",
+				{
+					"taskId":"${materialModule.act.taskId}",
+					"taskName":"${materialModule.act.taskName}",
+					"taskDefKey":"${materialModule.act.taskDefKey}",
+					"procInsId":"${materialModule.act.procInsId}",
+					"procDefId":"${materialModule.act.procDefId}",
+					"flag":"finish",
+					"comment":window.encodeURI(message)
+				},
+				function (data) {
+					if(data.success){
+						jp.success(data.msg);
+						jp.go("${ctx}/act/task/todo")
+					}
+				})
+		});
+	});
+
+	$("#second").click(function () {
+		jp.prompt("审核意见", function (message) {
+			jp.post("${ctx}/act/task/PowerWhetherTask",
+				{
+					"taskId":"${materialModule.act.taskId}",
+					"taskName":"${materialModule.act.taskName}",
+					"taskDefKey":"${materialModule.act.taskDefKey}",
+					"procInsId":"${materialModule.act.procInsId}",
+					"procDefId":"${materialModule.act.procDefId}",
+					"flag":"second",
+					"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/PowerWhetherTask",
+				{
+					"taskId":"${materialModule.act.taskId}",
+					"taskName":"${materialModule.act.taskName}",
+					"taskDefKey":"${materialModule.act.taskDefKey}",
+					"procInsId":"${materialModule.act.procInsId}",
+					"procDefId":"${materialModule.act.procDefId}",
+					"flag":"no",
+					"comment":window.encodeURI(message)
+				},
+				function (data) {
+					if(data.success){
+						jp.success(data.msg);
+						jp.go("${ctx}/act/task/todo")
+					}
+				})
+		});
 	});
+});
 		
   function getIdSelections() {
         return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {

src/main/webapp/webpage/modules/sg/materialmodule/activiti/PowerWhether.jsp

@@ -2,41 +2,15 @@
 <%@ 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="nonPowerStart.js"%>
+	<%@include file="PowerWhether.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")
-							}
-						})
-					});
-				}
-			});
+
 		});
 	</script>
 </head>
@@ -44,7 +18,7 @@
 	<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">
 	<!-- 表格 -->
@@ -61,10 +35,8 @@
 				<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="/materialModule"></sys:fileUpload>
-						</td>
+						<td class="width-35 active" style="text-align: right">项目名称：${materialShow.projectName}</td>
+						<td class="width-35">项目类型：${materialShow.projectType}</td>
 					</tr>
 					</tbody>
 				</table>
@@ -73,7 +45,9 @@
 				<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="finish" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="无二次涉电" />&nbsp;
+						<input id="second" 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/materialmodule/activiti/managerWhether.js

@@ -0,0 +1,195 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	var procInsId = $("#procInsId").val();
+	$('#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/materialUploadData?procInsId="+procInsId,
+               //默认值为 '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: '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: 'imgName',
+				   title: '上传用途',
+				   sortable: true,
+				   sortName: 'imgName',
+			   },{
+				   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);
+        });
+
+	 $("#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');
+		});
+
+	$("#agree").click(function () {
+		jp.prompt("审核意见", function (message) {
+			jp.post("${ctx}/act/task/managerWhetherTask",
+				{
+					"taskId":"${materialModule.act.taskId}",
+					"taskName":"${materialModule.act.taskName}",
+					"taskDefKey":"${materialModule.act.taskDefKey}",
+					"procInsId":"${materialModule.act.procInsId}",
+					"procDefId":"${materialModule.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/managerWhetherTask",
+				{
+					"taskId":"${materialModule.act.taskId}",
+					"taskName":"${materialModule.act.taskName}",
+					"taskDefKey":"${materialModule.act.taskDefKey}",
+					"procInsId":"${materialModule.act.procInsId}",
+					"procDefId":"${materialModule.act.procDefId}",
+					"flag":"no",
+					"comment":window.encodeURI(message)
+				},
+				function (data) {
+					if(data.success){
+						jp.success(data.msg);
+						jp.go("${ctx}/act/task/todo")
+					}
+				})
+		});
+	});
+
+});
+		
+  function getIdSelections() {
+        return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+
+    //刷新列表
+  function refresh(){
+  	$('#testPicTable').bootstrapTable('refresh');
+  }
+
+
+</script>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/managerWhether.jsp

@@ -0,0 +1,60 @@
+<%@ 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="managerWhether.js"%>
+</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="materialModule" 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="${materialModule.act.procInsId}"/>
+				<table class="table table-bordered">
+					<tbody>
+						<tr>
+							<td class="width-35 active" style="text-align: right">项目名称：${materialShow.projectName}</td>
+							<td class="width-35">项目类型：${materialShow.projectType}</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 materialModule.id}">
+				<act:flowChart procInsId="${materialModule.act.procInsId}"/>
+				<act:histoicFlow procInsId="${materialModule.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/materialmodule/activiti/nonPowerEnd.js

@@ -38,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
+               url: "${ctx}/managementcenter/upload/materialUploadData?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -80,27 +80,7 @@ $(document).ready(function() {
                	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>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,
@@ -156,7 +136,34 @@ $(document).ready(function() {
 		  $("#searchForm  .select-item").html("");
 		  $('#testPicTable').bootstrapTable('refresh');
 		});
+
+	$("#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/nonPowerEndTask",
+					{
+						"taskId":"${materialModule.act.taskId}",
+						"taskName":"${materialModule.act.taskName}",
+						"taskDefKey":"${materialModule.act.taskDefKey}",
+						"procInsId":"${materialModule.act.procInsId}",
+						"procDefId":"${materialModule.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")
+						}
+					})
+			});
+		}
 	});
+});
 		
   function getIdSelections() {
         return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerEnd.jsp

@@ -10,32 +10,7 @@
 	<%@include file="nonPowerEnd.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")
-							}
-						})
-					});
-				}
-			});
+
 		});
 	</script>
 </head>
@@ -60,6 +35,10 @@
 				<table class="table table-bordered">
 					<tbody>
 					<tr>
+						<td class="width-35 active" style="text-align: right">项目名称：${materialShow.projectName}</td>
+						<td class="width-35">项目类型：${materialShow.projectType}</td>
+					</tr>
+					<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="/materialModule"></sys:fileUpload>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerMiddle.js

@@ -38,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
+               url: "${ctx}/managementcenter/upload/materialUploadData?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -54,53 +54,12 @@ $(document).ready(function() {
                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>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,
@@ -156,7 +115,34 @@ $(document).ready(function() {
 		  $("#searchForm  .select-item").html("");
 		  $('#testPicTable').bootstrapTable('refresh');
 		});
+
+	$("#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/nonPowerMiddleTask",
+					{
+						"taskId":"${materialModule.act.taskId}",
+						"taskName":"${materialModule.act.taskName}",
+						"taskDefKey":"${materialModule.act.taskDefKey}",
+						"procInsId":"${materialModule.act.procInsId}",
+						"procDefId":"${materialModule.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")
+						}
+					})
+			});
+		}
 	});
+});
 		
   function getIdSelections() {
         return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
@@ -169,5 +155,4 @@ $(document).ready(function() {
   	$('#testPicTable').bootstrapTable('refresh');
   }
 
-
 </script>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerMiddle.jsp

@@ -8,37 +8,6 @@
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
 	<%@include file="nonPowerMiddle.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")
-							}
-						})
-					});
-				}
-			});
-		});
-	</script>
 </head>
 <body>
 	<div class="wrapper wrapper-content">

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerStart.js

@@ -38,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
+               url: "${ctx}/managementcenter/upload/materialUploadData?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerStart.jsp

@@ -8,12 +8,6 @@
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
 	<%@include file="nonPowerStart.js"%>
-	<script type="text/javascript">
-
-		$(document).ready(function() {
-
-		});
-	</script>
 </head>
 <body>
 	<div class="wrapper wrapper-content">

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerWhether.js

@@ -38,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
+               url: "${ctx}/managementcenter/upload/materialUploadData?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -80,27 +80,7 @@ $(document).ready(function() {
                	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>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,
@@ -156,6 +136,48 @@ $(document).ready(function() {
 		  $("#searchForm  .select-item").html("");
 		  $('#testPicTable').bootstrapTable('refresh');
 		});
+
+		$("#agree").click(function () {
+			jp.prompt("审核意见", function (message) {
+				jp.post("${ctx}/act/task/nonPowerWhetherTask",
+					{
+						"taskId":"${materialModule.act.taskId}",
+						"taskName":"${materialModule.act.taskName}",
+						"taskDefKey":"${materialModule.act.taskDefKey}",
+						"procInsId":"${materialModule.act.procInsId}",
+						"procDefId":"${materialModule.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/nonPowerWhetherTask",
+				{
+					"taskId":"${materialModule.act.taskId}",
+					"taskName":"${materialModule.act.taskName}",
+					"taskDefKey":"${materialModule.act.taskDefKey}",
+					"procInsId":"${materialModule.act.procInsId}",
+					"procDefId":"${materialModule.act.procDefId}",
+					"flag":"no",
+					"comment":window.encodeURI(message)
+				},
+				function (data) {
+					if(data.success){
+						jp.success(data.msg);
+						jp.go("${ctx}/act/task/todo")
+					}
+				})
+		});
+	});
 	});
 		
   function getIdSelections() {

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerWhether.jsp

@@ -2,41 +2,16 @@
 <%@ 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="nonPowerStart.js"%>
+	<%@include file="nonPowerWhether.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")
-							}
-						})
-					});
-				}
-			});
+
 		});
 	</script>
 </head>
@@ -44,7 +19,7 @@
 	<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">
 	<!-- 表格 -->
@@ -60,12 +35,10 @@
 				<input type="hidden" id="procInsId" name="procInsId" value="${materialModule.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="/materialModule"></sys:fileUpload>
-						</td>
-					</tr>
+						<tr>
+							<td class="width-35 active" style="text-align: right">项目名称：${materialShow.projectName}</td>
+							<td class="width-35">项目类型：${materialShow.projectType}</td>
+						</tr>
 					</tbody>
 				</table>
 			</form:form>
@@ -73,7 +46,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="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>