foreach 变更

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

@@ -2307,7 +2307,7 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
-		vars.put("manager","施工单位领导");
+		vars.put("manager","施工单位领导A");
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -2327,7 +2327,67 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(flag)? true : false);
-		vars.put("manager", "yes".equals(flag)? "施工物资专职" : "施工经理");
+		vars.put("manager", "yes".equals(flag)? "施工物资专职A" : "施工项目经理A");
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 项目中心领导审核领料单
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void leaderExamine(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();
+		vars.put("pass", "yes".equals(flag)? true : false);
+		vars.put("manager", "yes".equals(flag)? "施工物资专职" : "施工项目经理A");
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 配网项目经理审核领料单
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void managerAudit(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();
+		vars.put("pass", "yes".equals(flag)? true : false);
+		vars.put("manager", "yes".equals(flag)? "施工物资专职" : "施工项目经理A");
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 配网物资专职审核领料单
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void netExamine(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();
+		vars.put("pass", "yes".equals(flag)? true : false);
+		vars.put("manager", "yes".equals(flag)? "施工物资专职" : "施工项目经理A");
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 

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

@@ -1272,6 +1272,58 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 项目中心领导审核领料单
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "leaderExamine")
+	public AjaxJson leaderExamine(Act act) {
+		AjaxJson j = new AjaxJson();
+		actTaskService.leaderExamine(act);
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 项目中心领导审核领料单
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "leaderExamine1")
+	public AjaxJson leaderExamine1(Act act) {
+		AjaxJson j = new AjaxJson();
+		actTaskService.leaderExamine(act);
+		j.setMsg("审批成功");
+		return j;
+	}
+
+
+	/**
+	 * 配网项目经理审核领料单
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "managerAudit")
+	public AjaxJson managerAudit(Act act) {
+		AjaxJson j = new AjaxJson();
+		actTaskService.managerAudit(act);
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 配网物资专职审核领料单
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "netExamine")
+	public AjaxJson netExamine(Act act) {
+		AjaxJson j = new AjaxJson();
+		actTaskService.netExamine(act);
+		j.setMsg("审批成功");
+		return j;
+	}
 
 	/**
 	 * 运行人员审核图纸

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

@@ -310,8 +310,9 @@
 			update_date,
 			remarks,
 			del_flag
-		) VALUES (
+		) VALUES
 		<foreach collection="disclose" item="item" index="index" separator="," >
+		(
 			#{item.id},
 			#{item.procInsId},
 			#{item.conId},
@@ -347,9 +348,8 @@
 			#{item.updateDate},
 			#{item.remarks},
 			#{item.delFlag}
-		</foreach>
 		)
-
+		</foreach>
 
 	</insert>
 </mapper>

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -68,18 +68,43 @@ public class PickIngController extends BaseController {
     @RequestMapping(value = "constructionLeader")
     public String constructionLeader(ShowList showList, Model model) {
         model.addAttribute("showList", showList);
-        ProjectNumber projectNumber = pickIngService.projectNumber(showList.getAct().getProcInsId());
-        model.addAttribute("projectNumber",projectNumber);
         return "modules/sg/picking/activiti/constructionLeader";
     }
 
     /**
+     * 配网项目经理审核
+     */
+    @RequestMapping(value = "managerAudit")
+    public String managerAudit(ShowList showList, Model model) {
+        model.addAttribute("showList", showList);
+        return "modules/sg/picking/activiti/managerAudit";
+    }
+
+    /**
+     * 配网物资专职审核领料单
+     */
+    @RequestMapping(value = "netExamine")
+    public String netExamine(ShowList showList, Model model) {
+        model.addAttribute("showList", showList);
+        return "modules/sg/picking/activiti/netExamine";
+    }
+
+    /**
      * 施工单位物资专职审核
      */
-    @RequestMapping(value = "fullTime")
-    public String fullTime(ShowList showList, Model model) {
+    @RequestMapping(value = "fullExamine")
+    public String fullExamine(ShowList showList, Model model) {
+        model.addAttribute("showList", showList);
+        return "modules/sg/picking/activiti/fullExamine";
+    }
+
+    /**
+     * 项目中心领导审核领料单
+     */
+    @RequestMapping(value = "leaderExamine")
+    public String leaderExamine(ShowList showList, Model model) {
         model.addAttribute("showList", showList);
-        return "modules/sg/picking/activiti/fullTime";
+        return "modules/sg/picking/activiti/leaderExamine";
     }
 
 //    constructionLeaderForm.jsp

src/main/webapp/webpage/modules/sg/picking/activiti/constructionLeader.js

@@ -134,7 +134,7 @@ $(document).ready(function() {
 		})
 
 		//驳回
-		$("#reject").click(function () {
+		$("#no").click(function () {
 			jp.prompt("驳回, 审批意见", function (message) {
 				jp.post("${ctx}/act/task/constructionLeader",
 					{
@@ -147,7 +147,6 @@ $(document).ready(function() {
 						"comment":window.encodeURI(message)
 					},
 					function (data) {
-
 						if(data.success){
 							jp.success(data.msg);
 							jp.go("${ctx}/act/task/todo")

src/main/webapp/webpage/modules/sg/picking/activiti/fullTime.js

@@ -110,6 +110,50 @@ $(document).ready(function() {
 		  $("#searchForm  select").val("");
 		  $('#informationTable').bootstrapTable('refresh');
 		});
+
+	//通过
+	$("#agree").click(function () {
+		jp.prompt("同意, 审批意见", function (message) {
+			jp.post("${ctx}/act/task/fullExamine",
+				{
+					"taskId":"${showList.act.taskId}",
+					"taskName":"${showList.act.taskName}",
+					"taskDefKey":"${showList.act.taskDefKey}",
+					"procInsId":"${showList.act.procInsId}",
+					"procDefId":"${showList.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/fullExamine",
+				{
+					"taskId":"${showList.act.taskId}",
+					"taskName":"${showList.act.taskName}",
+					"taskDefKey":"${showList.act.taskDefKey}",
+					"procInsId":"${showList.act.procInsId}",
+					"procDefId":"${showList.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/picking/activiti/fullTime.jsp

@@ -6,13 +6,13 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <meta name="decorator" content="ani"/>
     <%@ include file="/webpage/include/bootstraptable.jsp" %>
-    <%@ include file="fullTime.js"%>
+    <%@ include file="fullExamine.js"%>
 </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>
         <form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
             <input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>

src/main/webapp/webpage/modules/sg/picking/activiti/leaderExamine.js

@@ -0,0 +1,174 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	var item = "";
+	var procInsId = $("#procInsId").val();
+		console.log(procInsId);
+		//bootstrapTable加载数据
+		$('#informationTable').bootstrapTable({
+			//请求方法
+			method: 'post',
+			//类型json
+			dataType: "json",
+			contentType: "application/x-www-form-urlencoded",
+			//显示检索按钮
+			showSearch: false,
+			//显示刷新按钮
+			showRefresh: false,
+			//显示切换手机试图按钮
+			showToggle: false,
+			//显示 内容列下拉框
+			showColumns: false,
+			//显示到处按钮
+			showExport: false,
+			//显示切换分页按钮
+			showPaginationSwitch: false,
+			//最低显示2行
+			minimumCountColumns: 2,
+			//是否显示行间隔色
+			striped: true,
+			//是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+			cache: false,
+			//是否显示分页（*）
+			pagination: false,
+			//排序方式
+			sortOrder: "asc",
+			//初始化加载第一页，默认第一页
+			pageNumber: 1,
+			//每页的记录行数（*）
+			pageSize: 10,
+			//可供选择的每页的行数（*）
+			pageList: [10, 25, 50, 100],
+			//这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+			url: "${ctx}/picking/activiti/constructionData?procInsId="+procInsId,
+			//默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+			////查询参数,每次调用是会带上这个参数，可自定义
+			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',
+			onClickRow: function (row, $el) {
+			},
+			onShowSearch: function () {
+				$("#search-collapse").slideToggle();
+			},
+			formatNoMatches: function () {
+				return "你的自定义文字说明";
+			},
+			columns: [
+				{
+					field: 'materialCode',
+					title: '物料编码',
+				}, {
+					field: 'materialDescription',
+					title: '物料名称',
+				}, {
+					field: 'extensionDescription',
+					title: '扩展描述',
+				}, {
+					field: 'mdUnits',
+					title: '单位',
+				}, {
+					field: 'mdTotalAmount',
+					title: '总量',
+				}, {
+					field: 'mdSingleWeight',
+					title: '单重/kg',
+				}, {
+					field: 'mdTotalWeight',
+					title: '总重/吨',
+				}, {
+					field: 'mdTheParty',
+					title: '甲乙供',
+				}, {
+					field: 'mdText',
+					title: '备注',
+				}
+			]
+		});
+
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+		  $('#informationTable').bootstrapTable("toggleView");
+		}
+
+	// 绑定查询按扭
+	$("#search").click("click", function() {
+		  $('#informationTable').bootstrapTable('refresh');
+		});
+
+	// 绑定查询重置按扭
+	 $("#reset").click("click", function() {
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $('#informationTable').bootstrapTable('refresh');
+		});
+
+	 	//通过
+		$("#agree").click(function () {
+			jp.prompt("同意, 审批意见", function (message) {
+				jp.post("${ctx}/act/task/leaderExamine",
+					{
+						"taskId":"${showList.act.taskId}",
+						"taskName":"${showList.act.taskName}",
+						"taskDefKey":"${showList.act.taskDefKey}",
+						"procInsId":"${showList.act.procInsId}",
+						"procDefId":"${showList.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/leaderExamine",
+					{
+						"taskId":"${showList.act.taskId}",
+						"taskName":"${showList.act.taskName}",
+						"taskDefKey":"${showList.act.taskDefKey}",
+						"procInsId":"${showList.act.procInsId}",
+						"procDefId":"${showList.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($("#informationTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+    //刷新列表
+  function refresh() {
+      $('#informationTable').bootstrapTable('refresh');
+  }
+
+	function addRow(list, idx, tpl, row){
+		$(list).append(Mustache.render(tpl, {
+			idx: idx, delBtn: true, row: row
+		}));
+	}
+</script>

src/main/webapp/webpage/modules/sg/picking/activiti/leaderExamine.jsp

@@ -0,0 +1,39 @@
+<%@ 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="leaderExamine.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">项目中心领导审核领料单</h3>
+	</div>
+		<form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
+			<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
+		</form:form>
+		<div class="panel-body">
+				<table id="informationTable" data-toolbar="#toolbar" class="table"></table>
+			<div class="row">
+				<div class="col-sm-3"></div>
+				<div class="col-sm-6">
+					<div class="form-group text-center" style="text-align: center;margin-top: 20px;">
+						<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 showList.id}">
+				<act:flowChart procInsId="${showList.act.procInsId}"/>
+				<act:histoicFlow procInsId="${showList.act.procInsId}" />
+			</c:if>
+		</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/picking/activiti/managerAudit.js

@@ -0,0 +1,174 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	var item = "";
+	var procInsId = $("#procInsId").val();
+		console.log(procInsId);
+		//bootstrapTable加载数据
+		$('#informationTable').bootstrapTable({
+			//请求方法
+			method: 'post',
+			//类型json
+			dataType: "json",
+			contentType: "application/x-www-form-urlencoded",
+			//显示检索按钮
+			showSearch: false,
+			//显示刷新按钮
+			showRefresh: false,
+			//显示切换手机试图按钮
+			showToggle: false,
+			//显示 内容列下拉框
+			showColumns: false,
+			//显示到处按钮
+			showExport: false,
+			//显示切换分页按钮
+			showPaginationSwitch: false,
+			//最低显示2行
+			minimumCountColumns: 2,
+			//是否显示行间隔色
+			striped: true,
+			//是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+			cache: false,
+			//是否显示分页（*）
+			pagination: false,
+			//排序方式
+			sortOrder: "asc",
+			//初始化加载第一页，默认第一页
+			pageNumber: 1,
+			//每页的记录行数（*）
+			pageSize: 10,
+			//可供选择的每页的行数（*）
+			pageList: [10, 25, 50, 100],
+			//这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+			url: "${ctx}/picking/activiti/constructionData?procInsId="+procInsId,
+			//默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+			////查询参数,每次调用是会带上这个参数，可自定义
+			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',
+			onClickRow: function (row, $el) {
+			},
+			onShowSearch: function () {
+				$("#search-collapse").slideToggle();
+			},
+			formatNoMatches: function () {
+				return "你的自定义文字说明";
+			},
+			columns: [
+				{
+					field: 'materialCode',
+					title: '物料编码',
+				}, {
+					field: 'materialDescription',
+					title: '物料名称',
+				}, {
+					field: 'extensionDescription',
+					title: '扩展描述',
+				}, {
+					field: 'mdUnits',
+					title: '单位',
+				}, {
+					field: 'mdTotalAmount',
+					title: '总量',
+				}, {
+					field: 'mdSingleWeight',
+					title: '单重/kg',
+				}, {
+					field: 'mdTotalWeight',
+					title: '总重/吨',
+				}, {
+					field: 'mdTheParty',
+					title: '甲乙供',
+				}, {
+					field: 'mdText',
+					title: '备注',
+				}
+			]
+		});
+
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+		  $('#informationTable').bootstrapTable("toggleView");
+		}
+
+	// 绑定查询按扭
+	$("#search").click("click", function() {
+		  $('#informationTable').bootstrapTable('refresh');
+		});
+
+	// 绑定查询重置按扭
+	 $("#reset").click("click", function() {
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $('#informationTable').bootstrapTable('refresh');
+		});
+
+	 	//通过
+		$("#agree").click(function () {
+			jp.prompt("同意, 审批意见", function (message) {
+				jp.post("${ctx}/act/task/managerAudit",
+					{
+						"taskId":"${showList.act.taskId}",
+						"taskName":"${showList.act.taskName}",
+						"taskDefKey":"${showList.act.taskDefKey}",
+						"procInsId":"${showList.act.procInsId}",
+						"procDefId":"${showList.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/managerAudit",
+					{
+						"taskId":"${showList.act.taskId}",
+						"taskName":"${showList.act.taskName}",
+						"taskDefKey":"${showList.act.taskDefKey}",
+						"procInsId":"${showList.act.procInsId}",
+						"procDefId":"${showList.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($("#informationTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+    //刷新列表
+  function refresh() {
+      $('#informationTable').bootstrapTable('refresh');
+  }
+
+	function addRow(list, idx, tpl, row){
+		$(list).append(Mustache.render(tpl, {
+			idx: idx, delBtn: true, row: row
+		}));
+	}
+</script>

src/main/webapp/webpage/modules/sg/picking/activiti/managerAudit.jsp

@@ -0,0 +1,39 @@
+<%@ 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="managerAudit.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">配网项目经理审核领料单</h3>
+	</div>
+		<form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
+			<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
+		</form:form>
+		<div class="panel-body">
+				<table id="informationTable" data-toolbar="#toolbar" class="table"></table>
+			<div class="row">
+				<div class="col-sm-3"></div>
+				<div class="col-sm-6">
+					<div class="form-group text-center" style="text-align: center;margin-top: 20px;">
+						<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 showList.id}">
+				<act:flowChart procInsId="${showList.act.procInsId}"/>
+				<act:histoicFlow procInsId="${showList.act.procInsId}" />
+			</c:if>
+		</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/picking/activiti/netExamine.js

@@ -0,0 +1,174 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	var item = "";
+	var procInsId = $("#procInsId").val();
+		console.log(procInsId);
+		//bootstrapTable加载数据
+		$('#informationTable').bootstrapTable({
+			//请求方法
+			method: 'post',
+			//类型json
+			dataType: "json",
+			contentType: "application/x-www-form-urlencoded",
+			//显示检索按钮
+			showSearch: false,
+			//显示刷新按钮
+			showRefresh: false,
+			//显示切换手机试图按钮
+			showToggle: false,
+			//显示 内容列下拉框
+			showColumns: false,
+			//显示到处按钮
+			showExport: false,
+			//显示切换分页按钮
+			showPaginationSwitch: false,
+			//最低显示2行
+			minimumCountColumns: 2,
+			//是否显示行间隔色
+			striped: true,
+			//是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+			cache: false,
+			//是否显示分页（*）
+			pagination: false,
+			//排序方式
+			sortOrder: "asc",
+			//初始化加载第一页，默认第一页
+			pageNumber: 1,
+			//每页的记录行数（*）
+			pageSize: 10,
+			//可供选择的每页的行数（*）
+			pageList: [10, 25, 50, 100],
+			//这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+			url: "${ctx}/picking/activiti/constructionData?procInsId="+procInsId,
+			//默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+			////查询参数,每次调用是会带上这个参数，可自定义
+			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',
+			onClickRow: function (row, $el) {
+			},
+			onShowSearch: function () {
+				$("#search-collapse").slideToggle();
+			},
+			formatNoMatches: function () {
+				return "你的自定义文字说明";
+			},
+			columns: [
+				{
+					field: 'materialCode',
+					title: '物料编码',
+				}, {
+					field: 'materialDescription',
+					title: '物料名称',
+				}, {
+					field: 'extensionDescription',
+					title: '扩展描述',
+				}, {
+					field: 'mdUnits',
+					title: '单位',
+				}, {
+					field: 'mdTotalAmount',
+					title: '总量',
+				}, {
+					field: 'mdSingleWeight',
+					title: '单重/kg',
+				}, {
+					field: 'mdTotalWeight',
+					title: '总重/吨',
+				}, {
+					field: 'mdTheParty',
+					title: '甲乙供',
+				}, {
+					field: 'mdText',
+					title: '备注',
+				}
+			]
+		});
+
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+		  $('#informationTable').bootstrapTable("toggleView");
+		}
+
+	// 绑定查询按扭
+	$("#search").click("click", function() {
+		  $('#informationTable').bootstrapTable('refresh');
+		});
+
+	// 绑定查询重置按扭
+	 $("#reset").click("click", function() {
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $('#informationTable').bootstrapTable('refresh');
+		});
+
+	 	//通过
+		$("#agree").click(function () {
+			jp.prompt("同意, 审批意见", function (message) {
+				jp.post("${ctx}/act/task/netExamine",
+					{
+						"taskId":"${showList.act.taskId}",
+						"taskName":"${showList.act.taskName}",
+						"taskDefKey":"${showList.act.taskDefKey}",
+						"procInsId":"${showList.act.procInsId}",
+						"procDefId":"${showList.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/netExamine",
+					{
+						"taskId":"${showList.act.taskId}",
+						"taskName":"${showList.act.taskName}",
+						"taskDefKey":"${showList.act.taskDefKey}",
+						"procInsId":"${showList.act.procInsId}",
+						"procDefId":"${showList.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($("#informationTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+    //刷新列表
+  function refresh() {
+      $('#informationTable').bootstrapTable('refresh');
+  }
+
+	function addRow(list, idx, tpl, row){
+		$(list).append(Mustache.render(tpl, {
+			idx: idx, delBtn: true, row: row
+		}));
+	}
+</script>

src/main/webapp/webpage/modules/sg/picking/activiti/netExamine.jsp

@@ -0,0 +1,39 @@
+<%@ 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="netExamine.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">配网物资专职审核领料单</h3>
+	</div>
+		<form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
+			<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
+		</form:form>
+		<div class="panel-body">
+				<table id="informationTable" data-toolbar="#toolbar" class="table"></table>
+			<div class="row">
+				<div class="col-sm-3"></div>
+				<div class="col-sm-6">
+					<div class="form-group text-center" style="text-align: center;margin-top: 20px;">
+						<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 showList.id}">
+				<act:flowChart procInsId="${showList.act.procInsId}"/>
+				<act:histoicFlow procInsId="${showList.act.procInsId}" />
+			</c:if>
+		</div>
+	</div>
+	</div>
+</body>
+</html>