工作流程 政策处理，项目关闭

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

@@ -763,7 +763,7 @@ public class ActTaskController extends BaseController {
 				}
 			}
 			if ("空".equals(flagDeal)) {
-				s += "政策类型不能未空";
+				s += "政策类型不能为空";
 				flag = true;
 			}
 /*			if (flagDeal){

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

@@ -303,10 +303,13 @@ public class ConstructionController extends BaseController {
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/receiptForm";
     }
-
+    /*
+        项目经理
+     */
+    @RequestMapping(value = "phaseManagerForm")
     public String phaseManagerForm(Construction construction, Model model){
         model.addAttribute("construction",construction);
-        return "modules/sg/managementcenter/activiti/phaseManagerForm";
+        return "modules/sg/managementcenter/activiti/phaseManageForm";
     }
     /**
      * 上传缴费单

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

@@ -42,6 +42,7 @@
                 })
 			});
 			$("#no").click(function () {
+                var fullName = $("#loginName").val();
 				jp.prompt("驳回", function (message) {
 					jp.post("${ctx}/act/task/coveredTask",
 							{
@@ -50,7 +51,7 @@
 								"taskDefKey": "${construction.act.taskDefKey}",
 								"procInsId": "${construction.act.procInsId}",
 								"procDefId": "${construction.act.procDefId}",
-								"fullName":"政策处理2",
+								"fullName":"项目经理",
 								"flag": "no",
 								"comment": window.encodeURI(message)
 							},
@@ -95,18 +96,19 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
-								<td class="width-35">
-									<sys:userselect roleName="配网政策处理专职"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-													loginName="loginName" loginValue="政策处理2" cssClass="form-control required"/>
-								</td>
-							</tr>
-							<tr>
 								<td class="width-15 active"><label class="pull-right">上传未盖章施工方案：</label></td>
 								<td class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
+								<%--<td class="width-15 active"><label class="pull-right">选择用户：</label></td>--%>
+								<%--<td class="width-35">--%>
+									<%--<sys:userselect roleName="配网政策处理专职"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"--%>
+													<%--loginName="loginName" loginValue="政策处理2" cssClass="form-control required"/>--%>
+								<%--</td>--%>
 							</tr>
+							<%--<tr>--%>
+								<%----%>
+							<%--</tr>--%>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
 								<td class="width-35">
@@ -276,10 +278,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -380,10 +382,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

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

@@ -250,10 +250,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

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

@@ -18,7 +18,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-							"fullTime":systemfulltime,
+							"fullTime":"专职",
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -100,12 +100,12 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
-								<td class="width-35">
-									<sys:userselect roleName="配网工程专职;配网系统专职" id="tuser" name="tuser.id" value="${construction.tuser.id}" loginName="loginName" loginValue="系统专职"
-													labelName="tuser.name" labelValue="${construction.tuser.name}"
-													cssClass="form-control required"/>
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right">选择用户：</label></td>--%>
+								<%--<td class="width-35">--%>
+									<%--<sys:userselect roleName="配网工程专职;配网系统专职" id="tuser" name="tuser.id" value="${construction.tuser.id}" loginName="loginName" loginValue="系统专职"--%>
+													<%--labelName="tuser.name" labelValue="${construction.tuser.name}"--%>
+													<%--cssClass="form-control required"/>--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
@@ -276,10 +276,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

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

@@ -18,7 +18,7 @@
 						"taskDefKey":"${construction.act.taskDefKey}",
 						"procInsId":"${construction.act.procInsId}",
 						"procDefId":"${construction.act.procDefId}",
-                        "fullName":"",
+                        "fullName":"施工单位",
 						"flag":"yes",
 						"comment":window.encodeURI(message)
 					},
@@ -262,10 +262,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -366,10 +366,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

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

@@ -263,10 +263,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -367,10 +367,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -410,7 +410,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-									<%--<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="不在发起" />--%>
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

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

@@ -268,10 +268,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -372,10 +372,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

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

@@ -18,7 +18,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "fullName":"配网运行",
+                            "fullName":"运行人员",
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -275,10 +275,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>