瀏覽代碼

项目显示根据不同划分显示,项目基本信息删除,现在可以删除该项目的所有信息,包括流程信息和基础信息

[user3] 4 年之前
父節點
當前提交
23c4e4c2cc
共有 36 個文件被更改,包括 4321 次插入490 次删除
  1. 57 0
      src/main/java/com/jeeplus/modules/act/service/ActTaskService.java
  2. 51 0
      src/main/java/com/jeeplus/modules/act/web/ActTaskController.java
  3. 1 1
      src/main/java/com/jeeplus/modules/sg/advence/activiti/mapper/xml/AdvanceMapper.xml
  4. 6 3
      src/main/java/com/jeeplus/modules/sg/advence/activiti/web/AdvanceController.java
  5. 27 1
      src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java
  6. 2 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/service/MaterialInfoService.java
  7. 64 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/MaterialProjectMapper.java
  8. 57 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/xml/MaterialProjectMapper.xml
  9. 53 1
      src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/service/MaterialProjectService.java
  10. 136 30
      src/main/java/com/jeeplus/modules/sg/scheduleView/web/ScheduleViewController.java
  11. 2 2
      src/main/webapp/webpage/modules/sg/advence/activiti/constructionAdvanceForm.jsp
  12. 54 30
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/afterDistribution.jsp
  13. 156 3
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/auditDrawings.jsp
  14. 156 3
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/confirmClose.jsp
  15. 156 3
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/coveredForm.jsp
  16. 156 3
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/designUpload.jsp
  17. 54 36
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideForm.jsp
  18. 156 3
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/documentsForm.jsp
  19. 54 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/engineering.jsp
  20. 54 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/importTable.jsp
  21. 54 30
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerUploadList.jsp
  22. 573 0
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/needAdministrativeOffice.jsp
  23. 573 0
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/needCivilOffice.jsp
  24. 573 0
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/needRuralOffice.jsp
  25. 54 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorDesignChange.jsp
  26. 54 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadAfter.jsp
  27. 54 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadList.jsp
  28. 156 3
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/receiptForm.jsp
  29. 93 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralFiles.jsp
  30. 93 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralJudge.jsp
  31. 93 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralLoan.jsp
  32. 93 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralOffice.jsp
  33. 93 33
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralPays.jsp
  34. 156 3
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/sealForm.jsp
  35. 156 3
      src/main/webapp/webpage/modules/sg/managementcenter/activiti/singleForm.jsp
  36. 1 2
      src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectList.js

+ 57 - 0
src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -3622,6 +3622,63 @@ public class ActTaskService extends BaseService {
         complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
     }
 
