施工验收流程修改

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

@@ -2824,7 +2824,7 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
-	 * 施工单位项目经理非涉电开工流程提交文件
+	 * 施工单位项目经理土建施工中流程提交文件
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -2839,12 +2839,161 @@ public class ActTaskService extends BaseService {
 		//根据流程实例id查询项目的相关信息
 		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
 		//根据项目设置的流转人员，流转对应人员
-		vars.put("manager", user.getConstructionUnitManage());
+		vars.put("manager", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 施工单位项目经理电气施工中流程提交文件
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void electricalMiddleTask(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", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
 	/**
-	 * 施工单位项目经理非涉电开工流程提交文件
+	 * 电气竣工流程
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void electricalEndTask(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", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 审核土建施工流程
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void nonRePowerMiddleTask(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());
+		vars.put("pass", "yes".equals(flag)? true : false);
+		if ("yes".equals(flag)) {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName());
+		} else {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName());
+		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+
+	/**
+	 * 审核土建竣工流程
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void nonRePowerEndTask(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());
+		vars.put("pass", "yes".equals(flag)? true : false);
+		if ("yes".equals(flag)) {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
+		} else {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName());
+		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 审核电气竣工流程
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void reElectricalEndTask(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());
+		vars.put("pass", "yes".equals(flag)? true : false);
+		if ("yes".equals(flag)) {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
+		} else {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName());
+		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 审核土建施工流程
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void reElectricalMiddleTask(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());
+		vars.put("pass", "yes".equals(flag)? true : false);
+		if ("yes".equals(flag)) {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName());
+		} else {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName());
+		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 土建竣工流程
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -2859,7 +3008,7 @@ public class ActTaskService extends BaseService {
 		//根据流程实例id查询项目的相关信息
 		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
 		//根据项目设置的流转人员，流转对应人员
-		vars.put("manager", user.getProjectManageRole());
+		vars.put("manager", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 

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

@@ -33,6 +33,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.PickingRequisitionService;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
 import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
@@ -1490,7 +1491,7 @@ public class ActTaskController extends BaseController {
 	}
 
 	/**
-	 * 施工单位项目经理非涉电施工中流程提交文件
+	 * 施工单位项目经理土建施工中流程提交文件
 	 * */
 	@ResponseBody
 	@RequestMapping(value = "nonPowerMiddleTask")
@@ -1500,7 +1501,7 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
-				uploadImages.setImgName("上传非涉电施工中流程");
+				uploadImages.setImgName(imgName);
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -1515,17 +1516,122 @@ public class ActTaskController extends BaseController {
 	}
 
 	/**
-	 * 施工单位项目经理非涉电竣工流程提交文件
+	 * 施工单位项目经理电气施工中流程提交文件
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "electricalMiddleTask")
+	public AjaxJson electricalMiddleTask(Act act,String pic,String imgName, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName(imgName);
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.electricalMiddleTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 审核土建施工流程
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "nonRePowerMiddleTask")
+	public AjaxJson nonRePowerMiddleTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		String comment = null;
+		try {
+			comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.nonRePowerMiddleTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 审核土建竣工流程
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "nonRePowerEndTask")
+	public AjaxJson nonRePowerEndTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		String comment = null;
+		try {
+			comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.nonRePowerEndTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 电气竣工流程
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "electricalEndTask")
+	public AjaxJson electricalEndTask(Act act,String pic,String imgName, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName(imgName);
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.electricalEndTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+
+	@ResponseBody
+	@RequestMapping(value = "reElectricalEndTask")
+	public AjaxJson reElectricalEndTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		String comment = null;
+		try {
+			comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.reElectricalEndTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 土建竣工流程
 	 * */
 	@ResponseBody
 	@RequestMapping(value = "nonPowerEndTask")
-	public AjaxJson nonPowerEndTask(Act act,String pic, UploadImages uploadImages) {
+	public AjaxJson nonPowerEndTask(Act act,String pic,String imgName, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
-				uploadImages.setImgName("上传非涉电竣工流程");
+				uploadImages.setImgName(imgName);
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -1540,7 +1646,7 @@ public class ActTaskController extends BaseController {
 	}
 
 	/**
-	 * 配网项目经理判断是否完成非涉电工作
+	 * 配网项目经理判断是否完成土建
 	 * */
 	@ResponseBody
 	@RequestMapping(value = "reviewNonPower")
@@ -1549,6 +1655,10 @@ public class ActTaskController extends BaseController {
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
+			MaterialModule materialModule = materialModuleService.get(act.getProcInsId());
+			//设置土建完成
+			materialModule.setNonPower(0);
+
 			actTaskService.reviewNonPower(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();

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

@@ -269,6 +269,9 @@ public class MaterialModuleController extends BaseController {
             boolean contain = false;
             boolean electrical = false;
             boolean notContain = false;
+            materialModule.setNonPower(0);
+            materialModule.setElectrical(0);
+            materialModule.setPower(0);
             for (int i = 0; i < split.length; i++) {
                 if ("1".equals(split[i])) {
                     materialModule.setNonPower(1);

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

@@ -8,12 +8,6 @@
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
 	<%@include file="PowerStart.js"%>
-	<script type="text/javascript">
-
-		$(document).ready(function() {
-
-		});
-	</script>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -36,8 +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>
+						<td class="width-35 active" style="text-align: right">项目名称：</td>
+						<td class="width-35">
+								${materialShow.projectName}
+						</td>
 					</tr>
 					<tr>
 						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>

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

@@ -139,17 +139,19 @@ $(document).ready(function() {
 
 	$("#agree").click(function () {
 		var currentFileValues = $("input[name='pic']").val();
+		var imgName = $("#imgName").val();
 		if (currentFileValues == "" || currentFileValues == null) {
 			jp.error("请上传文件");
 		} else {
 			jp.prompt("审核意见", function (message) {
-				jp.post("${ctx}/act/task/nonPowerEndTask",
+				jp.post("${ctx}/act/task/electricalEndTask",
 					{
 						"taskId":"${materialModule.act.taskId}",
 						"taskName":"${materialModule.act.taskName}",
 						"taskDefKey":"${materialModule.act.taskDefKey}",
 						"procInsId":"${materialModule.act.procInsId}",
 						"procDefId":"${materialModule.act.procDefId}",
+						"imgName":imgName,
 						"flag":"yes",
 						"pic":currentFileValues,
 						"comment":window.encodeURI(message)

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

@@ -35,7 +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 active" style="text-align: right">项目名称：</td>
+						<td class="width-35">
+								${materialShow.projectName}
+						</td>
 					</tr>
 					<tr>
 						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>
@@ -43,6 +46,12 @@
 							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/materialModule"></sys:fileUpload>
 						</td>
 					</tr>
+					<tr>
+						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
+						<td class="width-35">
+							<input id="imgName" type="text" class="form-control required">
+						</td>
+					</tr>
 					</tbody>
 				</table>
 			</form:form>

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

@@ -118,17 +118,19 @@ $(document).ready(function() {
 
 	$("#agree").click(function () {
 		var currentFileValues = $("input[name='pic']").val();
+		var imgName = $("#imgName").val();
 		if (currentFileValues == "" || currentFileValues == null) {
 			jp.error("请上传文件");
 		} else {
 			jp.prompt("审核意见", function (message) {
-				jp.post("${ctx}/act/task/nonPowerMiddleTask",
+				jp.post("${ctx}/act/task/electricalMiddleTask",
 					{
 						"taskId":"${materialModule.act.taskId}",
 						"taskName":"${materialModule.act.taskName}",
 						"taskDefKey":"${materialModule.act.taskDefKey}",
 						"procInsId":"${materialModule.act.procInsId}",
 						"procDefId":"${materialModule.act.procDefId}",
+						"imgName":imgName,
 						"flag":"yes",
 						"pic":currentFileValues,
 						"comment":window.encodeURI(message)

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

@@ -30,11 +30,23 @@
 				<table class="table table-bordered">
 					<tbody>
 					<tr>
+						<td class="width-35 active" style="text-align: right">项目名称：</td>
+						<td class="width-35">
+								${materialShow.projectName}
+						</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>
 						</td>
 					</tr>
+					<tr>
+						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
+						<td class="width-35">
+							<input id="imgName" type="text" class="form-control required">
+						</td>
+					</tr>
 					</tbody>
 				</table>
 			</form:form>

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

@@ -30,14 +30,18 @@
 				<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>
+						<td class="width-35 active" style="text-align: right">项目名称：</td>
+						<td class="width-35">
+								${materialShow.projectName}
+						</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>
 						</td>
+					</tr>
+					<tr>
 						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
 						<td class="width-35">
 							<input id="imgName" type="text" class="form-control required">

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

@@ -139,6 +139,7 @@ $(document).ready(function() {
 
 	$("#agree").click(function () {
 		var currentFileValues = $("input[name='pic']").val();
+		var imgName = $("#imgName").val();
 		if (currentFileValues == "" || currentFileValues == null) {
 			jp.error("请上传文件");
 		} else {
@@ -150,6 +151,7 @@ $(document).ready(function() {
 						"taskDefKey":"${materialModule.act.taskDefKey}",
 						"procInsId":"${materialModule.act.procInsId}",
 						"procDefId":"${materialModule.act.procDefId}",
+						"imgName":imgName,
 						"flag":"yes",
 						"pic":currentFileValues,
 						"comment":window.encodeURI(message)

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

@@ -30,7 +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 active" style="text-align: right">项目名称：</td>
+						<td class="width-35">
+								${materialShow.projectName}
+						</td>
 					</tr>
 					<tr>
 						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>
@@ -38,6 +41,12 @@
 							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/materialModule"></sys:fileUpload>
 						</td>
 					</tr>
+					<tr>
+						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
+						<td class="width-35">
+							<input id="imgName" type="text" class="form-control required">
+						</td>
+					</tr>
 					</tbody>
 				</table>
 			</form:form>

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

@@ -118,6 +118,7 @@ $(document).ready(function() {
 
 	$("#agree").click(function () {
 		var currentFileValues = $("input[name='pic']").val();
+		var imgName = $("#imgName").val();
 		if (currentFileValues == "" || currentFileValues == null) {
 			jp.error("请上传文件");
 		} else {
@@ -129,6 +130,7 @@ $(document).ready(function() {
 						"taskDefKey":"${materialModule.act.taskDefKey}",
 						"procInsId":"${materialModule.act.procInsId}",
 						"procDefId":"${materialModule.act.procDefId}",
+						"imgName":imgName,
 						"flag":"yes",
 						"pic":currentFileValues,
 						"comment":window.encodeURI(message)

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

@@ -30,11 +30,23 @@
 				<table class="table table-bordered">
 					<tbody>
 					<tr>
+						<td class="width-35 active" style="text-align: right">项目名称：</td>
+						<td class="width-35">
+								${materialShow.projectName}
+						</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>
 						</td>
 					</tr>
+					<tr>
+						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
+						<td class="width-35">
+							<input id="imgName" type="text" class="form-control required">
+						</td>
+					</tr>
 					</tbody>
 				</table>
 			</form:form>

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

@@ -30,13 +30,18 @@
 				<table class="table table-bordered">
 					<tbody>
 					<tr>
-						<td class="width-35 active" style="text-align: right">项目名称：${materialShow.projectName}</td>
+						<td class="width-35 active" style="text-align: right">项目名称：</td>
+						<td class="width-35">
+								${materialShow.projectName}
+						</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>
 						</td>
+					</tr>
+					<tr>
 						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
 						<td class="width-35">
 							<input id="imgName" type="text" class="form-control required">

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

@@ -138,30 +138,45 @@ $(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/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")
-						}
-					})
-			});
-		}
+		jp.prompt("审核意见", function (message) {
+			jp.post("${ctx}/act/task/nonRePowerEndTask",
+				{
+					"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/nonRePowerEndTask",
+				{
+					"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")
+					}
+				})
+		});
 	});
 });
 		

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

@@ -8,11 +8,7 @@
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
 	<%@include file="nonRePowerEnd.js"%>
-	<script type="text/javascript">
-		$(document).ready(function() {
 
-		});
-	</script>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -32,25 +28,13 @@
 				<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>
-					</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>
-						</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="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>

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

@@ -117,30 +117,45 @@ $(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/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")
-						}
-					})
-			});
-		}
+		jp.prompt("审核意见", function (message) {
+			jp.post("${ctx}/act/task/nonRePowerMiddleTask",
+				{
+					"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/nonRePowerMiddleTask",
+				{
+					"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")
+					}
+				})
+		});
 	});
 });
 		

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

@@ -27,22 +27,13 @@
 				<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-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>
-					</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="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>

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

@@ -129,7 +129,7 @@ $(document).ready(function() {
 	  $("#search").click("click", function() {// 绑定查询按扭
 		  $('#testPicTable').bootstrapTable('refresh');
 		});
-	 
+
 	 $("#reset").click("click", function() {// 绑定查询按扭
 		  $("#searchForm  input").val("");
 		  $("#searchForm  select").val("");
@@ -138,30 +138,45 @@ $(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/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")
-						}
-					})
-			});
-		}
+		jp.prompt("审核意见", function (message) {
+			jp.post("${ctx}/act/task/reElectricalEndTask",
+				{
+					"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/reElectricalEndTask",
+				{
+					"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")
+					}
+				})
+		});
 	});
 });
 		

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

@@ -8,11 +8,7 @@
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
 	<%@include file="reElectricalEnd.js"%>
-	<script type="text/javascript">
-		$(document).ready(function() {
 
-		});
-	</script>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -32,25 +28,13 @@
 				<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>
-					</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>
-						</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="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>

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

@@ -117,30 +117,45 @@ $(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/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")
-						}
-					})
-			});
-		}
+		jp.prompt("审核意见", function (message) {
+			jp.post("${ctx}/act/task/reElectricalMiddleTask",
+				{
+					"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/reElectricalMiddleTask",
+				{
+					"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")
+					}
+				})
+		});
 	});
 });
 		

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

@@ -7,7 +7,7 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="nonRePowerMiddle.js"%>
+	<%@include file="reElectricalMiddle.js"%>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -27,22 +27,13 @@
 				<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-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>
-					</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="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>

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

@@ -30,8 +30,8 @@
 				<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>
+							<td class="width-35 active" style="text-align: right">项目名称：</td>
+							<td class="width-35">${materialShow.projectName}</td>
 						</tr>
 					</tbody>
 				</table>

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

@@ -30,8 +30,8 @@
 				<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>
+							<td class="width-35 active" style="text-align: right">项目名称：</td>
+							<td class="width-35">${materialShow.projectName}</td>
 						</tr>
 					</tbody>
 				</table>