Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project.java

@@ -67,6 +67,25 @@ public class Project extends DataEntity<Project> {
     private Integer earlyMaterial;//判断项目是否可以提前发起领料
     private Integer preConstruction;//判断项目是否可以提前施工
 
+    private String loginNameFind;//登录名称
+    private String loginNameFindStats;//登录状态
+
+    public String getLoginNameFind() {
+        return loginNameFind;
+    }
+
+    public void setLoginNameFind(String loginNameFind) {
+        this.loginNameFind = loginNameFind;
+    }
+
+    public String getLoginNameFindStats() {
+        return loginNameFindStats;
+    }
+
+    public void setLoginNameFindStats(String loginNameFindStats) {
+        this.loginNameFindStats = loginNameFindStats;
+    }
+
     @ExcelField(title = "序号", align = 2, sort = 1)
     public String getSerialNumber() {
         return serialNumber;

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -86,6 +86,9 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="requireName != null and  requireName != ''">
+				AND a.require_name LIKE CONCAT('%',#{requireName},'%')
+			</if>
 			<if test="status != null and  status != ''">
 				AND a.status = #{status}
 			</if>
@@ -95,12 +98,7 @@
 			<if test="id != null and  id != ''">
 				AND a.id = #{id}
 			</if>
-			<if test="requireName != null and  requireName != ''">
-				AND a.require_name LIKE CONCAT(CONCAT('%',#{requireName},'%'))
-			</if>
-			<if test="projectManageRole != null and  projectManageRole != ''">
-				AND a.project_manage_role = #{projectManageRole}
-			</if>
+
 			<if test="constructionUnitRole != null and  constructionUnitRole != ''">
 				AND a.construction_unit_role = #{constructionUnitRole}
 			</if>
@@ -122,6 +120,23 @@
 				<if test="dbName == 'mssql'">'%'+#{projectName}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{projectName},'%')</if>
 			</if>
+			<if test="loginNameFindStats != null and loginNameFindStats !='' ">
+				<if test="loginNameFind != null and loginNameFind != '' ">
+					AND a.project_manage_role = #{loginNameFind}
+					or a.distribution_engineering = #{loginNameFind}
+					or a.distribution_materials = #{loginNameFind}
+					or a.distribution_system = #{loginNameFind}
+					or a.distribution_policy = #{loginNameFind}
+					or a.management_leader = #{loginNameFind}
+					or a.run_unit_role = #{loginNameFind}
+					or a.through_research_role = #{loginNameFind}
+					or a.construction_unit_role = #{loginNameFind}
+					or a.construction_unit_manage = #{loginNameFind}
+					or a.construction_unit_leader = #{loginNameFind}
+					or a.design_unit_manage = #{loginNameFind}
+					or a.design_unit_leader = #{loginNameFind}
+				</if>
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -132,7 +147,11 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
+	<!--<if test="projectManageRole != null and  projectManageRole != ''">-->
+		<!--AND a.project_manage_role = #{projectManageRole}-->
+	<!--</if>-->
+
 	<select id="findAllList" resultType="Project" >
 		SELECT
 		<include refid="projectColumns"/>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -533,4 +533,17 @@ public  class ProExcelInfo {
         return "2";
     }
 
+    public static boolean getFlagUpdate(Project project){
+        if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
+            ||!project.getConstructionStatus().equals("0")
+            ||project.getEarlyMaterial()!=0||project.getPreConstruction()!=0){
+            if (project.getStatus().equals("3")&&project.getAcquisitionStatus().equals("3")
+                    &&project.getConstructionStatus().equals("3")
+                    &&project.getEarlyMaterial()==3 && project.getPreConstruction()==3){
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -11,6 +11,7 @@ import java.util.Map;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import javax.validation.ConstraintViolationException;
 
 import com.jeeplus.common.utils.SpringContextHolder;
@@ -38,6 +39,7 @@ import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -100,13 +102,21 @@ public class ProjectController extends BaseController {
 		return "modules/sg/managementcenter/project/projectList";
 	}
 	
-		/**
-	 * 表单列表数据
+	 /**
+	 	* 表单列表数据
 	 */
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//获取登录名
+		String loginName = UserUtils.getUser().getLoginName();//获取登录名
+		if (!"admin".equals(loginName)){
+			project.setLoginNameFindStats("1");
+			project.setLoginNameFind(loginName);
+		}
+		HttpSession session = request.getSession();
+		session.setAttribute("projectEpo",project);
 		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
 		return getBootstrapData(page);
 	}
@@ -217,6 +227,12 @@ public class ProjectController extends BaseController {
 				j.setSuccess(true);
 				j.setMsg("保存需求基本信息成功");
 			}else{
+				boolean flagUpdate = ProExcelInfo.getFlagUpdate(project);
+				if (flagUpdate){
+					j.setSuccess(false);
+					j.setMsg("修改失败：流程正在发起中");
+					return j;
+				}
 				if (!"".equals(judgeValue)||!project.getDistributionEngineering().equals(loginName)){
 					j.setSuccess(false);
 					j.setMsg("修改失败："+judgeValue+"数据不符合规范");
@@ -313,12 +329,17 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:export")
     @RequestMapping(value = "export")
-    public AjaxJson exportFile(Project project, HttpServletRequest request, HttpServletResponse response) {
+    public AjaxJson exportFile(Project project, HttpServletRequest request, HttpServletResponse response){
 		AjaxJson j = new AjaxJson();
+
 		try {
-			project.setProjectManageRole(UserUtils.getUser().getLoginName());
-            String fileName = "需求基本信息"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-            Page<Project> page = projectService.findPage(new Page<Project>(request, response, -1), project);
+//			project.setProjectManageRole(UserUtils.getUser().getLoginName());
+			String fileName = "需求基本信息"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+
+			HttpSession session = request.getSession();
+			Project projectEpo = (Project)session.getAttribute("projectEpo");
+
+            Page<Project> page = projectService.findPage(new Page<Project>(request, response, -1), projectEpo);
     		new ExportExcel("需求基本信息", Project.class).setDataList(page.getList()).write(response, fileName).dispose();
     		j.setSuccess(true);
     		j.setMsg("导出成功！");

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm.jsp

@@ -39,7 +39,7 @@
 </head>
 <body class="bg-white">
 		<form:form id="inputForm" modelAttribute="project" class="form-horizontal">
-		<form:hidden path="id"/>	
+		<form:hidden path="id"/>
 		<table class="table table-bordered">
 			<tbody>
 				<tr>
@@ -163,169 +163,56 @@
 					</td>
 				</tr>
 				<tr>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>项目类型：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="projectType" htmlEscape="false" class="form-control required"/>--%>
-					<%--</td>--%>
+
 					<td class="width-15 active"><label class=""><font color="red">*</font>交底类型：</label></td>
 					<td class="width-35">
 						<form:input path="clarificaitonType" htmlEscape="false" class="form-control required"/>
 					</td>
-						<td class="width-15 active"></td>
+						<td class="width-15 active"><label class="">建设理由分类：</label></td>
 						<td class="width-35">
-								<%--<form:input path="projectType" htmlEscape="false" class="form-control required"/>--%>
+							<form:input path="bulidClassificationResons" htmlEscape="false"    class="form-control"/>
 						</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="">建设理由分类：</label></td>
-					<td class="width-35">
-						<form:input path="bulidClassificationResons" htmlEscape="false"    class="form-control"/>
-					</td>
 					<td class="width-15 active"><label class="">建设理由：</label></td>
 					<td class="width-35">
 						<form:textarea path="bulbidResons" htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">设备基本情况：</label></td>
 					<td class="width-35">
 						<form:input path="asicEquipment" htmlEscape="false"    class="form-control"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">运行班：</label></td>
 					<td class="width-35">
 						<form:input path="runTheClass" htmlEscape="false"    class="form-control"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">项目组：</label></td>
 					<td class="width-35">
 						<form:input path="projectTeam" htmlEscape="false"    class="form-control"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">费用估算：</label></td>
 					<td class="width-35">
 						<form:input path="costEstimate" htmlEscape="false"    class="form-control number"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">是否迎风期度夏项目：</label></td>
 					<td class="width-35">
 						<form:input path="whetherRheUpwind" htmlEscape="false"    class="form-control"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">确定下达时间：</label></td>
 					<td class="width-35">
 						<form:input path="sureDaDate" htmlEscape="false"    class="form-control"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">备注：</label></td>
 					<td class="width-35">
 						<form:textarea path="textRemark" htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
-					<td class="width-15 active"></td>
-					<td class="width-35">
-							<%--<form:input path="projectType" htmlEscape="false" class="form-control required"/>--%>
-					</td>
-					<%--<td class="width-15 active"><label class="">停电线路：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="powerLine" htmlEscape="false"    class="form-control"/>--%>
-					<%--</td>--%>
 				</tr>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="powerScope" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>项目类型：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="projectType" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>是否为停电打包项目：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="powerFlagPackage" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>政处初步判断：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="preliminaryJudgment" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>是否含土建（不含钢管杆）：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="flagCivilEngineering" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>钢管杆基础类型：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="steelTubePole" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>是否需要规矩报批：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="flagApprovalPlanning" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>设备改造类型：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="equCreateType" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class="">改造设备尺寸及间隔数：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="equCreateSize" htmlEscape="false" class="form-control"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>是否新设备命名：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="flagNewEquName" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>是否含变电站新间格投运：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="includeBdzNews" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>是否非涉电电气施工：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="flagNoElectrical" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>图纸标注的带点作业情况：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="drawingsWork" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>是否含自动化：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="flagAutomation" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>二遥或三摇：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="twoAndThreeRemote" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>通讯方式：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="phoneStyle" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>柱开集中或就业地：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="stayOpenArea" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-					<%--<td class="width-15 active"><label class=""><font color="red">*</font>环网柜：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="ringNetworkCabinet" htmlEscape="false"    class="form-control required"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
-				<%--<tr>--%>
-					<%--<td class="width-15 active"><label class="">站房dtu：</label></td>--%>
-					<%--<td class="width-35">--%>
-						<%--<form:input path="stationDtu" htmlEscape="false"    class="form-control"/>--%>
-					<%--</td>--%>
-				<%--</tr>--%>
 			</tbody>
 		</table>
 	</form:form>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm2.jsp

@@ -45,274 +45,268 @@
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>项目需求名称：</label></td>
 					<td class="width-35">
-						<form:input path="requireName" htmlEscape="false"    class="form-control required"/>
+						<form:input path="requireName" readonly="true"  htmlEscape="false"    class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class="">工程编号：</label></td>
 					<td class="width-35">
-						<form:input path="projectId" htmlEscape="false" class="form-control"/>
+						<form:input path="projectId"  readonly="true"  htmlEscape="false" class="form-control"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class="">项目名称：</label></td>
 					<td class="width-35">
-						<form:input path="projectName" htmlEscape="false"    class="form-control"/>
+						<form:input path="projectName" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
 					<td class="width-15 active"><label class="">项目定义号：</label></td>
 					<td class="width-35">
-						<form:input path="projectNumber" htmlEscape="false" class="form-control"/>
+						<form:input path="projectNumber" readonly="true" htmlEscape="false" class="form-control"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>类型：</label></td>
 					<td class="width-35">
-						<form:input path="type" htmlEscape="false" class="form-control required"/>
+						<form:input path="type" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>需求提出单位：</label></td>
 					<td class="width-35">
-						<form:input path="demandUnit" htmlEscape="false"   class="form-control required"/>
+						<form:input path="demandUnit" readonly="true" htmlEscape="false"   class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class="">变电站名称：</label></td>
 					<td class="width-35">
-						<form:input path="bdzName" htmlEscape="false"    class="form-control"/>
+						<form:input path="bdzName" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
 					<td class="width-15 active"><label class="">线路名称：</label></td>
 					<td class="width-35">
-						<form:input path="lineName" htmlEscape="false"    class="form-control"/>
+						<form:input path="lineName" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>项目经理角色：</label></td>
 					<td class="width-35">
-						<form:input path="projectManageRole" htmlEscape="false" class="form-control required"/>
+						<form:input path="projectManageRole" readonly="true" disabled="disabled" htmlEscape="false" class="form-control required "/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>配网工程专职角色：</label></td>
 					<td class="width-35">
-						<form:input path="distributionEngineering" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionEngineering" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>配网物资专职角色：</label></td>
 					<td class="width-35">
-						<form:input path="distributionMaterials" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionMaterials" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>配网系统专职角色：</label></td>
 					<td class="width-35">
-						<form:input path="distributionSystem" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionSystem" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>配网政策处理专职：</label></td>
 					<td class="width-35">
-						<form:input path="distributionPolicy" htmlEscape="false" class="form-control required"/>
+						<form:input path="distributionPolicy" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>项目管理中心领导角色：</label></td>
 					<td class="width-35">
-						<form:input path="managementLeader" htmlEscape="false" class="form-control required"/>
+						<form:input path="managementLeader" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位：</label></td>
 					<td class="width-35">
-						<form:input path="runUnit" htmlEscape="false" class="form-control required"/>
+						<form:input path="runUnit" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位角色：</label></td>
 					<td class="width-35">
-						<form:input path="runUnitRole" htmlEscape="false" class="form-control required"/>
+						<form:input path="runUnitRole" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>经研所角色：</label></td>
 					<td class="width-35">
-						<form:input path="throughResearchRole" htmlEscape="false" class="form-control required"/>
+						<form:input path="throughResearchRole"  readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位：</label></td>
 					<td class="width-35">
-						<form:input path="constructionUnit" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionUnit" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位角色：</label></td>
 					<td class="width-35">
-						<form:input path="constructionUnitRole" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionUnitRole" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位项目经理：</label></td>
 					<td class="width-35">
-						<form:input path="constructionUnitManage" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionUnitManage" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位领导：</label></td>
 					<td class="width-35">
-						<form:input path="constructionUnitLeader" htmlEscape="false" class="form-control required"/>
+						<form:input path="constructionUnitLeader" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>设计单位：</label></td>
 					<td class="width-35">
-						<form:input path="designUnit" htmlEscape="false" class="form-control required"/>
+						<form:input path="designUnit" htmlEscape="false" readonly="true" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>设计单位项目经理：</label></td>
 					<td class="width-35">
-						<form:input path="designUnitManage" htmlEscape="false" class="form-control required"/>
+						<form:input path="designUnitManage" htmlEscape="false" readonly="true" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>设计单位领导：</label></td>
 					<td class="width-35">
-						<form:input path="designUnitLeader" htmlEscape="false" class="form-control required"/>
+						<form:input path="designUnitLeader" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>交底类型：</label></td>
 					<td class="width-35">
-						<form:input path="clarificaitonType" htmlEscape="false" class="form-control required"/>
+						<form:input path="clarificaitonType" readonly="true" htmlEscape="false" class="form-control required"/>
 					</td>
-					<td class="width-15 active"></td>
+					<td class="width-15 active"><label class="">建设理由分类：</label></td>
 					<td class="width-35">
-							<%--<form:input path="projectType" htmlEscape="false" class="form-control required"/>--%>
+						<form:input path="bulidClassificationResons" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="">建设理由分类：</label></td>
-					<td class="width-35">
-						<form:input path="bulidClassificationResons" htmlEscape="false"    class="form-control"/>
-					</td>
 					<td class="width-15 active"><label class="">建设理由：</label></td>
 					<td class="width-35">
-						<form:textarea path="bulbidResons" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea path="bulbidResons" readonly="true" htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">设备基本情况：</label></td>
 					<td class="width-35">
-						<form:input path="asicEquipment" htmlEscape="false"    class="form-control"/>
+						<form:input path="asicEquipment" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">运行班：</label></td>
 					<td class="width-35">
-						<form:input path="runTheClass" htmlEscape="false"    class="form-control"/>
+						<form:input path="runTheClass" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">项目组：</label></td>
 					<td class="width-35">
-						<form:input path="projectTeam" htmlEscape="false"    class="form-control"/>
+						<form:input path="projectTeam" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">费用估算：</label></td>
 					<td class="width-35">
-						<form:input path="costEstimate" htmlEscape="false"    class="form-control number"/>
+						<form:input path="costEstimate" readonly="true" htmlEscape="false"    class="form-control number"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">是否迎风期度夏项目：</label></td>
 					<td class="width-35">
-						<form:input path="whetherRheUpwind" htmlEscape="false"    class="form-control"/>
+						<form:input path="whetherRheUpwind" readonly="true"  htmlEscape="false"    class="form-control"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">确定下达时间：</label></td>
 					<td class="width-35">
-						<form:input path="sureDaDate" htmlEscape="false"    class="form-control"/>
+						<form:input path="sureDaDate" readonly="true" htmlEscape="false"    class="form-control"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">备注：</label></td>
 					<td class="width-35">
-						<form:textarea path="textRemark" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea path="textRemark" readonly="true" htmlEscape="false" rows="4"    class="form-control "/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="">停电线路：</label></td>
 					<td class="width-35">
 						<form:input path="powerLine" htmlEscape="false"    class="form-control"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>
 					<td class="width-35">
 						<form:input path="powerScope" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>项目类型：</label></td>
 					<td class="width-35">
 						<form:input path="projectType" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否为停电打包项目：</label></td>
 					<td class="width-35">
 						<form:input path="powerFlagPackage" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>政处初步判断：</label></td>
 					<td class="width-35">
 						<form:input path="preliminaryJudgment" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否含土建（不含钢管杆）：</label></td>
 					<td class="width-35">
 						<form:input path="flagCivilEngineering" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>钢管杆基础类型：</label></td>
 					<td class="width-35">
 						<form:input path="steelTubePole" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否需要规矩报批：</label></td>
 					<td class="width-35">
 						<form:input path="flagApprovalPlanning" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>设备改造类型：</label></td>
 					<td class="width-35">
 						<form:input path="equCreateType" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">改造设备尺寸及间隔数：</label></td>
 					<td class="width-35">
 						<form:input path="equCreateSize" htmlEscape="false" class="form-control"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否新设备命名：</label></td>
 					<td class="width-35">
 						<form:input path="flagNewEquName" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否含变电站新间格投运：</label></td>
 					<td class="width-35">
 						<form:input path="includeBdzNews" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否非涉电电气施工：</label></td>
 					<td class="width-35">
 						<form:input path="flagNoElectrical" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>图纸标注的带点作业情况：</label></td>
 					<td class="width-35">
 						<form:input path="drawingsWork" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否含自动化：</label></td>
 					<td class="width-35">
 						<form:input path="flagAutomation" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>二遥或三摇：</label></td>
 					<td class="width-35">
 						<form:input path="twoAndThreeRemote" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>通讯方式：</label></td>
 					<td class="width-35">
 						<form:input path="phoneStyle" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>柱开集中或就业地：</label></td>
 					<td class="width-35">
 						<form:input path="stayOpenArea" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>环网柜：</label></td>
 					<td class="width-35">
 						<form:input path="ringNetworkCabinet" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="">站房dtu：</label></td>
 					<td class="width-35">
 						<form:input path="stationDtu" htmlEscape="false"    class="form-control"/>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectList.js

@@ -106,7 +106,12 @@ $(document).ready(function() {
                 }
 
             }
+                   ,{
+                       field: 'projectNumber',
+                       title: '工程定义号',
+                       width:120
 
+                   }
                    ,{
                        field: 'projectId',
                        title: '工程编号',