+    /**
+     * 是否需要行政政处
+     */
+    @Transactional(readOnly = false)
+    public void needAdministrativeOffice(Act act) {
+        Map<String, Object> vars = Maps.newHashMap();
+        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        String flag = act.getFlag();
+        vars.put("pass", "yes".equals(flag) ? true : false);
+        if ("yes".equals(flag)) {
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        if ("no".equals(flag)) {
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        // 设置意见
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
+    @Transactional(readOnly = false)
+    public void needCivilOffice(Act act) {
+        Map<String, Object> vars = Maps.newHashMap();
+        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        String flag = act.getFlag();
+        vars.put("pass", "yes".equals(flag) ? true : false);
+        if ("yes".equals(flag)) {
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        if ("no".equals(flag)) {
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        // 设置意见
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
+    @Transactional(readOnly = false)
+    public void needRuralOffice(Act act) {
+        Map<String, Object> vars = Maps.newHashMap();
+        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        String flag = act.getFlag();
+        vars.put("pass", "yes".equals(flag) ? true : false);
+        if ("yes".equals(flag)) {
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        if ("no".equals(flag)) {
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        // 设置意见
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
     @Transactional(readOnly = false)
     public void ruralFiles(Act act, Construction construction) {
         Map<String, Object> vars = Maps.newHashMap();

+ 51 - 0
src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -609,6 +609,57 @@ public class ActTaskController extends BaseController {
         j.setMsg("审批成功");
         return j;
     }
+    /**
+     * 是否需要行政政处
+     */
+    @ResponseBody
+    @RequestMapping(value = "needAdministrativeOffice")
+    public AjaxJson needAdministrativeOffice(Act act) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.needAdministrativeOffice(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+    /**
+     * 是否需要民事政处
+     */
+    @ResponseBody
+    @RequestMapping(value = "needCivilOffice")
+    public AjaxJson needCivilOffice(Act act) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.needCivilOffice(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+    /**
+     * 是否需要农村政处
+     */
+    @ResponseBody
+    @RequestMapping(value = "needRuralOffice")
+    public AjaxJson needRuralOffice(Act act) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.needRuralOffice(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
 
     /**
      * 农村上传文件

+ 1 - 1
src/main/java/com/jeeplus/modules/sg/advence/activiti/mapper/xml/AdvanceMapper.xml

@@ -119,7 +119,7 @@
 	</select>
 	<!--修改提前施工状态0未提前施工,1提前施工-->
 	<update id="updatePreConstruction">
-		update xm_project_details set preConstruction = #{preConstruction} where id = #{id};
+		update xm_material_project set preConstruction = #{preConstruction} where id = #{id};
 	</update>
 
 

+ 6 - 3
src/main/java/com/jeeplus/modules/sg/advence/activiti/web/AdvanceController.java

@@ -12,6 +12,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
 import com.jeeplus.modules.sg.advence.activiti.service.AdvanceService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
@@ -128,7 +129,7 @@ public class AdvanceController extends BaseController {
 		vars.put("noPass", false);
 		vars.put("pass", false);
 		String loginName = UserUtils.getUser().getLoginName();
-		//配网政策处理专职
+		//判断登录的人员是什么角色,决定是否发送流程是否需要
 		List<String> strings = constructionService.nameFindOffice(loginName);
 		boolean flag = false;
 		for (String a :strings) {
@@ -138,8 +139,9 @@ public class AdvanceController extends BaseController {
 		}
 		if (flag) {
 			vars.put("noPass", true);
-//			Project project1 = projectService.get(pickApplication.getProjectId());
-//			vars.put("manager", UserUtils.getByUserName(project1.getProjectManageRole()).getLoginName());
+			Project project = projectService.get(pickApplication.getProjectId());
+			Project assByName = projectService.findAssByName(project.getReserveProjectName());
+			vars.put("manager", UserUtils.getByUserName(assByName.getAssignment().getOwnerManager()).getLoginName());
 			j.setMsg("发起流程审批成功!");
 		}else {
 			vars.put("pass", true);
@@ -148,6 +150,7 @@ public class AdvanceController extends BaseController {
 		Advance advance = new Advance();
 		advance.setId(pickApplication.getProjectId());
 		advance.setPreConstruction(1);
+		//修改项目提前施工状态
 		advanceService.updatePreConstruction(advance);
 		ProcessDefinition p = actProcessService.getProcessDefinition(pickApplication.getAct().getProcDefId());
 		String title = pickApplication.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();

+ 27 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -170,7 +170,6 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "operatorDesignChange")
     public String form3(Construction construction, Model model) {
-
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/operatorDesignChange";
     }
@@ -661,6 +660,33 @@ public class ConstructionController extends BaseController {
     }
 
     /**
+     * 是否需要民事政处
+     */
+    @RequestMapping(value = "needCivilOffice")
+    public String needCivilOffice(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/needCivilOffice";
+    }
+
+    /**
+     * 是否需要行政政处
+     */
+    @RequestMapping(value = "needAdministrativeOffice")
+    public String needAdministrativeOffice(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/needAdministrativeOffice";
+    }
+
+    /**
+     * 是否需要农村政处
+     */
+    @RequestMapping(value = "needRuralOffice")
+    public String needRuralOffice(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/needRuralOffice";
+    }
+
+    /**
      * 土建工程量数据列表
      */
     @ResponseBody

+ 2 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/service/MaterialInfoService.java

@@ -94,6 +94,8 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 		materialInfoMapper.deleteByPro(projectName);
 	}
 
+
+
 	/**
 	 *物料信息合并保存
 	 */

+ 64 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/MaterialProjectMapper.java

@@ -26,5 +26,69 @@ public interface MaterialProjectMapper extends BaseMapper<MaterialProject> {
 
     List<MaterialProject> findJugdeReserve(MaterialProject materialProject);
 
+    /**
+     * 删除施工交底流程信息(xm_construction_clarificaiton)
+     * @param reserveProjectName 储备项目名称
+     * */
+    void deleteConstruction(String reserveProjectName);
 
+    /**
+     * 删除拆旧表信息(xm_tear_down)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteXmTearDown(String reserveProjectName);
+
+    /**
+     * 删除土建工程量信息(xm_engineering_amount)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteEngineeringAmount(String reserveProjectName);
+
+    /**
+     * 删除其它工程量信息(xm_other_amount)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteOtherAmount(String reserveProjectName);
+
+    /**
+     * 删除物资领料流程信息(md_acquisition_process)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteAcqProcess(String reserveProjectName);
+
+    /**
+     * 删除土建流程信息(xm_nonpower_process)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteNonProcess(String reserveProjectName);
+
+    /**
+     * 删除施工验收(电气)流程信息(sg_construction_process)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteConProcess(String reserveProjectName);
+
+    /**
+     * 删除转资流程信息(xm_fund_process)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteFundProcess(String reserveProjectName);
+
+    /**
+     * 结算验收流程信息(xm_settlement_process)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteSettProcess(String reserveProjectName);
+
+    /**
+     * 删除施工验收流程-上传签字版政策处理清单/缴费单(xm_construction_upload)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteConUpload(String reserveProjectName);
+
+    /**
+     * 删除项目上传信息(xm_upload_images)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteUploadImages(String reserveProjectName);
 }

+ 57 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/xml/MaterialProjectMapper.xml

@@ -24,6 +24,7 @@
     </sql>
 
 
+
     <select id="get" resultType="MaterialProject">
         SELECT
         <include refid="infoColumns"/>
@@ -343,4 +344,60 @@
         from xm_material_project
     </select>
 
+    <delete id="deleteConstruction">
+        delete
+        from xm_construction_clarificaiton
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteXmTearDown">
+        delete
+        from xm_tear_down
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteEngineeringAmount">
+        delete
+        from xm_engineering_amount
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteOtherAmount">
+        delete
+        from xm_other_amount
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteAcqProcess">
+        delete
+        from md_acquisition_process
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteNonProcess">
+        delete
+        from xm_nonpower_process
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteConProcess">
+        delete
+        from sg_construction_process
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteFundProcess">
+        delete
+        from xm_fund_process
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteSettProcess">
+        delete
+        from xm_settlement_process
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteConUpload">
+        delete
+        from xm_construction_upload
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteUploadImages">
+        delete
+        from xm_upload_images
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+
 </mapper>

+ 53 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/service/MaterialProjectService.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.sg.managementcenter.materialproject.service;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.materialinfo.mapper.MaterialInfoMapper;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.service.MaterialInfoService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject;
 import com.jeeplus.modules.sg.managementcenter.materialproject.mapper.MaterialProjectMapper;
@@ -23,6 +24,8 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 	private MaterialProjectMapper materialProjectMapper;
 	@Autowired
 	private MaterialInfoService materialInfoService;
+	@Autowired
+	private MaterialInfoMapper materialInfoMapper;
 
 	@Override
 	public MaterialProject get(String id) {
@@ -57,8 +60,57 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 	@Override
 	@Transactional(readOnly = false)
 	public void delete(MaterialProject materialProject) {
+		//项目项目信息(包含多次涉电的信息)
 		super.delete(materialProject);
-		materialInfoService.deleteByPro(materialProject.getReserveProjectName());
+		String reserveProjectName = materialProject.getReserveProjectName();
+		//删除年度物资上报信息-中间态
+		materialInfoMapper.deleteByPro(reserveProjectName);
+		//删除年度物资上报信息
+		materialInfoMapper.deleteByOld(reserveProjectName);
+		/**
+		 * 删除施工交底流程信息(xm_construction_clarificaiton)
+		 * */
+		materialProjectMapper.deleteConstruction(reserveProjectName);
+		/**
+		 * 删除拆旧表信息(xm_tear_down)
+		 */
+		materialProjectMapper.deleteXmTearDown(reserveProjectName);
+		/**
+		 * 删除土建工程量信息(xm_engineering_amount)
+		 */
+		materialProjectMapper.deleteEngineeringAmount(reserveProjectName);
+		/**
+		 * 删除其它工程量信息(xm_other_amount)
+		 */
+		materialProjectMapper.deleteOtherAmount(reserveProjectName);
+		/**
+		 * 删除物资领料流程信息(md_acquisition_process)
+		 */
+		materialProjectMapper.deleteAcqProcess(reserveProjectName);
+		/**
+		 * 删除土建流程信息(xm_nonpower_process)
+		 */
+		materialProjectMapper.deleteNonProcess(reserveProjectName);
+		/**
+		 * 删除施工验收(电气)流程信息(sg_construction_process)
+		 */
+		materialProjectMapper.deleteConProcess(reserveProjectName);
+		/**
+		 * 删除转资流程信息(xm_fund_process)
+		 */
+		materialProjectMapper.deleteFundProcess(reserveProjectName);
+		/**
+		 * 结算验收流程信息(xm_settlement_process)
+		 */
+		materialProjectMapper.deleteSettProcess(reserveProjectName);
+		/**
+		 * 删除施工验收流程-上传签字版政策处理清单/缴费单(xm_construction_upload)
+		 */
+		materialProjectMapper.deleteConUpload(reserveProjectName);
+		/**
+		 * 删除项目上传信息(xm_upload_images)
+		 */
+		materialProjectMapper.deleteUploadImages(reserveProjectName);
 	}
 
 	//文件导入

+ 136 - 30
src/main/java/com/jeeplus/modules/sg/scheduleView/web/ScheduleViewController.java

@@ -197,15 +197,39 @@ public class ScheduleViewController extends BaseController {
         List<ScheduleView> list = scheduleViewPage.getList();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String fin = "";
+        boolean flag;
+        boolean designFlag;
+        boolean closeFlag;
+        boolean policyStart1;
+        boolean policyStart2;
+        boolean policyStart3;
+        boolean policyEnd1;
+        boolean policyEnd2;
+        boolean policyEnd3;
+        boolean policy1;
+        boolean policy2;
+        boolean policy3;
         for (ScheduleView s : list) {
+            flag = false;
+            designFlag = false;
+            closeFlag = false;
+            policyStart1 = false;
+            policyStart2 = false;
+            policyStart3 = false;
+            policyEnd1 = false;
+            policyEnd2 = false;
+            policyEnd3 = false;
+            policy1 = false;
+            policy2 = false;
+            policy3 = false;
             String procInsId = s.getProcInsId();
             if (procInsId != null && !"".equals(procInsId)) {
                 List<HistoricActivityInstance> historicActivityInstances = MyActiviUtils.hisTask(procInsId);
-                List<Task> tasks = MyActiviUtils.runNowTask(procInsId);
+/*                List<Task> tasks = MyActiviUtils.runNowTask(procInsId);
                 String runNowName = "";
                 for (Task a : tasks) {
                     runNowName += a.getName();
-                }
+                }*/
                 for (HistoricActivityInstance a : historicActivityInstances) {
                     String activityName = a.getActivityName();
                     String format = formatter.format(a.getEndTime());
@@ -242,50 +266,132 @@ public class ScheduleViewController extends BaseController {
                             fin = format;
                         }
                     }
-                    //设计变更
-                    if ("交底:配网项目经理判定设计变更".equals(activityName)
-                            || "交底:经研所判定是否设计变更".equals(activityName)
-                            || "交底:运行单位经理审核方案".equals(activityName)
-                            || "交底:设计单位人员重新设计".equals(activityName)
-                            || "交底:运行经理审核设计变更后".equals(activityName)
-                            || "交底:配网经理审核设计变更后".equals(activityName)
-                    ) {
-                        s.getDisView().setDesignChange("设计变更流程中");
-                    }
-                    //项目关闭
-                    if ("交底:项目经理判定是否关闭".equals(activityName)
-                            || "交底:配网工程专职判定是否关闭".equals(activityName)
-                            || "交底:配网运行人员判定是否关闭".equals(activityName)
-                            || "交底:配网工程专职判定变更或关闭".equals(activityName)
-                            || "交底:配网系统专职确认系统关闭".equals(activityName)
-                            || "交底:配网项目经理判定变更或关闭".equals(activityName)
-                    ) {
-                        s.getDisView().setProjectClosure("项目关闭流程中");
+
+
+                        //设计变更
+                        if ("交底:配网项目经理判定设计变更".equals(activityName)
+                                || "交底:经研所判定是否设计变更".equals(activityName)
+                                || "交底:运行单位经理审核方案".equals(activityName)
+                                || "交底:设计单位人员重新设计".equals(activityName)
+                                || "交底:运行经理审核设计变更后".equals(activityName)
+                                || "交底:配网经理审核设计变更后".equals(activityName)
+                        ) {
+                            s.getDisView().setDesignChange("设计变更流程中");
+                        }
+                        //项目关闭
+                        if ("交底:项目经理判定是否关闭".equals(activityName)
+                                || "交底:配网工程专职判定是否关闭".equals(activityName)
+                                || "交底:配网运行人员判定是否关闭".equals(activityName)
+                                || "交底:配网工程专职判定变更或关闭".equals(activityName)
+                                || "交底:配网系统专职确认系统关闭".equals(activityName)
+                                || "交底:配网项目经理判定变更或关闭".equals(activityName)
+                        ) {
+                            s.getDisView().setProjectClosure("项目关闭流程中");
+                        }
+
+                    //如果因为各种原因完成了设计变更流程或者项目关闭流程
+                    if ("交底:导入材料表和拆旧物资表".equals(activityName)) {
+                        flag = true;
+                    }
+
+                    if ("交底:配网项目经理判定设计变更".equals(activityName)) {
+                        designFlag = true;
                     }
+
+                    if ("交底:项目经理判定是否关闭".equals(activityName)) {
+                        closeFlag = true;
+                    }
+
+
                     //政策处理
                     if ("交底:农村政处".equals(activityName)
-                            || "交底:农村专职判断".equals(activityName)
+                            || "交底:政策处理专职判断".equals(activityName)
                             || "交底:农村上传文件".equals(activityName)
-                            || "交底:农村是否支付".equals(activityName)
-                            || "交底:农村是否借款".equals(activityName)
                             || "交底:行政政处".equals(activityName)
-                            || "交底:行政专职判断".equals(activityName)
+                            || "行政:政策处理专职判断".equals(activityName)
                             || "交底:行政上传文件".equals(activityName)
-                            || "交底:行政是否支付".equals(activityName)
-                            || "交底:行政是否借款".equals(activityName)
                             || "交底:民事政处".equals(activityName)
-                            || "交底:民事专职判断".equals(activityName)
+                            || "民事:政策处理专职判断".equals(activityName)
                             || "交底:民事上传文件".equals(activityName)
-                            || "交底:民事是否支付".equals(activityName)
-                            || "交底:民事是否借款".equals(activityName)
+                            || "是否需要农村政处".equals(activityName)
+                            || "是否需要行政政处".equals(activityName)
+                            || "是否需要民事政处".equals(activityName)
                     ) {
                         s.getDisView().setPolicyType("政策处理流程中");
                     }
+                    //判断是否发起农村政处
+                    if ("交底:农村政处".equals(activityName)) {
+                        policyStart1 = true;
+                    }
+                    //判断是否发起行政政处
+                    if ("交底:行政政处".equals(activityName)) {
+                        policyStart2 = true;
+                    }
+                    //判断是否发起民事政处
+                    if ("交底:民事政处".equals(activityName)) {
+                        policyStart3 = true;
+                    }
+                    //判断农村政处是否完成
+                    if ("交底:民事是否支付".equals(activityName)
+                            || "交底:民事是否借款".equals(activityName)) {
+                        policyEnd1 = true;
+                    }
+                    //判断行政政处是否完成
+                    if ("交底:行政是否支付".equals(activityName)
+                            || "交底:行政是否借款".equals(activityName)) {
+                        policyEnd2 = true;
+                    }
+                    //判断民事政处是否完成
+                    if ("交底:农村是否支付".equals(activityName)
+                            || "交底:农村是否借款".equals(activityName)) {
+                        policyEnd3 = true;
+                    }
                 }
                 //判断项目是否完成
                 if ("2".equals(s.getStatus())) {
                     s.getDisView().setFinTime(fin);
                 }
+                //判断是否已经导入拆旧表
+                if (flag) {
+                    //判断是否发起过设计变更
+                    if (designFlag) {
+                        s.getDisView().setDesignChange("设计变更完成");
+                    }
+                    //判断是否发起过项目关闭
+                    if (closeFlag) {
+                        s.getDisView().setProjectClosure("设计变更完成");
+                    }
+                }
+                if (policyStart1) {
+                    if (policyEnd1) {
+                        policy1 = true;
+                    } else {
+                        policy1 = false;
+                    }
+                }else {
+                    policy1 = true;
+                }
+                if (policyStart2) {
+                    if (policyEnd2) {
+                        policy2 = true;
+                    } else {
+                        policy2 = false;
+                    }
+                }else {
+                    policy2 = true;
+                }
+                if (policyStart3) {
+                    if (policyEnd3) {
+                        policy3 = true;
+                    } else {
+                        policy3 = false;
+                    }
+                } else {
+                    policy3 = true;
+                }
+                if (policy1==true && policy2==true && policy3==true) {
+                    s.getDisView().setPolicyType("政策处理完成");
+                }
             }
         }
         return getBootstrapData(scheduleViewPage);

+ 2 - 2
src/main/webapp/webpage/modules/sg/advence/activiti/constructionAdvanceForm.jsp

@@ -36,8 +36,8 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称:</label></td>
 								<td class="width-35">
-									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataAdvance" id="project" name="projectId" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projectId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}|${fns:urlEncode('工程编号')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="requireName|projectId|projectName|projectNumber"  isMultiSelected="false"></sys:itemselect>
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataAdvance" id="project" name="projectId" value="${construction.reserveProjectName}" labelName="project.reserveProjectName" labelValue="${construction.reserveProjectName}"
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('储备项目名称|项目名称|项目定义号')}" fieldKeys="reserveProjectName|projectId|projectName" searchLabels="${fns:urlEncode('储备项目名称')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="reserveProjectName|projectName|projectId"  isMultiSelected="false"></sys:itemselect>
 								</td>
 							</tr>
 							<tr>

+ 54 - 30
src/main/webapp/webpage/modules/sg/managementcenter/activiti/afterDistribution.jsp

@@ -182,7 +182,10 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                             </td>
@@ -192,7 +195,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                            <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.isImplement)}
                             </td>
@@ -202,6 +205,9 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -232,6 +238,9 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -262,7 +271,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                            <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                             </td>
@@ -293,28 +302,30 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                            <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                             </td>
+
                         </tr>
                         <tr>
-
-                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
                             </td>
                         </tr>
                         <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -325,60 +336,71 @@
                             </td>
                         </tr>
                         <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                            <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
-                            </td>
+
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                         </tr>
                         <tr>
-
-                            <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                            <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                            </td>
                             <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                             </td>
-                        </tr>
-                        <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.customizedCan)}
                             </td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                             </td>
-                        </tr>
-                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.materialDescription)}
                             </td>
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                             </td>
-                        </tr>
-                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.modelDescription)}
                             </td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -400,7 +422,9 @@
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.nearLiveLine)}

+ 156 - 3
src/main/webapp/webpage/modules/sg/managementcenter/activiti/auditDrawings.jsp

@@ -204,7 +204,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -214,7 +217,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -224,6 +227,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -254,6 +260,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -284,7 +293,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -314,6 +323,150 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 156 - 3
src/main/webapp/webpage/modules/sg/managementcenter/activiti/confirmClose.jsp

@@ -155,7 +155,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -165,7 +168,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -175,6 +178,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -205,6 +211,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -235,7 +244,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -265,6 +274,150 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 156 - 3
src/main/webapp/webpage/modules/sg/managementcenter/activiti/coveredForm.jsp

@@ -176,7 +176,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -186,7 +189,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -196,6 +199,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -226,6 +232,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -256,7 +265,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -286,6 +295,150 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 156 - 3
src/main/webapp/webpage/modules/sg/managementcenter/activiti/designUpload.jsp

@@ -185,7 +185,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -195,7 +198,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -205,6 +208,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -235,6 +241,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -265,7 +274,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -295,6 +304,150 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 54 - 36
src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideForm.jsp

@@ -206,7 +206,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                             </td>
@@ -216,7 +219,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -226,6 +229,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -256,6 +262,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -286,7 +295,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -317,29 +326,30 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                                 </td>
+
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -350,62 +360,71 @@
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
-                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                                </td>
                                 <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedCan)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.materialDescription)}
                                 </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.modelDescription)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -427,7 +446,9 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
