js，jsp拆分文件，施工交底模块填写信息改为导入，流程图重新绘制

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

@@ -1115,8 +1115,7 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void auditSave3(Act act, Disclose disclose) {
-
+	public void auditSave3(Act act) {
 		// 设置意见
 		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
 		act.preUpdate();
@@ -1125,7 +1124,6 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
-		discloseService.save(disclose);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -1163,7 +1161,6 @@ public class ActTaskService extends BaseService {
                 String loginName = UserUtils.getByLoginName(tuser).getLoginName();
                 vars.put("processer", loginName);
             }
-
 		} else if ("company".equals(flag)) {
 			vars.put("manager", false);
 			vars.put("company", true);

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

@@ -395,16 +395,16 @@ public class ActTaskController extends BaseController {
 
 	/**
 	 * 经理审批
-	 * @param act
+	 * @param
 	 */
 	@ResponseBody
 	@RequestMapping(value = "audit3")
-	public AjaxJson auditTask3(Act act, Disclose disclose) {
+	public AjaxJson auditTask3(Act act) {
 		AjaxJson j = new AjaxJson();
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.auditSave3(act,disclose);
+			actTaskService.auditSave3(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}

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

@@ -113,6 +113,7 @@
 			productionDate,
 			IntegrateModule,
 			needReplace,
+			overallTransformation,
 			create_by,
 			create_date,
 			update_by,
@@ -122,9 +123,9 @@
 		) VALUES (
 			#{id},
 			#{procInsId},
+			#{conId},
 			#{channel},
 			#{capacity},
-			#{conId},
 			#{sceneSize},
 			#{capacitySize},
 			#{hiddenDanger},
@@ -142,6 +143,7 @@
 			#{productionDate},
 			#{IntegrateModule},
 			#{needReplace},
+			#{overallTransformation},
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
@@ -174,6 +176,7 @@
 			productionDate = #{productionDate},
 			IntegrateModule = #{IntegrateModule},
 			needReplace = #{needReplace},
+			overallTransformation = #{overallTransformation},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks}

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

@@ -49,6 +49,7 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		super.delete(construction);
 	}
 
+	@Transactional(readOnly = false)
 	public void newUpdate(Construction construction){
 		constructionMapper.newUpdate(construction);
 	}

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

@@ -43,6 +43,7 @@ public class DiscloseService extends CrudService<DiscloseMapper,Disclose> {
 	}
 
 	@Override
+	@Transactional(readOnly = false)
 	public void save(Disclose entity) {
 		super.save(entity);
 	}

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

@@ -2,15 +2,23 @@
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
+import com.jeeplus.modules.sys.entity.Office;
+import java.util.Date;
+import com.jeeplus.modules.act.entity.Act;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.core.persistence.Page;
 
 import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ProcessDefCache;
+import com.jeeplus.modules.sg.audit.information.utils.ImportInformation;
+import com.jeeplus.modules.sg.audit.record.entity.Record;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.myActiviUtils;
@@ -19,6 +27,7 @@ import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
 import com.jeeplus.modules.test.activiti.service.OALeaveService;
+import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataMain1;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.Process;
 import org.activiti.bpmn.model.UserTask;
@@ -36,11 +45,16 @@ import org.activiti.engine.impl.task.TaskDefinition;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.task.Task;
 import org.apache.poi.ss.formula.functions.T;
+import org.apache.poi.ss.usermodel.Row;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -87,19 +101,17 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "form/{mode}")
     public String form(@PathVariable String mode, Construction construction, Model model) {
-        String proId = construction.getAct().getProcDefId();
-        String pInId = construction.getProcInsId();
-        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-        RepositoryService rs = processEngine.getRepositoryService();
+//        String proId = construction.getAct().getProcDefId();
+//        String pInId = construction.getProcInsId();
+//        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+//        RepositoryService rs = processEngine.getRepositoryService();
         //根据流程定义号获取所有的定义流程
-
-
         model.addAttribute("construction", construction);
 //		model.addAttribute("roleCodes");
         if ("add".equals(mode) || "edit".equals(mode)) {
             return "modules/sg/managementcenter/activiti/constructionForm";
         } else {//audit(施工单位，项目经理组织交底)
-            List<Task> tasks = taskService.createTaskQuery().processInstanceId(pInId).list();
+           /* List<Task> tasks = taskService.createTaskQuery().processInstanceId(pInId).list();
             //对流程循环
             for (Task task : tasks) {
                 //根据流程的定义号获取信息
@@ -131,7 +143,7 @@ public class ConstructionController extends BaseController {
                         break;
                     }
                 }
-            }
+            }*/
             return "modules/sg/managementcenter/activiti/constructionAudit";
         }
 
@@ -158,40 +170,90 @@ public class ConstructionController extends BaseController {
         /**
          * 流程审批
          */
-        if (StringUtils.isBlank(construction.getId())) {
-            //新增或编辑表单保存
-            construction.setApplyName(construction.getTuser().getName());
-            constructionService.save(construction);//保存
 
-            project.setStatus("1");
-            project.setRequireName(construction.getProjectName());
-            projectService.updateStatus(project);
-            String procDefKey = construction.getAct().getProcDefKey();
-            // 启动流程
-            ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
-            Map<String, Object> vars = Maps.newHashMap();
-            vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
-            String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-            actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
-            j.setMsg("发起流程审批成功!");
-            j.getBody().put("targetUrl", "/act/task/process/");
-        } else {
+        if (StringUtils.isBlank(construction.getId())) {
             //新增或编辑表单保存
-            constructionService.save(construction);//保存
-            construction.getAct().setComment(("yes".equals(construction.getAct().getFlag()) ? "[重新申请] " : "[销毁申请] "));
-            // 完成流程任务
-            Map<String, Object> vars = Maps.newHashMap();
-            String flag = construction.getAct().getFlag();
-            vars.put("reapply", "yes".equals(flag) ? true : false);
-            if ("no".equals(flag)) {
-                project.setStatus("0");
+            for (int i = 0; i <2; i++) {
+                Map<String, Object> vars = Maps.newHashMap();
+                if (i == 0) {
+                    vars.put("company", true);
+                    vars.put("manager", false);
+                } else {
+                    vars.put("company", false);
+                    vars.put("manager", true);
+                }
+                construction.setApplyName(construction.getTuser().getName());
+                constructionService.save(construction);//保存
+                project.setStatus("1");
                 project.setRequireName(construction.getProjectName());
                 projectService.updateStatus(project);
+                String procDefKey = construction.getAct().getProcDefKey();
+                // 启动流程
+                ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
+                vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
+                String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
             }
-            vars.put("processer", construction.getApplyName());
-            actTaskService.complete(construction.getAct().getTaskId(), construction.getAct().getProcInsId(), construction.getAct().getComment(), construction.getContent(), vars);
-            j.setMsg("提交成功！");
-            j.getBody().put("targetUrl", "/act/task/todo/");
+            j.setMsg("发起流程审批成功!");
+            j.getBody().put("targetUrl", "/act/task/process/");
+        }
+        return j;
+    }
+
+    /**
+     * 导入图纸审核信息
+     */
+//    @RequiresPermissions("modules:sg:information:information:import")
+    @ResponseBody
+    @RequestMapping(value = "drawingReview")
+    public AjaxJson drawingReview(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String id) {
+        AjaxJson j = new AjaxJson();
+        try {
+            int successNum = 0;
+            int failureNum = 0;
+            StringBuilder failureMsg = new StringBuilder();
+            ImportExcel ei = new ImportExcel(file, 1, 0);
+            int lastDataRowNum = ei.getLastDataRowNum();
+            Construction construction = new Construction();
+            for (int i = 1; i < lastDataRowNum; i++) {
+                Row row = ei.getRow(i);
+                construction.setId(id);
+                construction.setPowerLine(ei.getCellValue(row, 0 ).toString());
+                construction.setBlackoutArea(ei.getCellValue(row, 1 ).toString());
+                construction.setProjectType(ei.getCellValue(row, 2 ).toString());
+                construction.setPowerFailure(ei.getCellValue(row, 3 ).toString());
+                construction.setPreliminaryJudgment(ei.getCellValue(row, 4 ).toString());
+                construction.setCivilEngineering(ei.getCellValue(row, 5 ).toString());
+                construction.setBaseType(ei.getCellValue(row, 6 ).toString());
+                construction.setPlanApproval(ei.getCellValue(row, 7 ).toString());
+                construction.setTransformationType(ei.getCellValue(row, 8 ).toString());
+                construction.setTransformationEquipment(ei.getCellValue(row, 9 ).toString());
+                construction.setNewNamed(ei.getCellValue(row, 10).toString());
+                construction.setPutInto(ei.getCellValue(row, 11).toString());
+                construction.setElectricalConstruction(ei.getCellValue(row, 12).toString());
+                construction.setTheAssignment(ei.getCellValue(row, 13).toString());
+                construction.setAutomation(ei.getCellValue(row, 14).toString());
+                construction.setRemote(ei.getCellValue(row, 15).toString());
+                construction.setCommunicationMode(ei.getCellValue(row, 16).toString());
+                construction.setInSitu(ei.getCellValue(row, 17).toString());
+                construction.setNetworkCabinet(ei.getCellValue(row, 18).toString());
+                construction.setStation(ei.getCellValue(row, 19).toString());
+            }
+            try {
+                constructionService.newUpdate(construction);
+                successNum++;
+            } catch (ConstraintViolationException ex) {
+                failureNum++;
+            } catch (Exception ex) {
+                failureNum++;
+            }
+            if (failureNum > 0) {
+                failureMsg.insert(0, "，失败 " + failureNum + " 条票务代理记录。");
+            }
+            j.setMsg("已成功导入 " + successNum + " 条票务代理记录" + failureMsg);
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入票务代理失败！失败信息：" + e.getMessage());
         }
         return j;
     }

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

@@ -3,10 +3,18 @@
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.act.entity.Act;
+
+import java.net.URLDecoder;
+import java.util.Date;
+import com.jeeplus.modules.sys.entity.User;
+
 import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
@@ -32,15 +40,18 @@ import org.activiti.engine.impl.task.TaskDefinition;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.poi.ss.usermodel.Row;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -151,10 +162,68 @@ public class DivideController extends BaseController {
 			j.setMsg("提交成功！");
 			j.getBody().put("targetUrl",  "/act/task/todo/");
 		}
-
 		return j;
 	}
 
 
+	/**
+	 * 导入交底结论
+	 */
+//    @RequiresPermissions("modules:sg:information:information:import")
+	@ResponseBody
+	@RequestMapping(value = "importConclusion")
+	public AjaxJson importConclusion(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String procInsId,String projectName) {
+		AjaxJson j = new AjaxJson();
+		try {
+			int successNum = 0;
+			int failureNum = 0;
+			StringBuilder failureMsg = new StringBuilder();
+			ImportExcel ei = new ImportExcel(file, 1, 0);
+			int lastDataRowNum = ei.getLastDataRowNum();
+			Disclose disclose = new Disclose();
+			for (int i = 1; i < lastDataRowNum; i++) {
+				Row row = ei.getRow(i);
+				disclose.setProcInsId(procInsId);
+				projectName = URLDecoder.decode(projectName, "UTF-8");
+				disclose.setConId(projectName);
+				disclose.setChannel(ei.getCellValue(row, 0 ).toString());
+				disclose.setCapacity(ei.getCellValue(row, 1 ).toString());
+				disclose.setSceneSize(ei.getCellValue(row, 2 ).toString());
+				disclose.setCapacitySize(ei.getCellValue(row, 3 ).toString());
+				disclose.setHiddenDanger(ei.getCellValue(row, 4 ).toString());
+				disclose.setInfluenceConstruction(ei.getCellValue(row, 5 ).toString());
+				disclose.setProjectRepetition(ei.getCellValue(row, 6 ).toString());
+				disclose.setImplemented(ei.getCellValue(row, 7 ).toString());
+				disclose.setTransformer(ei.getCellValue(row, 8 ).toString());
+				disclose.setLineName(ei.getCellValue(row, 9 ).toString());
+				disclose.setQuantities(ei.getCellValue(row, 10).toString());
+				disclose.setRodNumber(ei.getCellValue(row, 11).toString());
+				disclose.setAdministrationType(ei.getCellValue(row, 12).toString());
+				disclose.setPoliticalProblem(ei.getCellValue(row, 13).toString());
+				disclose.setPrecondition(ei.getCellValue(row, 14).toString());
+				disclose.setPlacementMode(ei.getCellValue(row, 15).toString());
+				disclose.setProductionDate(ei.getCellValue(row, 16).toString());
+				disclose.setIntegrateModule(ei.getCellValue(row, 17).toString());
+				disclose.setNeedReplace(ei.getCellValue(row, 18).toString());
+				disclose.setOverallTransformation(ei.getCellValue(row, 19).toString());
+			}
+			try {
+				discloseService.save(disclose);
+				successNum++;
+			} catch (ConstraintViolationException ex) {
+				failureNum++;
+			} catch (Exception ex) {
+				failureNum++;
+			}
+			if (failureNum > 0) {
+				failureMsg.insert(0, "，失败 " + failureNum + " 条票务代理记录。");
+			}
+			j.setMsg("已成功导入 " + successNum + " 条票务代理记录" + failureMsg);
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导入票务代理失败！失败信息：" + e.getMessage());
+		}
+		return j;
+	}
 
 }

src/main/webapp/webpage/modules/sg/audit/information/informationList.js

@@ -506,8 +506,6 @@ $(document).ready(function() {
 		  $("#searchForm  select").val("");
 		  $('#informationTable').bootstrapTable('refresh');
 		});
-
-
 	});
 
   function getIdSelections() {

src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionAudit.js

@@ -0,0 +1,230 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+	/**
+	 * 项目经理判定施工交底类型页面
+	 * */
+$(document).ready(function() {
+	jp.ajaxForm("#inputForm",function(data){
+		if(data.success){
+			jp.success(data.msg);
+			jp.go("${ctx}/managementcenter/activiti");
+		}else{
+			jp.error(data.msg);
+			$("#inputForm").find("button:submit").button("reset");
+		}
+	});
+
+
+	$("#agree").click(function () {
+		// var ii=document.getElementById("tuser").value;
+		var tuser = $("#tuserName").val();
+		console.log(tuser);
+		/*				if (tuser=="") {
+							jp.error("请选择用户");
+							return;
+						}*/
+		var id = $("#id").val();
+		var powerLine= $("#powerLine").val();
+		var blackoutArea=$("#blackoutArea").val();
+		var projectType=$("#projectType").val();
+		var powerFailure=$("#powerFailure").val();
+		var preliminaryJudgment=$("#preliminaryJudgment").val();
+		var civilEngineering=$("#civilEngineering").val();
+		var baseType=$("#baseType").val();
+		var planApproval=$("#planApproval").val();
+		var transformationType=$("#transformationType").val();
+		var transformationEquipment=$("#transformationEquipment").val();
+		var newNamed=$("#newNamed").val();
+		var putInto=$("#putInto").val();
+		var electricalConstruction=$("#electricalConstruction").val();
+		var theAssignment=$("#theAssignment").val();
+		var automation=$("#automation").val();
+		var remote=$("#remote").val();
+		var communicationMode=$("#communicationMode").val();
+		var inSitu=$("#inSitu").val();
+		var networkCabinet=$("#networkCabinet").val();
+		var station=$("#station").val();
+
+		jp.prompt("施工交底, 审批意见", function (message) {
+			jp.post("${ctx}/act/task/newAudit",
+				{
+					"taskId":"${construction.act.taskId}",
+					"taskName":"${construction.act.taskName}",
+					"taskDefKey":"${construction.act.taskDefKey}",
+					"procInsId":"${construction.act.procInsId}",
+					"procDefId":"${construction.act.procDefId}",
+					"flag":"manager",
+					"comment":window.encodeURI(message),
+					"tuser": tuser,
+					"id":id,
+					"powerLine":powerLine,
+					"blackoutArea":blackoutArea,
+					"projectType":projectType,
+					"powerFailure":powerFailure,
+					"preliminaryJudgment":preliminaryJudgment,
+					"civilEngineering":civilEngineering,
+					"baseType":baseType,
+					"planApproval":planApproval,
+					"transformationType":transformationType,
+					"transformationEquipment":transformationEquipment,
+					"newNamed":newNamed,
+					"putInto":putInto,
+					"electricalConstruction":electricalConstruction,
+					"theAssignment":theAssignment,
+					"automation":automation,
+					"remote":remote,
+					"communicationMode":communicationMode,
+					"inSitu":inSitu,
+					"networkCabinet":networkCabinet,
+					"station":station
+				},
+				function (data) {
+					if(data.success){
+						jp.success(data.msg);
+						jp.go("${ctx}/act/task/todo")
+					}
+				})
+		});
+	})
+
+	$("#agree2").click(function () {
+		// var ii=document.getElementById("tuser").value;
+		var id = $("#id").val();
+		var powerLine=$("#powerLine").val();
+		var blackoutArea=$("#blackoutArea").val();
+		var projectType=$("#projectType").val();
+		var powerFailure=$("#powerFailure").val();
+		var preliminaryJudgment=$("#preliminaryJudgment").val();
+		var civilEngineering=$("#civilEngineering").val();
+		var baseType=$("#baseType").val();
+		var planApproval=$("#planApproval").val();
+		var transformationType=$("#transformationType").val();
+		var transformationEquipment=$("#transformationEquipment").val();
+		var newNamed=$("#newNamed").val();
+		var putInto=$("#putInto").val();
+		var electricalConstruction=$("#electricalConstruction").val();
+		var theAssignment=$("#theAssignment").val();
+		var automation=$("#automation").val();
+		var remote=$("#remote").val();
+		var communicationMode=$("#communicationMode").val();
+		var inSitu=$("#inSitu").val();
+		var networkCabinet=$("#networkCabinet").val();
+		var station=$("#station").val();
+
+		jp.prompt("经理交底, 审批意见", function (message) {
+			jp.post("${ctx}/act/task/newAudit",
+				{
+					"taskId":"${construction.act.taskId}",
+					"taskName":"${construction.act.taskName}",
+					"taskDefKey":"${construction.act.taskDefKey}",
+					"procInsId":"${construction.act.procInsId}",
+					"procDefId":"${construction.act.procDefId}",
+					"flag":"company",
+					"comment":window.encodeURI(message),
+					"id":id,
+					"powerLine":powerLine,
+					"blackoutArea":blackoutArea,
+					"projectType":projectType,
+					"powerFailure":powerFailure,
+					"preliminaryJudgment":preliminaryJudgment,
+					"civilEngineering":civilEngineering,
+					"baseType":baseType,
+					"planApproval":planApproval,
+					"transformationType":transformationType,
+					"transformationEquipment":transformationEquipment,
+					"newNamed":newNamed,
+					"putInto":putInto,
+					"electricalConstruction":electricalConstruction,
+					"theAssignment":theAssignment,
+					"automation":automation,
+					"remote":remote,
+					"communicationMode":communicationMode,
+					"inSitu":inSitu,
+					"networkCabinet":networkCabinet,
+					"station":station
+				},
+				function (data) {
+					if(data.success){
+						jp.success(data.msg);
+						jp.go("${ctx}/act/task/todo")
+					}
+				})
+		});
+	})
+
+	/**
+	 * 请求驳回
+	 * */
+	$("#reject").click(function () {
+		jp.prompt("驳回, 审批意见", function (message) {
+			jp.post("${ctx}/act/task/newAudit",
+				{
+					"taskId":"${construction.act.taskId}",
+					"taskName":"${construction.act.taskName}",
+					"taskDefKey":"${construction.act.taskDefKey}",
+					"procInsId":"${construction.act.procInsId}",
+					"procDefId":"${construction.act.procDefId}",
+					"flag":"reject",
+					"projectName":"${fns:unescapeHtml(construction.projectName)}",
+					"comment":window.encodeURI(message)
+				},
+				function (data) {
+					if(data.success){
+						jp.success(data.msg);
+						jp.go("${ctx}/act/task/todo")
+					}
+				})
+		})
+	})
+
+
+	$('#startTime').datetimepicker({
+		format: "YYYY-MM-DD HH:mm:ss"
+	});
+	$('#endTime').datetimepicker({
+		format: "YYYY-MM-DD HH:mm:ss"
+	});
+	//富文本初始化
+	$('#reason').summernote({
+		height: 300,
+		lang: 'zh-CN',
+		readonly: true,
+		callbacks: {
+			onChange: function(contents, $editable) {
+				$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+			}
+		}
+	});
+
+	/**
+	 * 导入图纸审核信息
+	 * */
+	$("#drawingReview").click(function () {
+		var id = $("#id").val();
+		jp.open({
+			type: 2,
+			area: [500, 200],
+			auto: true,
+			title: "导入图纸审核信息",
+			content: "${ctx}/tag/importExcel",
+			btn: ['确定', '关闭'],
+			btn1: function (index, layero) {
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				iframeWin.contentWindow.importExcel('${ctx}/managementcenter/activiti/drawingReview?id='+id, function (data) {
+					if (data.success) {
+						jp.success(data.msg);
+						window.location.reload();
+					} else {
+						jp.alert(data.msg);
+					}
+					jp.close(index);
+				});//调用保存事件
+				return false;
+			},
+			btn2: function (index) {
+				jp.close(index);
+			}
+		})
+	});
+})
+</script>

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

@@ -2,204 +2,17 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>施工交底管理</title>
+	<title>施工交底判定技术交底类型</title>
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
-	<script type="text/javascript">
+	<%@include file="constructionAudit.js" %>
+<%--	<script type="text/javascript">
 
 		$(document).ready(function() {
-			jp.ajaxForm("#inputForm",function(data){
-				if(data.success){
-					jp.success(data.msg);
-					jp.go("${ctx}/managementcenter/activiti");
-				}else{
-					jp.error(data.msg);
-					$("#inputForm").find("button:submit").button("reset");
-				}
-			});
 
-
-			$("#agree").click(function () {
-				// var ii=document.getElementById("tuser").value;
-				var tuser = $("#tuserName").val();
-				console.log(tuser);
-/*				if (tuser=="") {
-					jp.error("请选择用户");
-					return;
-				}*/
-				var id = $("#id").val();
-				var powerLine= $("#powerLine").val();
-				var blackoutArea=$("#blackoutArea").val();
-				var projectType=$("#projectType").val();
-				var powerFailure=$("#powerFailure").val();
-				var preliminaryJudgment=$("#preliminaryJudgment").val();
-				var civilEngineering=$("#civilEngineering").val();
-				var baseType=$("#baseType").val();
-				var planApproval=$("#planApproval").val();
-				var transformationType=$("#transformationType").val();
-				var transformationEquipment=$("#transformationEquipment").val();
-				var newNamed=$("#newNamed").val();
-				var putInto=$("#putInto").val();
-				var electricalConstruction=$("#electricalConstruction").val();
-				var theAssignment=$("#theAssignment").val();
-				var automation=$("#automation").val();
-				var remote=$("#remote").val();
-				var communicationMode=$("#communicationMode").val();
-				var inSitu=$("#inSitu").val();
-				var networkCabinet=$("#networkCabinet").val();
-				var station=$("#station").val();
-
-				jp.prompt("施工交底, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/newAudit",
-							{
-								"taskId":"${construction.act.taskId}",
-								"taskName":"${construction.act.taskName}",
-								"taskDefKey":"${construction.act.taskDefKey}",
-								"procInsId":"${construction.act.procInsId}",
-								"procDefId":"${construction.act.procDefId}",
-								"flag":"manager",
-								"comment":window.encodeURI(message),
-								"tuser": tuser,
-								"id":id,
-								"powerLine":powerLine,
-								"blackoutArea":blackoutArea,
-								"projectType":projectType,
-								"powerFailure":powerFailure,
-								"preliminaryJudgment":preliminaryJudgment,
-								"civilEngineering":civilEngineering,
-								"baseType":baseType,
-								"planApproval":planApproval,
-								"transformationType":transformationType,
-								"transformationEquipment":transformationEquipment,
-								"newNamed":newNamed,
-								"putInto":putInto,
-								"electricalConstruction":electricalConstruction,
-								"theAssignment":theAssignment,
-								"automation":automation,
-								"remote":remote,
-								"communicationMode":communicationMode,
-								"inSitu":inSitu,
-								"networkCabinet":networkCabinet,
-								"station":station
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				});
-			})
-
-			$("#agree2").click(function () {
-				// var ii=document.getElementById("tuser").value;
-				var id = $("#id").val();
-				var powerLine=$("#powerLine").val();
-				var blackoutArea=$("#blackoutArea").val();
-				var projectType=$("#projectType").val();
-				var powerFailure=$("#powerFailure").val();
-				var preliminaryJudgment=$("#preliminaryJudgment").val();
-				var civilEngineering=$("#civilEngineering").val();
-				var baseType=$("#baseType").val();
-				var planApproval=$("#planApproval").val();
-				var transformationType=$("#transformationType").val();
-				var transformationEquipment=$("#transformationEquipment").val();
-				var newNamed=$("#newNamed").val();
-				var putInto=$("#putInto").val();
-				var electricalConstruction=$("#electricalConstruction").val();
-				var theAssignment=$("#theAssignment").val();
-				var automation=$("#automation").val();
-				var remote=$("#remote").val();
-				var communicationMode=$("#communicationMode").val();
-				var inSitu=$("#inSitu").val();
-				var networkCabinet=$("#networkCabinet").val();
-				var station=$("#station").val();
-
-				jp.prompt("经理交底, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/newAudit",
-							{
-								"taskId":"${construction.act.taskId}",
-								"taskName":"${construction.act.taskName}",
-								"taskDefKey":"${construction.act.taskDefKey}",
-								"procInsId":"${construction.act.procInsId}",
-								"procDefId":"${construction.act.procDefId}",
-								"flag":"company",
-								"comment":window.encodeURI(message),
-								"id":id,
-								"powerLine":powerLine,
-								"blackoutArea":blackoutArea,
-								"projectType":projectType,
-								"powerFailure":powerFailure,
-								"preliminaryJudgment":preliminaryJudgment,
-								"civilEngineering":civilEngineering,
-								"baseType":baseType,
-								"planApproval":planApproval,
-								"transformationType":transformationType,
-								"transformationEquipment":transformationEquipment,
-								"newNamed":newNamed,
-								"putInto":putInto,
-								"electricalConstruction":electricalConstruction,
-								"theAssignment":theAssignment,
-								"automation":automation,
-								"remote":remote,
-								"communicationMode":communicationMode,
-								"inSitu":inSitu,
-								"networkCabinet":networkCabinet,
-								"station":station
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				});
-			})
-
-
-			$("#reject").click(function () {
-				jp.prompt("驳回, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/newAudit",
-							{
-								"taskId":"${construction.act.taskId}",
-								"taskName":"${construction.act.taskName}",
-								"taskDefKey":"${construction.act.taskDefKey}",
-								"procInsId":"${construction.act.procInsId}",
-								"procDefId":"${construction.act.procDefId}",
-								"flag":"reject",
-								"projectName":"${fns:unescapeHtml(construction.projectName)}",
-								"comment":window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				})
-			})
-
-
-			$('#startTime').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			$('#endTime').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			//富文本初始化
-			$('#reason').summernote({
-				height: 300,
-				lang: 'zh-CN',
-				readonly: true,
-				callbacks: {
-					onChange: function(contents, $editable) {
-						$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
-					}
-				}
-			});
 		});
-	</script>
+	</script>--%>
 </head>
 <body>
 <div class="wrapper wrapper-content">
@@ -212,6 +25,9 @@
 					</h3>
 				</div>
 				<div class="panel-body">
+					<button id="drawingReview" class="btn btn-info">
+						<i class="fa fa-folder-open-o"></i> 导入图纸审核信息
+					</button>
 					<div class="form-group text-center">
 						<%--<h3>${oALeave.act.taskName}</h3>--%>
 					</div>
@@ -226,7 +42,7 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审批人：</label></td>
 								<td class="width-35">
-									<sys:userselect roleName="施工单位;" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+									<sys:userselect roleName="施工单位;项目经理;" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
 <%--									<sys:fileUpload path="pic" fileNumLimit="2" fileSizeLimit="50" value="${testPic.pic}" type="image" uploadPath="/test/pic/testPic"></sys:fileUpload>--%>
 								</td>
@@ -254,17 +70,18 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
 								<td class="width-35">
-									<input type='text' id="powerLine"  name="powerLine" class="form-control required"  value="${construction.powerLine}"/>
+									<input type='text' readonly="readonly" id="powerLine"  name="powerLine" class="form-control required"  value="${construction.powerLine}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
-									<input type='text'  id='blackoutArea'  name="blackoutArea" class="form-control required"  value="${construction.blackoutArea}"/>
+									<input type='text' readonly="readonly"  id='blackoutArea'  name="blackoutArea" class="form-control required"  value="${construction.blackoutArea}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
 								<td class="width-35">
-									<form:select id="projectType" path="projectType" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='projectType'  name="projectType" class="form-control required"  value="${construction.projectType}"/>
+<%--									<form:select id="projectType" path="projectType" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="配变改造">配变改造</form:option>
 										<form:option value="配变新增">配变新增</form:option>
 										<form:option value="电缆项目">电缆项目</form:option>
@@ -276,136 +93,164 @@
 										<form:option value="环网柜更换">环网柜更换</form:option>
 										<form:option value="箱变更换">箱变更换</form:option>
 										<form:option value="其他特殊类">其他特殊类</form:option>
-									</form:select>								</td>
+									</form:select>		--%>						</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
 								<td class="width-35">
-									<form:select id="preliminaryJudgment" path="preliminaryJudgment" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='preliminaryJudgment'  name="preliminaryJudgment" class="form-control required"  value="${construction.preliminaryJudgment}"/>
+<%--									<form:select id="preliminaryJudgment" path="preliminaryJudgment" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="行政政处">行政政处</form:option>
 										<form:option value="民事政处">民事政处</form:option>
 										<form:option value="农村政处">农村政处</form:option>
 										<form:option value="无">无</form:option>
-									</form:select>								</td>
+									</form:select>					--%>
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
 								<td class="width-35">
-									<form:select id="civilEngineering" path="civilEngineering" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='civilEngineering'  name="civilEngineering" class="form-control required"  value="${construction.civilEngineering}"/>
+<%--									<form:select id="civilEngineering" path="civilEngineering" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="可能有土建">可能有土建</form:option>
 										<form:option value="无土建">无土建</form:option>
 										<form:option value="含土建">含土建</form:option>
 										<form:option value="纯土建">纯土建</form:option>
-									</form:select>								</td>
+									</form:select>				--%>
+								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
 								<td class="width-35">
-									<form:select id="baseType" path="baseType" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='baseType'  name="baseType" class="form-control required"  value="${construction.baseType}"/>
+<%--									<form:select id="baseType" path="baseType" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="无">无</form:option>
 										<form:option value="压桩">压桩</form:option>
 										<form:option value="灌注桩">灌注桩</form:option>
-									</form:select>								</td>
+									</form:select>					--%>
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
 								<td class="width-35">
-									<form:select id="planApproval" path="planApproval" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='planApproval'  name="planApproval" class="form-control required"  value="${construction.planApproval}"/>
+<%--									<form:select id="planApproval" path="planApproval" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="是">是</form:option>
 										<form:option value="否">否</form:option>
-									</form:select>								</td>
+									</form:select>		--%>
+								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
 								<td class="width-35">
-									<form:select id="transformationType" path="transformationType" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='transformationType'  name="transformationType" class="form-control required"  value="${construction.transformationType}"/>
+<%--									<form:select id="transformationType" path="transformationType" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="无">无</form:option>
 										<form:option value="环网柜">环网柜</form:option>
 										<form:option value="箱变">箱变</form:option>
 										<form:option value="干变">干变</form:option>
 										<form:option value="其他">其他</form:option>
-									</form:select>								</td>
+									</form:select>				--%>
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
 								<td class="width-35">
-									<input type='text' id='transformationEquipment'  name="transformationEquipment" class="form-control required"  value="${construction.transformationEquipment}"/>
+									<input type='text' readonly="readonly" id='transformationEquipment'  name="transformationEquipment" class="form-control required"  value="${construction.transformationEquipment}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
 								<td class="width-35">
-									<form:select id="newNamed" path="newNamed" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='newNamed'  name="newNamed" class="form-control required"  value="${construction.newNamed}"/>
+									<%--<form:select id="newNamed" path="newNamed" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="是">是</form:option>
 										<form:option value="否">否</form:option>
-									</form:select>
+									</form:select>--%>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
 								<td class="width-35">
-									<form:select id="putInto" path="putInto" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='putInto'  name="putInto" class="form-control required"  value="${construction.putInto}"/>
+									<%--<form:select id="putInto" path="putInto" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="是">是</form:option>
 										<form:option value="否">否</form:option>
-									</form:select>								</td>
+									</form:select>--%>
+								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
 								<td class="width-35">
-									<form:select id="electricalConstruction" path="electricalConstruction" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='electricalConstruction'  name="electricalConstruction" class="form-control required"  value="${construction.electricalConstruction}"/>
+<%--									<form:select id="electricalConstruction" path="electricalConstruction" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="是">是</form:option>
 										<form:option value="否">否</form:option>
-									</form:select>
+									</form:select>--%>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
 								<td class="width-35">
-									<form:select id="theAssignment" path="theAssignment" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='theAssignment'  name="theAssignment" class="form-control required"  value="${construction.theAssignment}"/>
+									<%--<form:select id="theAssignment" path="theAssignment" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="带电作业">带电作业</form:option>
 										<form:option value="停电作业">停电作业</form:option>
 										<form:option value="非涉电作业">非涉电作业</form:option>
 										<form:option value="未标注">未标注</form:option>
-									</form:select>								</td>
+									</form:select>--%>
+								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
 								<td class="width-35">
-									<form:select id="automation" path="automation" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='automation'  name="automation" class="form-control required"  value="${construction.automation}"/>
+									<%--<form:select id="automation" path="automation" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="是">是</form:option>
 										<form:option value="否">否</form:option>
-									</form:select>								</td>
+									</form:select>--%>
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
 								<td class="width-35">
-									<form:select id="remote" path="remote" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='remote'  name="remote" class="form-control required"  value="${construction.remote}"/>
+									<%--<form:select id="remote" path="remote" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="二遥">二遥</form:option>
 										<form:option value="三遥">三遥</form:option>
-									</form:select>								</td>
+									</form:select>			--%>
+								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
 								<td class="width-35">
-									<form:select id="communicationMode" path="communicationMode" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='communicationMode'  name="communicationMode" class="form-control required"  value="${construction.communicationMode}"/>
+									<%--<form:select id="communicationMode" path="communicationMode" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="光纤">光纤</form:option>
 										<form:option value="公网">公网</form:option>
 										<form:option value="专网">专网</form:option>
-									</form:select>								</td>
+									</form:select>--%>
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
 								<td class="width-35">
 									<div>
-										<form:select id="inSitu" path="inSitu" htmlEscape="false" maxlength="100"  class=" form-control">
+										<input type='text' readonly="readonly"  id='inSitu'  name="inSitu" class="form-control required"  value="${construction.blackoutArea}"/>
+										<%--<form:select id="inSitu" path="inSitu" htmlEscape="false" maxlength="100"  class=" form-control">
 											<form:option value="集中">集中</form:option>
 											<form:option value="就地">就地</form:option>
-										</form:select>
-									</div>								</td>
+										</form:select>--%>
+									</div>
+								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
-									<form:select id="networkCabinet" path="networkCabinet" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='networkCabinet'  name="networkCabinet" class="form-control required"  value="${construction.networkCabinet}"/>
+									<%--<form:select id="networkCabinet" path="networkCabinet" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="户外">户外</form:option>
 										<form:option value="户内">户内</form:option>
-									</form:select>								</td>
+									</form:select>--%>
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
 								<td class="width-35">
-									<input type='text'  id='station' name="station" class="form-control required"  value="${construction.station}"/>
+									<input type='text' readonly="readonly"  id='station' name="station" class="form-control required"  value="${construction.station}"/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
 								<td class="width-35">
-									<form:select id="powerFailure" path="powerFailure" htmlEscape="false" maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly"  id='powerFailure'  name="powerFailure" class="form-control required"  value="${construction.powerFailure}"/>
+								<%--<form:select id="powerFailure" path="powerFailure" htmlEscape="false" maxlength="100"  class=" form-control">
 										<form:option value="是">是</form:option>
 										<form:option value="否">否</form:option>
-									</form:select>								</td>
+									</form:select>	--%>
+								</td>
 							</tr>
 							</tbody>
 						</table>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionForm.js

@@ -0,0 +1,45 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+	/**
+	 * 配网专职提交申请页面
+	 * */
+	$(document).ready(function() {
+		jp.ajaxForm("#inputForm",function(data){
+			if(data.success){
+				jp.success(data.msg);
+				jp.go("${ctx}"+ data.body.targetUrl);
+			}else{
+				jp.error(data.msg);
+				$("#inputForm").find("button:submit").button("reset");
+			}
+		});
+
+		$("#agree").click(function () {
+			var tuser = $("#tuserName").val();
+			console.log(tuser);
+			if (tuser=="") {
+				jp.error("请选择用户");
+				return;
+			}
+		})
+
+		$('#acceptDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+
+		$('#examineDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+		//富文本初始化
+		$('#reason').summernote({
+			height: 300,
+			lang: 'zh-CN',
+			callbacks: {
+				onChange: function(contents, $editable) {
+					$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+				}
+			}
+		});
+
+	})
+</script>

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

@@ -2,100 +2,12 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>施工交底管理</title>
+	<title>施工交底提交申请</title>
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
+	<%@include file="constructionForm.js" %>
 	<script type="text/javascript">
-
-		$(document).ready(function() {
-			jp.ajaxForm("#inputForm",function(data){
-				if(data.success){
-					jp.success(data.msg);
-					jp.go("${ctx}"+ data.body.targetUrl);
-				}else{
-					jp.error(data.msg);
-					$("#inputForm").find("button:submit").button("reset");
-				}
-			});
-
-			$("#agree").click(function () {
-				var tuser = $("#tuserName").val();
-				console.log(tuser);
-				if (tuser=="") {
-					jp.error("请选择用户");
-					return;
-				}
-			})
-
-			$('#acceptDate').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			$('#examineDate').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			//富文本初始化
-			$('#reason').summernote({
-				height: 300,
-				lang: 'zh-CN',
-				callbacks: {
-					onChange: function(contents, $editable) {
-						$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
-					}
-				}
-			});
-
-			$("#${id}Button, #${id}Name").click(function(){
-				// 是否限制选择，如果限制，设置为disabled
-				if ($("#${id}Button").hasClass("disabled")){
-					return true;
-				}
-				// 正常打开
-
-/*				jp.openUserSelectDialog(${isMultiSelected? true:false},function(ids, names){
-					$("#${id}Id").val(ids.replace(/u_/ig,""));
-					$("#${id}Name").val(names);
-					$("#${id}Name").focus();
-				})*/
-					top.layer.open({
-						type: 2,
-						area: ['900px', '560px'],
-						title:"选择用户",
-						auto:true,
-						maxmin: true, //开启最大化最小化按钮
-						content: ctx+"/sys/user/myUserSelect?office=e223b1c8472843bbbbc94c9b72c29737",
-						btn: ['确定', '关闭'],
-						yes: function(index, layero){
-							var ids = layero.find("iframe")[0].contentWindow.getIdSelections();
-							var names = layero.find("iframe")[0].contentWindow.getNameSelections();
-							var loginNames = layero.find("iframe")[0].contentWindow.getLoginNameSelections();
-							if(ids.length ==0){
-								jp.warning("请选择至少一个用户!");
-								return;
-							}
-							// 执行保存
-							yesFuc(ids.join(","), names.join(","), loginNames.join(","));
-							top.layer.close(index);
-						},
-						cancel: function(index){
-							//取消默认为空，如需要请自行扩展。
-							top.layer.close(index);
-						}
-					});
-			});
-
-			$("#${id}DelButton").click(function(){
-				// 是否限制选择，如果限制，设置为disabled
-				if ($("#${id}Button").hasClass("disabled")){
-					return true;
-				}
-				// 清除
-				$("#${id}Id").val("");
-				$("#${id}Name").val("");
-				$("#${id}Name").focus();
-
-			});
-		});
 	</script>
 </head>
 <body>
@@ -176,8 +88,6 @@
 							</tbody>
 						</table>
 
-
-
 						<div class="form-group">
 							<div class="col-lg-3"></div>
 							<c:if test="${construction.act.taskDefKey ne '' && !construction.act.finishTask && construction.act.isNextGatewaty}">

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideForm.js

@@ -0,0 +1,155 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+	<script>
+    /**
+     * 项目经理组织交底页面
+     * */
+    $(document).ready(function () {
+        jp.ajaxForm("#inputForm", function (data) {
+            if (data.success) {
+                jp.success(data.msg);
+                jp.go("${ctx}/managementcenter/divide");
+            } else {
+                jp.error(data.msg);
+                $("#inputForm").find("button:submit").button("reset");
+            }
+        });
+
+
+        $("#agree").click(function () {
+            /*	var conId = $("#id").val();
+                var channel = $("#channel").val();
+                var capacity = $("#capacity").val();
+                var sceneSize = $("#sceneSize").val();
+                var capacitySize = $("#capacitySize").val();
+                var hiddenDanger = $("#hiddenDanger").val();
+                var influenceConstruction = $("#influenceConstruction").val();
+                var projectRepetition = $("#projectRepetition").val();
+                var implemented = $("#implemented").val();
+                var transformer = $("#transformer").val();
+                var lineName = $("#lineName").val();
+                var quantities = $("#quantities").val();
+                var rodNumber = $("#rodNumber").val();
+                var administrationType = $("#administrationType").val();
+                var politicalProblem = $("#politicalProblem").val();
+                var precondition = $("#precondition").val();
+                var placementMode = $("#placementMode").val();
+                var productionDate = $("#productionDate").val();
+                var IntegrateModule = $("#IntegrateModule").val();
+                var needReplace = $("#needReplace").val();
+                var overallTransformation = $("#overallTransformation").val();*/
+            jp.prompt("没有问题, 审批意见", function (message) {
+                jp.post("${ctx}/act/task/audit3",
+                    {
+                        "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)
+                        /*"conId":conId,
+                        "channel":channel,
+                        "capacity":capacity,
+                        "sceneSize":sceneSize,
+                        "capacitySize":capacitySize,
+                        "hiddenDanger":hiddenDanger,
+                        "influenceConstruction":influenceConstruction,
+                        "projectRepetition":projectRepetition,
+                        "implemented":implemented,
+                        "transformer":transformer,
+                        "lineName":lineName,
+                        "quantities":quantities,
+                        "rodNumber":rodNumber,
+                        "administrationType":administrationType,
+                        "politicalProblem":politicalProblem,
+                        "precondition":precondition,
+                        "placementMode":placementMode,
+                        "productionDate":productionDate,
+                        "IntegrateModule":IntegrateModule,
+                        "needReplace":needReplace,
+                        "overallTransformation":overallTransformation*/
+                    },
+                    function (data) {
+                        if (data.success) {
+                            jp.success(data.msg);
+                            jp.go("${ctx}/act/task/todo")
+                        }
+                    })
+            })
+        })
+
+
+        $("#reject").click(function () {
+            jp.prompt("存在问题, 审批意见", function (message) {
+                jp.post("${ctx}/act/task/audit3",
+                    {
+                        "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")
+                        }
+                    })
+            })
+        })
+
+
+        $('#startTime').datetimepicker({
+            format: "YYYY-MM-DD HH:mm:ss"
+        });
+        $('#endTime').datetimepicker({
+            format: "YYYY-MM-DD HH:mm:ss"
+        });
+        //富文本初始化
+        $('#reason').summernote({
+            height: 300,
+            lang: 'zh-CN',
+            readonly: true,
+            callbacks: {
+                onChange: function (contents, $editable) {
+                    $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+                }
+            }
+        });
+
+        /**
+         * 导入交底结论
+         * */
+        $("#importConclusion").click(function () {
+            var procInsId = $("#procInsId").val();
+            var projectName = $("#projectName").val();
+            jp.open({
+                type: 2,
+                area: [500, 200],
+                auto: true,
+                title: "导入交底结论",
+                content: "${ctx}/tag/importExcel",
+                btn: ['确定', '关闭'],
+                btn1: function (index, layero) {
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/divide/importConclusion?projectName=' + encodeURI(encodeURI(projectName)) + '&procInsId=' + procInsId, function (data) {
+                        if (data.success) {
+                            jp.success(data.msg);
+                            window.location.reload();
+                        } else {
+                            jp.alert(data.msg);
+                        }
+                        jp.close(index);
+                    });//调用保存事件
+                    return false;
+                },
+                btn2: function (index) {
+                    jp.close(index);
+                }
+            });
+        });
+
+    })
+</script>

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

@@ -6,167 +6,7 @@
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
-	<script type="text/javascript">
-
-		$(document).ready(function() {
-			jp.ajaxForm("#inputForm",function(data){
-				if(data.success){
-					jp.success(data.msg);
-					jp.go("${ctx}/managementcenter/divide");
-				}else{
-					jp.error(data.msg);
-					$("#inputForm").find("button:submit").button("reset");
-				}
-			});
-
-
-			$("#agree").click(function () {
-				var conId = $("#id").val();
-				var channel = $("#channel").val();
-				var capacity = $("#capacity").val();
-				var sceneSize = $("#sceneSize").val();
-				var capacitySize = $("#capacitySize").val();
-				var hiddenDanger = $("#hiddenDanger").val();
-				var influenceConstruction = $("#influenceConstruction").val();
-				var projectRepetition = $("#projectRepetition").val();
-				var implemented = $("#implemented").val();
-				var transformer = $("#transformer").val();
-				var lineName = $("#lineName").val();
-				var quantities = $("#quantities").val();
-				var rodNumber = $("#rodNumber").val();
-				var administrationType = $("#administrationType").val();
-				var politicalProblem = $("#politicalProblem").val();
-				var precondition = $("#precondition").val();
-				var placementMode = $("#placementMode").val();
-				var productionDate = $("#productionDate").val();
-				var IntegrateModule = $("#IntegrateModule").val();
-				var needReplace = $("#needReplace").val();
-				var overallTransformation = $("#overallTransformation").val();
-				jp.prompt("没有问题, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/audit3",
-							{
-								"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),
-								"conId":conId,
-								"channel":channel,
-								"capacity":capacity,
-								"sceneSize":sceneSize,
-								"capacitySize":capacitySize,
-								"hiddenDanger":hiddenDanger,
-								"influenceConstruction":influenceConstruction,
-								"projectRepetition":projectRepetition,
-								"implemented":implemented,
-								"transformer":transformer,
-								"lineName":lineName,
-								"quantities":quantities,
-								"rodNumber":rodNumber,
-								"administrationType":administrationType,
-								"politicalProblem":politicalProblem,
-								"precondition":precondition,
-								"placementMode":placementMode,
-								"productionDate":productionDate,
-								"IntegrateModule":IntegrateModule,
-								"needReplace":needReplace,
-								"overallTransformation":overallTransformation
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				})
-			})
-
-
-			$("#reject").click(function () {
-				jp.prompt("存在问题, 审批意见", function (message) {
-					var conId = $("#id").val();
-					var channel = $("#channel").val();
-					var capacity = $("#capacity").val();
-					var sceneSize = $("#sceneSize").val();
-					var capacitySize = $("#capacitySize").val();
-					var hiddenDanger = $("#hiddenDanger").val();
-					var influenceConstruction = $("#influenceConstruction").val();
-					var projectRepetition = $("#projectRepetition").val();
-					var implemented = $("#implemented").val();
-					var transformer = $("#transformer").val();
-					var lineName = $("#lineName").val();
-					var quantities = $("#quantities").val();
-					var rodNumber = $("#rodNumber").val();
-					var administrationType = $("#administrationType").val();
-					var politicalProblem = $("#politicalProblem").val();
-					var precondition = $("#precondition").val();
-					var placementMode = $("#placementMode").val();
-					var productionDate = $("#productionDate").val();
-					var IntegrateModule = $("#IntegrateModule").val();
-					var needReplace = $("#needReplace").val();
-					var overallTransformation = $("#overallTransformation").val();
-					jp.post("${ctx}/act/task/audit3",
-							{
-								"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),
-								"conId":conId,
-								"channel":channel,
-								"capacity":capacity,
-								"sceneSize":sceneSize,
-								"capacitySize":capacitySize,
-								"hiddenDanger":hiddenDanger,
-								"influenceConstruction":influenceConstruction,
-								"projectRepetition":projectRepetition,
-								"implemented":implemented,
-								"transformer":transformer,
-								"lineName":lineName,
-								"quantities":quantities,
-								"rodNumber":rodNumber,
-								"administrationType":administrationType,
-								"politicalProblem":politicalProblem,
-								"precondition":precondition,
-								"placementMode":placementMode,
-								"productionDate":productionDate,
-								"IntegrateModule":IntegrateModule,
-								"needReplace":needReplace,
-								"overallTransformation":overallTransformation
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				})
-			})
-
-
-			$('#startTime').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			$('#endTime').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			//富文本初始化
-			$('#reason').summernote({
-				height: 300,
-				lang: 'zh-CN',
-				readonly: true,
-				callbacks: {
-					onChange: function(contents, $editable) {
-						$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
-					}
-				}
-			});
-		});
-	</script>
+	<%@include file="divideForm.js"%>
 </head>
 <body>
 <div class="wrapper wrapper-content">
@@ -179,11 +19,13 @@
 					</h3>
 				</div>
 				<div class="panel-body">
-					<div class="form-group text-center">
-						<%--<h3>${oALeave.act.taskName}</h3>--%>
-					</div>
+					<button id="importConclusion" class="btn btn-info">
+						<i class="fa fa-folder-open-o"></i> 导入交地结论
+					</button>
 					<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 id="projectName" type="hidden" value="${fns:unescapeHtml(construction.projectName)}">
 						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
 
 						<table class="table table-bordered">
@@ -322,122 +164,121 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
 								<td class="width-35">
-									<input type='text' id='channel'  name="channel" class="form-control required"  value=""/>
-
+									<input type='text' readonly="readonly" id='channel'  name="channel" class="form-control required"  value=""/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
 								<td class="width-35">
-									<select id="capacity"  maxlength="100"  class=" form-control">
+									<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value=""/>
+										<%--<select id="capacity"  maxlength="100"  class=" form-control">
 										<option value="是">是</option>
 										<option value="否">否</option>
-									</select>
+									</select>--%>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
 								<td class="width-35">
-									<input type='text' id='sceneSize'  name="sceneSize" class="form-control required"  value=""/>
-
+									<input type='text' readonly="readonly" id='sceneSize'  name="sceneSize" class="form-control required"  value=""/>
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
 								<td class="width-35">
-									<input type='text' id='capacitySize'  name="capacitySize" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='capacitySize'  name="capacitySize" class="form-control required"  value=""/>
 
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
 								<td class="width-35">
-									<input type='text' id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value=""/>
 
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
-									<input type='text' id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value=""/>
 
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
 								<td class="width-35">
-									<input type='text' id='projectRepetition'  name="projectRepetition" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value=""/>
 
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
 								<td class="width-35">
-									<input type='text' id='implemented'  name="implemented" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value=""/>
 
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
 								<td class="width-35">
-									<input type='text' id='transformer'  name="transformer" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value=""/>
 
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
 								<td class="width-35">
-									<input type='text' id='lineName'  name="lineName" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value=""/>
 
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
 								<td class="width-35">
-									<input type='text' id='quantities'  name="quantities" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value=""/>
 
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
-									<input type='text' id='rodNumber'  name="rodNumber" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value=""/>
 
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
 								<td class="width-35">
-									<input type='text' id='administrationType'  name="administrationType" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value=""/>
 
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
 								<td class="width-35">
-									<input type='text' id='politicalProblem'  name="politicalProblem" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='politicalProblem'  name="politicalProblem" class="form-control required"  value=""/>
 
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
 								<td class="width-35">
-									<input type='text' id='precondition'  name="precondition" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='precondition'  name="precondition" class="form-control required"  value=""/>
 
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
 								<td class="width-35">
-									<input type='text' id='placementMode'  name="placementMode" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value=""/>
 
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
 								<td class="width-35">
-									<input type='text' id='productionDate'  name="productionDate" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='productionDate'  name="productionDate" class="form-control required"  value=""/>
 
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
 								<td class="width-35">
-									<input type='text' id='IntegrateModule'  name="IntegrateModule" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='IntegrateModule'  name="IntegrateModule" class="form-control required"  value=""/>
 
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
 								<td class="width-35">
-									<input type='text' id='needReplace'  name="needReplace" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='needReplace'  name="needReplace" class="form-control required"  value=""/>
 
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
-									<input type='text' id='overallTransformation'  name="overallTransformation" class="form-control required"  value=""/>
+									<input type='text' readonly="readonly" id='overallTransformation'  name="overallTransformation" class="form-control required"  value=""/>
 
 								</td>
 							</tr>