@@ -451,9 +472,6 @@
                             </tbody>
                         </table>
                     </form:form>
-
-
-                    <%--<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && construction.act.isNextGatewaty}">--%>
                     <div class="row">
                         <div class="col-sm-3"></div>
                         <div class="col-sm-6">

+ 156 - 3
src/main/webapp/webpage/modules/sg/managementcenter/activiti/documentsForm.jsp

@@ -176,8 +176,11 @@
                                         ${fns:unescapeHtml(construction.basicInformation.workAreaRemarks)}
                                 </td>
                             </tr>
+                            是否已实施    <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -187,7 +190,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -197,6 +200,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -227,6 +233,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -257,7 +266,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -287,6 +296,150 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 54 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/engineering.jsp

@@ -155,7 +155,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -165,7 +168,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -175,6 +178,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -205,6 +211,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -235,7 +244,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -266,29 +275,30 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                                 </td>
+
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -299,62 +309,71 @@
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
-                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                                </td>
                                 <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedCan)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.materialDescription)}
                                 </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.modelDescription)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -376,7 +395,9 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.nearLiveLine)}

+ 54 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/importTable.jsp

@@ -146,7 +146,10 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+								<td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.hasImplemented)}
 								</td>
@@ -156,7 +159,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+								<td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.isImplement)}
 								</td>
@@ -166,6 +169,9 @@
 								</td>
 							</tr>
 							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -196,6 +202,9 @@
 								</td>
 							</tr>
 							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -226,7 +235,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+								<td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
 								</td>
@@ -257,29 +266,30 @@
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.difficultResolve)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+								<td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.designChanges)}
+										${fns:unescapeHtml(construction.disclose.affairsDescription)}
 								</td>
+
 							</tr>
 							<tr>
-
-								<td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+								<td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.needsClosed)}
+										${fns:unescapeHtml(construction.disclose.designChanges)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.affairsDescription)}
+										${fns:unescapeHtml(construction.disclose.needsClosed)}
 								</td>
 							</tr>
 							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -290,62 +300,71 @@
 								</td>
 							</tr>
 							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.affairsOffice)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.preconditions)}
-								</td>
+
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
 							</tr>
 							<tr>
-
-								<td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-								</td>
 								<td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.customizedMaterials)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.customizedCan)}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.reasonDescription)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.materialDescription)}
 								</td>
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.modelDescription)}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.quantityDescription)}
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditions)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+								</td>
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -367,7 +386,9 @@
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.nearLiveLine)}

+ 54 - 30
src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerUploadList.jsp

@@ -182,7 +182,10 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                             </td>
@@ -192,7 +195,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                            <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.isImplement)}
                             </td>
@@ -202,6 +205,9 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -232,6 +238,9 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -262,7 +271,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                            <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                             </td>
@@ -293,28 +302,30 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                            <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                             </td>
+
                         </tr>
                         <tr>
-
-                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
                             </td>
                         </tr>
                         <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -325,60 +336,71 @@
                             </td>
                         </tr>
                         <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                            <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
-                            </td>
+
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                         </tr>
                         <tr>
-
-                            <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                            <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                            </td>
                             <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                             </td>
-                        </tr>
-                        <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.customizedCan)}
                             </td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                             </td>
-                        </tr>
-                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.materialDescription)}
                             </td>
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                             </td>
-                        </tr>
-                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.modelDescription)}
                             </td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -400,7 +422,9 @@
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.nearLiveLine)}

+ 573 - 0
src/main/webapp/webpage/modules/sg/managementcenter/activiti/needAdministrativeOffice.jsp

@@ -0,0 +1,573 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>是否需要行政政处</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#yes").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/needAdministrativeOffice",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "pass",
+                            "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/needAdministrativeOffice",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                })
+            });
+        })
+    </script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <h3 class="panel-title">农村专职判断</h3>
+                    </h3>
+                </div>
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save"
+                               method="post" class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
+                        <input type="hidden" value="${fns:unescapeHtml(construction.id)}">
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">储备项目暂定名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.reserveProjectName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否自己处理:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ifSelf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectId)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">项目名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">市公司:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.municipalCompany)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 县公司:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.countyCompany)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目性质:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectNature)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 需求单位:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.demandUnit)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">运维单位:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.operationUnit)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 供电区域:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.powerSupplyArea)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">网格编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.gridNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 单元格编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.cellNumber)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目储备编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectReserveNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电网项目编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.gridProjectNo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.erpNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">建设必要性及内容:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.necessityContent)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 变电站名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.subStationName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">线路名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.lineName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目类型:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否迎峰度夏项目:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.whetherSummer)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 项目基本说明:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.basicDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">工区备注:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.workAreaRemarks)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.hasImplemented)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 现场情况描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.sceneDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.isImplement)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 实施无必要描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.noImplementation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherComplete)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸完整性描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸是否规范:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherStandard)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸规范性描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.normativeDrawings)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否存在典设图问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherDrawing)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">典设图问题描述</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.problemDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherChannel)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">施工通道情况描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.constructionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 土建是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.civilAdjusted)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">土建方案变更内容描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionPlans)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">土建工作量调整内容描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionAdjustment)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电气方案是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.electricalAdjusted)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">自动化是否需要变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.doesChange)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化方案调整内容:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.automatedContent)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">自动化工作内容调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.automatedAdjustment)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 其他方案是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.otherAdjusted)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">其他方案调整原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否含自动化:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.includeAutomation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">通信方式:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.wayOf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 作业方式:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.assignmentStyle)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.operationSubstation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需调整命名编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.namingNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在土建验收:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在电气验收:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.blackoutLine)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">停电范围初步校核 :</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.outageRange)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在政策处理问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.policyIssues)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 政策处理类型:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化工程量:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> FTU,三遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuThree)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">FTU,二遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuTwo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,遮蔽立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuVertical)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">DTU,三遥,户外立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuOutdoor)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,组屏式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuGroup)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">一二次融合成套环网箱(2进2出)数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ringCages)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 一二次融合成套柱上负荷开关(户外)数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.poleMounted)}
+                                </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="yes" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="需要发起"/>
+                                <input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="驳回"/>
+                                <%--									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;--%>
+                            </div>
+                        </div>
+                    </div>
+
+                    <c:if test="${not empty construction.id}">
+                        <act:flowChart procInsId="${construction.act.procInsId}"/>
+                        <act:histoicFlow procInsId="${construction.act.procInsId}"/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

+ 573 - 0
src/main/webapp/webpage/modules/sg/managementcenter/activiti/needCivilOffice.jsp

@@ -0,0 +1,573 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>是否需要民事政处</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#yes").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/needCivilOffice",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "pass",
+                            "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/needCivilOffice",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                })
+            });
+        })
+    </script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <h3 class="panel-title">农村专职判断</h3>
+                    </h3>
+                </div>
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save"
+                               method="post" class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
+                        <input type="hidden" value="${fns:unescapeHtml(construction.id)}">
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">储备项目暂定名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.reserveProjectName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否自己处理:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ifSelf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectId)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">项目名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">市公司:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.municipalCompany)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 县公司:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.countyCompany)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目性质:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectNature)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 需求单位:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.demandUnit)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">运维单位:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.operationUnit)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 供电区域:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.powerSupplyArea)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">网格编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.gridNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 单元格编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.cellNumber)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目储备编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectReserveNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电网项目编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.gridProjectNo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.erpNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">建设必要性及内容:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.necessityContent)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 变电站名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.subStationName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">线路名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.lineName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目类型:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否迎峰度夏项目:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.whetherSummer)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 项目基本说明:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.basicDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">工区备注:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.workAreaRemarks)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.hasImplemented)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 现场情况描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.sceneDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.isImplement)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 实施无必要描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.noImplementation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherComplete)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸完整性描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸是否规范:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherStandard)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸规范性描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.normativeDrawings)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否存在典设图问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherDrawing)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">典设图问题描述</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.problemDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherChannel)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">施工通道情况描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.constructionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 土建是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.civilAdjusted)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">土建方案变更内容描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionPlans)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">土建工作量调整内容描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionAdjustment)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电气方案是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.electricalAdjusted)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">自动化是否需要变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.doesChange)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化方案调整内容:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.automatedContent)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">自动化工作内容调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.automatedAdjustment)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 其他方案是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.otherAdjusted)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">其他方案调整原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否含自动化:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.includeAutomation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">通信方式:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.wayOf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 作业方式:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.assignmentStyle)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.operationSubstation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需调整命名编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.namingNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在土建验收:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在电气验收:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.blackoutLine)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">停电范围初步校核 :</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.outageRange)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在政策处理问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.policyIssues)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 政策处理类型:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化工程量:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> FTU,三遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuThree)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">FTU,二遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuTwo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,遮蔽立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuVertical)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">DTU,三遥,户外立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuOutdoor)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,组屏式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuGroup)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">一二次融合成套环网箱(2进2出)数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ringCages)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 一二次融合成套柱上负荷开关(户外)数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.poleMounted)}
+                                </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="yes" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="需要发起"/>
+                                <input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="驳回"/>
+                                <%--									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;--%>
+                            </div>
+                        </div>
+                    </div>
+
+                    <c:if test="${not empty construction.id}">
+                        <act:flowChart procInsId="${construction.act.procInsId}"/>
+                        <act:histoicFlow procInsId="${construction.act.procInsId}"/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

+ 573 - 0
src/main/webapp/webpage/modules/sg/managementcenter/activiti/needRuralOffice.jsp

@@ -0,0 +1,573 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>农村专职判断</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#yes").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/needRuralOffice",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.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/needRuralOffice",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                })
+            });
+        })
+    </script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <h3 class="panel-title">农村专职判断</h3>
+                    </h3>
+                </div>
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save"
+                               method="post" class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
+                        <input type="hidden" value="${fns:unescapeHtml(construction.id)}">
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">储备项目暂定名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.reserveProjectName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否自己处理:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ifSelf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectId)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">项目名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">市公司:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.municipalCompany)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 县公司:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.countyCompany)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目性质:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectNature)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 需求单位:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.demandUnit)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">运维单位:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.operationUnit)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 供电区域:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.powerSupplyArea)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">网格编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.gridNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 单元格编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.cellNumber)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目储备编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectReserveNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电网项目编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.gridProjectNo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.erpNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">建设必要性及内容:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.necessityContent)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 变电站名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.subStationName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">线路名称:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.lineName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目类型:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.projectType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否迎峰度夏项目:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.whetherSummer)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 项目基本说明:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.basicDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">工区备注:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.basicInformation.workAreaRemarks)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.hasImplemented)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 现场情况描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.sceneDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.isImplement)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 实施无必要描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.noImplementation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherComplete)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸完整性描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸是否规范:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherStandard)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸规范性描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.normativeDrawings)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否存在典设图问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherDrawing)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">典设图问题描述</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.problemDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.whetherChannel)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">施工通道情况描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.constructionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 土建是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.civilAdjusted)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">土建方案变更内容描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionPlans)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">土建工作量调整内容描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionAdjustment)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电气方案是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.electricalAdjusted)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">自动化是否需要变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.doesChange)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化方案调整内容:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.automatedContent)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">自动化工作内容调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.automatedAdjustment)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 其他方案是否需要调整:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.otherAdjusted)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">其他方案调整原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否含自动化:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.includeAutomation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">通信方式:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.wayOf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 作业方式:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.assignmentStyle)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.operationSubstation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需调整命名编号:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.namingNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在土建验收:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在电气验收:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.blackoutLine)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">停电范围初步校核 :</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.outageRange)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在政策处理问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.policyIssues)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 政策处理类型:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化工程量:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> FTU,三遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuThree)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">FTU,二遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuTwo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,遮蔽立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuVertical)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">DTU,三遥,户外立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuOutdoor)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,组屏式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuGroup)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">一二次融合成套环网箱(2进2出)数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ringCages)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 一二次融合成套柱上负荷开关(户外)数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.poleMounted)}
+                                </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="yes" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="需要发起"/>
+                                <input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="驳回"/>
+                                <%--									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;--%>
+                            </div>
+                        </div>
+                    </div>
+
+                    <c:if test="${not empty construction.id}">
+                        <act:flowChart procInsId="${construction.act.procInsId}"/>
+                        <act:histoicFlow procInsId="${construction.act.procInsId}"/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

+ 54 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorDesignChange.jsp

@@ -180,7 +180,10 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+								<td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.hasImplemented)}
 								</td>
@@ -190,7 +193,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+								<td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.isImplement)}
 								</td>
@@ -200,6 +203,9 @@
 								</td>
 							</tr>
 							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -230,6 +236,9 @@
 								</td>
 							</tr>
 							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -260,7 +269,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+								<td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
 								</td>
@@ -291,29 +300,30 @@
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.difficultResolve)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+								<td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.designChanges)}
+										${fns:unescapeHtml(construction.disclose.affairsDescription)}
 								</td>
+
 							</tr>
 							<tr>
-
-								<td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+								<td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.needsClosed)}
+										${fns:unescapeHtml(construction.disclose.designChanges)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.affairsDescription)}
+										${fns:unescapeHtml(construction.disclose.needsClosed)}
 								</td>
 							</tr>
 							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -324,62 +334,71 @@
 								</td>
 							</tr>
 							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.affairsOffice)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.preconditions)}
-								</td>
+
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
 							</tr>
 							<tr>
-
-								<td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-								</td>
 								<td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.customizedMaterials)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.customizedCan)}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.reasonDescription)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.materialDescription)}
 								</td>
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.modelDescription)}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.quantityDescription)}
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditions)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+								</td>
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -401,7 +420,9 @@
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.nearLiveLine)}

+ 54 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadAfter.jsp

@@ -167,7 +167,10 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                             </td>
@@ -177,7 +180,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                            <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.isImplement)}
                             </td>
@@ -187,6 +190,9 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -217,6 +223,9 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -247,7 +256,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                            <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                             </td>
@@ -278,29 +287,30 @@
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                            <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                             </td>
+
                         </tr>
                         <tr>
-
-                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
                             </td>
                         </tr>
                         <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -311,62 +321,71 @@
                             </td>
                         </tr>
                         <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                            <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
-                            </td>
+
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                         </tr>
                         <tr>
-
-                            <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                            <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                            </td>
                             <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                             </td>
-                        </tr>
-                        <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.customizedCan)}
                             </td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                             </td>
-                        </tr>
-                        <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.materialDescription)}
                             </td>
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                             </td>
-                        </tr>
-                        <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.modelDescription)}
                             </td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -388,7 +407,9 @@
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.nearLiveLine)}

+ 54 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadList.jsp

@@ -204,7 +204,10 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                             </td>
@@ -214,7 +217,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                            <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.isImplement)}
                             </td>
@@ -224,6 +227,9 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -254,6 +260,9 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -284,7 +293,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                            <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                             </td>
@@ -315,29 +324,30 @@
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                            <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                             </td>
+
                         </tr>
                         <tr>
-
-                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                             <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
                             </td>
                         </tr>
                         <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -348,62 +358,71 @@
                             </td>
                         </tr>
                         <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                             </td>
-                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                            <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
-                            </td>
+
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                         </tr>
                         <tr>
-
-                            <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                            <td class="width-35">
-                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                            </td>
                             <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                             </td>
-                        </tr>
-                        <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.customizedCan)}
                             </td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                             </td>
-                        </tr>
-                        <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.materialDescription)}
                             </td>
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                             </td>
-                        </tr>
-                        <tr>
-
                             <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.modelDescription)}
                             </td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -425,7 +444,9 @@
                             </td>
                         </tr>
                         <tr>
-
+                            <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                        </tr>
+                        <tr>
                             <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                             <td class="width-35">
                                     ${fns:unescapeHtml(construction.disclose.nearLiveLine)}

+ 156 - 3
src/main/webapp/webpage/modules/sg/managementcenter/activiti/receiptForm.jsp

@@ -201,7 +201,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -211,7 +214,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -221,6 +224,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -251,6 +257,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -281,7 +290,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -311,6 +320,150 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 93 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralFiles.jsp

@@ -201,7 +201,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -211,7 +214,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -221,6 +224,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -251,6 +257,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -281,7 +290,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -312,29 +321,30 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                                 </td>
+
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -345,62 +355,71 @@
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
-                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                                </td>
                                 <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedCan)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.materialDescription)}
                                 </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.modelDescription)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -422,7 +441,9 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
@@ -503,6 +524,45 @@
                                         ${fns:unescapeHtml(construction.quantity.processingDescription)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化工程量:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> FTU,三遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuThree)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">FTU,二遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuTwo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,遮蔽立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuVertical)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">DTU,三遥,户外立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuOutdoor)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,组屏式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuGroup)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">一二次融合成套环网箱(2进2出)数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ringCages)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 一二次融合成套柱上负荷开关(户外)数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.poleMounted)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 93 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralJudge.jsp

@@ -224,7 +224,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -234,7 +237,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -244,6 +247,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -274,6 +280,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -304,7 +313,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -335,29 +344,30 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                                 </td>
+
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -368,62 +378,71 @@
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
-                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                                </td>
                                 <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedCan)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.materialDescription)}
                                 </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.modelDescription)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -445,7 +464,9 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
@@ -526,6 +547,45 @@
                                         ${fns:unescapeHtml(construction.quantity.processingDescription)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化工程量:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> FTU,三遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuThree)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">FTU,二遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuTwo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,遮蔽立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuVertical)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">DTU,三遥,户外立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuOutdoor)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,组屏式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuGroup)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">一二次融合成套环网箱(2进2出)数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ringCages)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 一二次融合成套柱上负荷开关(户外)数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.poleMounted)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 93 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralLoan.jsp

@@ -158,7 +158,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -168,7 +171,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -178,6 +181,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -208,6 +214,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -238,7 +247,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -269,29 +278,30 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                                 </td>
+
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -302,62 +312,71 @@
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
-                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                                </td>
                                 <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedCan)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.materialDescription)}
                                 </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.modelDescription)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -379,7 +398,9 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
@@ -460,6 +481,45 @@
                                         ${fns:unescapeHtml(construction.quantity.processingDescription)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化工程量:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> FTU,三遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuThree)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">FTU,二遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuTwo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,遮蔽立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuVertical)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">DTU,三遥,户外立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuOutdoor)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,组屏式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuGroup)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">一二次融合成套环网箱(2进2出)数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ringCages)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 一二次融合成套柱上负荷开关(户外)数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.poleMounted)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 93 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralOffice.jsp

@@ -165,7 +165,10 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+								<td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.hasImplemented)}
 								</td>
@@ -175,7 +178,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+								<td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.isImplement)}
 								</td>
@@ -185,6 +188,9 @@
 								</td>
 							</tr>
 							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -215,6 +221,9 @@
 								</td>
 							</tr>
 							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -245,7 +254,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+								<td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
 								</td>
@@ -276,29 +285,30 @@
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.difficultResolve)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+								<td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.designChanges)}
+										${fns:unescapeHtml(construction.disclose.affairsDescription)}
 								</td>
+
 							</tr>
 							<tr>
-
-								<td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+								<td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.needsClosed)}
+										${fns:unescapeHtml(construction.disclose.designChanges)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.affairsDescription)}
+										${fns:unescapeHtml(construction.disclose.needsClosed)}
 								</td>
 							</tr>
 							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -309,62 +319,71 @@
 								</td>
 							</tr>
 							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.affairsOffice)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.preconditions)}
-								</td>
+
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
 							</tr>
 							<tr>
-
-								<td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-								</td>
 								<td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.customizedMaterials)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.customizedCan)}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.reasonDescription)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.materialDescription)}
 								</td>
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
 								</td>
-							</tr>
-							<tr>
-
 								<td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.modelDescription)}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.quantityDescription)}
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditions)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+								</td>
+							</tr>
+							<tr>
+								<td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -386,7 +405,9 @@
 								</td>
 							</tr>
 							<tr>
-
+								<td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.disclose.nearLiveLine)}
@@ -467,6 +488,45 @@
 										${fns:unescapeHtml(construction.quantity.processingDescription)}
 								</td>
 							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 自动化工程量:</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> FTU,三遥数量:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.ftuThree)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">FTU,二遥数量:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.ftuTwo)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> DTU,三遥,遮蔽立式数量</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.dtuVertical)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">DTU,三遥,户外立式数量</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.dtuOutdoor)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> DTU,三遥,组屏式数量</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.dtuGroup)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">一二次融合成套环网箱(2进2出)数量</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.ringCages)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 一二次融合成套柱上负荷开关(户外)数量:</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.poleMounted)}
+								</td>
+							</tr>
 							</tbody>
 						</table>
 					</form:form>

+ 93 - 33
src/main/webapp/webpage/modules/sg/managementcenter/activiti/ruralPays.jsp

@@ -158,7 +158,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -168,7 +171,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -178,6 +181,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -208,6 +214,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -238,7 +247,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -269,29 +278,30 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.difficultResolve)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
                                 </td>
+
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
                                 <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.planningRequired)}
@@ -302,62 +312,71 @@
                                 </td>
                             </tr>
                             <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.affairsOffice)}
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
-                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
-                                <td class="width-35">
-                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
-                                </td>
                                 <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.customizedCan)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.reasonDescription)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.materialDescription)}
                                 </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
                                 </td>
-                            </tr>
-                            <tr>
-
                                 <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.modelDescription)}
                                 </td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.quantityDescription)}
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
@@ -379,7 +398,9 @@
                                 </td>
                             </tr>
                             <tr>
-
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
@@ -460,6 +481,45 @@
                                         ${fns:unescapeHtml(construction.quantity.processingDescription)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 自动化工程量:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> FTU,三遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuThree)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">FTU,二遥数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ftuTwo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,遮蔽立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuVertical)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">DTU,三遥,户外立式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuOutdoor)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> DTU,三遥,组屏式数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.dtuGroup)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">一二次融合成套环网箱(2进2出)数量</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.ringCages)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 一二次融合成套柱上负荷开关(户外)数量:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.poleMounted)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 156 - 3
src/main/webapp/webpage/modules/sg/managementcenter/activiti/sealForm.jsp

@@ -178,7 +178,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -188,7 +191,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -198,6 +201,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -228,6 +234,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -258,7 +267,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -288,6 +297,150 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 156 - 3
src/main/webapp/webpage/modules/sg/managementcenter/activiti/singleForm.jsp

@@ -181,7 +181,10 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否已实施:</label></td>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">实施必要性检查:</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场是否已实施:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.hasImplemented)}
                                 </td>
@@ -191,7 +194,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性:</label></td>
+                                <td class="width-15 active"><label class="pull-right">现场是否有实施必要性:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.isImplement)}
                                 </td>
@@ -201,6 +204,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">电子图(草图)规范性检查:</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right">图纸是否完整:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherComplete)}
@@ -231,6 +237,9 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">图纸方案交底</label></td>
+                            </tr>
+                            <tr>
                                 <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.whetherChannel)}
@@ -261,7 +270,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述:</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 电器方案调整原因描述:</label></td>
                                 <td class="width-35">
                                         ${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
                                 </td>
@@ -291,6 +300,150 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">政处情况摸底</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">拆旧物资校核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">施工前置条件检查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">停电方式核查</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="fullwidth" style="color:red"><label class="pull-right">现场安全性复核</label></td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电:</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

+ 1 - 2
src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectList.js

@@ -227,8 +227,7 @@ $(document).ready(function() {
     }
   
   function deleteAll(){
-
-		jp.confirm('确认要删除该数据记录吗?', function(){
+		jp.confirm('确认要删除该项目信息?,会删除该项目所有基础信息及流程信息。', function(){
 			jp.loading();  	
 			jp.get("${ctx}/managementcenter/materialproject/deleteAll?ids=" + getIdSelections(), function(data){
          	  		if(data.success){