修改

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

@@ -1358,7 +1358,7 @@ public class ActTaskService extends BaseService {
 				vars.put("design",user.getThroughResearchRole());
 				vars.put("jys", true);
 			} else {
-				vars.put("design", user.getDesignUnitRole());
+				vars.put("design", user.getDesignUnitManage());
 				vars.put("des", true);
 			}
 		} else {
@@ -1427,7 +1427,7 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 			vars.put("design", user.getProjectManageRole());
 		} else {
-			vars.put("design", user.getDesignUnitRole());
+			vars.put("design", user.getDesignUnitManage());
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -2407,7 +2407,7 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(flag)? true : false);
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
-		String designUnitRole = user.getDesignUnitRole();
+		String designUnitRole = user.getDesignUnitManage();
 		if ("yes".equals(flag)) {
 			vars.put("design",designUnitRole);
 		} else {

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

@@ -24,8 +24,11 @@ public class Project extends DataEntity<Project> {
     private String throughResearchRole;//经研所角色
     private String constructionUnit;//施工单位
     private String constructionUnitRole;//施工单位角色
+    private String constructionUnitManage;//施工单位项目经理
+    private String constructionUnitLeader;//施工单位领导
     private String designUnit;//设计单位
-    private String designUnitRole;//设计单位角色
+    private String designUnitManage;//设计单位角色
+    private String designUnitLeader;//施工 单位领导
     private String clarificaitonType;//交底类型
     private String bulidClassificationResons;//建设理由分类
     private String bulbidResons;//建设理由
@@ -56,6 +59,7 @@ public class Project extends DataEntity<Project> {
     private String stayOpenArea;//柱开集中或就业地
     private String ringNetworkCabinet;//环网柜
     private String stationDtu;//站房dtu
+    private String itemType;//项目类型
     private String status;
     private String acquisitionStatus;//领料状态
     private String constructionStatus;//施工状态
@@ -267,12 +271,12 @@ public class Project extends DataEntity<Project> {
     }
 
     @ExcelField(title = "设计单位角色", align = 2, sort = 21)
-    public String getDesignUnitRole() {
-        return designUnitRole;
+    public String getDesignUnitManage() {
+        return designUnitManage;
     }
 
-    public void setDesignUnitRole(String designUnitRole) {
-        this.designUnitRole = designUnitRole;
+    public void setDesignUnitManage(String designUnitManage) {
+        this.designUnitManage = designUnitManage;
     }
 
     public void setConstructionUnitRole(String constructionUnitRole) {
@@ -564,4 +568,36 @@ public class Project extends DataEntity<Project> {
     public void setEarlyMaterial(Integer earlyMaterial) {
         this.earlyMaterial = earlyMaterial;
     }
+
+    public String getConstructionUnitManage() {
+        return constructionUnitManage;
+    }
+
+    public void setConstructionUnitManage(String constructionUnitManage) {
+        this.constructionUnitManage = constructionUnitManage;
+    }
+
+    public String getConstructionUnitLeader() {
+        return constructionUnitLeader;
+    }
+
+    public void setConstructionUnitLeader(String constructionUnitLeader) {
+        this.constructionUnitLeader = constructionUnitLeader;
+    }
+
+    public String getDesignUnitLeader() {
+        return designUnitLeader;
+    }
+
+    public void setDesignUnitLeader(String designUnitLeader) {
+        this.designUnitLeader = designUnitLeader;
+    }
+
+    public String getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(String itemType) {
+        this.itemType = itemType;
+    }
 }

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

@@ -19,7 +19,6 @@
 	  	a.project_name AS "projectName",
 	  	a.project_number AS "projectNumber",
 		a.project_manage_role AS "projectManageRole",
-
 		a.distribution_engineering AS "distributionEngineering",
 		a.distribution_materials AS "distributionMaterials",
 		a.distribution_system AS "distributionSystem",
@@ -28,13 +27,13 @@
 		a.run_unit AS "runUnit",
 		a.run_unit_role AS "runUnitRole",
 		a.through_research_role AS "throughResearchRole",
-
 		a.construction_unit AS "constructionUnit",
 		a.construction_unit_role AS "constructionUnitRole",
-
+		a.construction_unit_manage AS "constructionUnitManage",
+		a.construction_unit_leader AS "constructionUnitLeader",
     	a.design_unit AS "design_unit",
-		a.design_unit_role AS "designUnitRole",
-
+		a.design_unit_manage AS "designUnitManage",
+		a.design_unit_leader AS "designUnitLeader",
 		a.clarificaiton_type AS "clarificaitonType",
 		a.build_classification_resons As "bulidClassificationResons",
 		a.bulbid_resons As "bulbidResons",
@@ -65,10 +64,12 @@
     	a.stay_open_area AS "stayOpenArea",
     	a.ring_network_cabinet AS "ringNetworkCabinet",
     	a.station_dtu AS "stationDtu",
+    	a.item_type AS "itemType",
 		a.status As "status",
 		a.acquisition_status AS "acquisitionStatus",
 		a.construction_status AS "constructionStatus",
-		a.whether_close_status AS "whetherCloseStatus"
+		a.whether_close_status AS "whetherCloseStatus",
+		a.earlyMaterial AS "earlyMaterial"
 	</sql>
     
 	<select id="get" resultType="Project" >
@@ -160,8 +161,11 @@
 			through_research_role,
 			construction_unit,
 			construction_unit_role,
+			construction_unit_manage,
+			construction_unit_leader,
 			design_unit,
-			design_unit_role,
+			design_unit_manage,
+			design_unit_leader,
 			clarificaiton_type,
 			build_classification_resons,
 			bulbid_resons,
@@ -192,10 +196,12 @@
 			stay_open_area,
 			ring_network_cabinet,
 			station_dtu,
+			item_type,
 			status,
 			acquisition_status,
 			construction_status,
-			whether_close_status
+			whether_close_status,
+			earlyMaterial
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -223,8 +229,11 @@
 			#{throughResearchRole},
 			#{constructionUnit},
 			#{constructionUnitRole},
-			#{design_unit},
-			#{design_unit_role},
+			#{constructionUnitManage},
+			#{constructionUnitLeader},
+			#{designUnit},
+			#{designUnitManage},
+			#{designUnitLeader},
 			#{clarificaitonType},
     		#{bulidClassificationResons},
     		#{bulbidResons},
@@ -255,10 +264,12 @@
     	 	#{stayOpenArea},
     	 	#{ringNetworkCabinet},
     	 	#{stationDtu},
+    	 	#{itemType},
     		#{status},
     		#{acquisitionStatus},
     		#{constructionStatus},
-    		#{whetherCloseStatus}
+    		#{whetherCloseStatus},
+    		#{earlyMaterial}
 		)
 	</insert>
 
@@ -290,8 +301,11 @@
 		through_research_role,
 		construction_unit,
 		construction_unit_role,
+		construction_unit_manage,
+		construction_unit_leader,
 		design_unit,
-		design_unit_role,
+		design_unit_manage,
+		design_unit_leader,
 		clarificaiton_type,
 		build_classification_resons,
 		bulbid_resons,
@@ -321,11 +335,13 @@
 		phone_style,
 		stay_open_area,
 		ring_network_cabinet,
+		item_type,
 		station_dtu,
 		status,
 		acquisition_status,
 		construction_status,
-		whether_close_status
+		whether_close_status,
+		earlyMaterial
 		) VALUES
 		<foreach collection="list" item="item" index="index" separator="," >
 			(
@@ -355,8 +371,11 @@
 			#{item.throughResearchRole},
 			#{item.constructionUnit},
 			#{item.constructionUnitRole},
+			#{item.constructionUnitManage},
+			#{item.constructionUnitLeader},
 			#{item.designUnit},
-			#{item.designUnitRole},
+			#{item.designUnitManage},
+			#{item.designUnitLeader},
 			#{item.clarificaitonType},
 			#{item.bulidClassificationResons},
 			#{item.bulbidResons},
@@ -386,11 +405,13 @@
 			#{item.phoneStyle},
 			#{item.stayOpenArea},
 			#{item.ringNetworkCabinet},
+			#{item.itemType},
 			#{item.stationDtu},
 			#{item.status},
 			#{item.acquisitionStatus},
 			#{item.constructionStatus},
-			#{item.whetherCloseStatus}
+			#{item.whetherCloseStatus},
+			#{item.earlyMaterial}
 		)
 		</foreach>
 	</insert>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -82,6 +82,7 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 		String acquisitionStatus="0";//领料状态
 		String constructionStatus="0";//施工状态
 		String whetherCloseStatus = "0";//项目是否关闭
+		Integer earlyMaterial = 0;//是否可以提前领料
 		Project project1 = new Project();
 		List<Project> list = projectMapper.findList(project1);
 		for(Project project:projects){
@@ -89,12 +90,14 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 			acquisitionStatus="0";//领料状态
 			constructionStatus="0";//施工状态
 			whetherCloseStatus = "0";//项目是否关闭
+			earlyMaterial = 0;//是否可以提前领料
 			for (Project project2:list){
 				if (project.getRequireName().equals(project2.getRequireName())){
 					status = project2.getStatus();
 					acquisitionStatus = project2.getAcquisitionStatus();
 					constructionStatus = project2.getConstructionStatus();
 					whetherCloseStatus = project2.getWhetherCloseStatus();
+					earlyMaterial = project2.getEarlyMaterial();
 					project.setId(project2.getId());//项目id
 					project.setCreateBy(project2.getCreateBy());
 					project.setCreateDate(project2.getCreateDate());
@@ -109,8 +112,11 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 					project.setThroughResearchRole(project2.getThroughResearchRole());//经研所角色
 					project.setConstructionUnit(project2.getConstructionUnit());//施工单位
 					project.setConstructionUnitRole(project2.getConstructionUnitRole());//施工单位角色
+					project.setConstructionUnitManage(project2.getConstructionUnitManage());//施工单位项目经理
+					project.setConstructionUnitLeader(project2.getConstructionUnitLeader());//施工单位项目领导
 					project.setDesignUnit(project2.getDesignUnit());//设计单位
-					project.setDesignUnitRole(project2.getDesignUnitRole());//设计单位角色
+					project.setDesignUnitManage(project2.getDesignUnitManage());//设计单位角色
+					project.setDesignUnitLeader(project2.getDesignUnitLeader());//设计单位领导
 					project.setClarificaitonType(project2.getClarificaitonType());//交底类型
 					break;
 				}
@@ -125,6 +131,7 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 			project.setAcquisitionStatus(acquisitionStatus);
 			project.setConstructionStatus(constructionStatus);
 			project.setWhetherCloseStatus(whetherCloseStatus);
+			project.setEarlyMaterial(earlyMaterial);
 		}
 		if (null!=projects&&projects.size()>0){
 			projectMapper.insertList(projects);

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

@@ -25,7 +25,7 @@ public  class ProExcelInfo {
     public static String[] PRO_PHONE_STYLE = {"光纤","公网","专网"};//通信方式
     public static String[] PRO_STAY_AREA={"集中","就地"};//柱开集中或就业地
     public static String[] PRO_RING_NETWORK = {"户内","户外"};//环网柜
-
+    public static String[] PRO_ITEM_TYPE = {"资本项目","成本项目"};//项目类型
     /**
      * 获取表格数据
      * @param importUtil
@@ -61,41 +61,45 @@ public  class ProExcelInfo {
                 project.setThroughResearchRole((String)importUtil.getCellValue(row,17));//经研所角色
                 project.setConstructionUnit((String)importUtil.getCellValue(row,18));//施工单位
                 project.setConstructionUnitRole((String)importUtil.getCellValue(row,19));//施工单位角色
-                project.setDesignUnit((String)importUtil.getCellValue(row,20));//设计单位
-                project.setDesignUnitRole((String)importUtil.getCellValue(row,21));//设计单位角色
-                project.setClarificaitonType((String)importUtil.getCellValue(row,22));//交底类型
-                project.setBulidClassificationResons((String)importUtil.getCellValue(row,23));//建设理由分类
-                project.setBulbidResons((String)importUtil.getCellValue(row,24));//建设理由
-                project.setAsicEquipment((String)importUtil.getCellValue(row,25));//设备基本状况
-                project.setRunTheClass((String)importUtil.getCellValue(row,26));//运行班
-                project.setProjectTeam((String)importUtil.getCellValue(row,27));//项目组
-                costEstimate = (String) importUtil.getCellValue(row,28);
+                project.setConstructionUnitManage((String)importUtil.getCellValue(row,20));//施工单位项目经理
+                project.setConstructionUnitLeader((String)importUtil.getCellValue(row,21));//施工单位领导
+                project.setDesignUnit((String)importUtil.getCellValue(row,22));//设计单位
+                project.setDesignUnitManage((String)importUtil.getCellValue(row,23));//设计单位项目领导
+                project.setDesignUnitLeader((String)importUtil.getCellValue(row,24));//设计单位领导
+                project.setClarificaitonType((String)importUtil.getCellValue(row,25));//交底类型
+                project.setBulidClassificationResons((String)importUtil.getCellValue(row,26));//建设理由分类
+                project.setBulbidResons((String)importUtil.getCellValue(row,27));//建设理由
+                project.setAsicEquipment((String)importUtil.getCellValue(row,28));//设备基本状况
+                project.setRunTheClass((String)importUtil.getCellValue(row,29));//运行班
+                project.setProjectTeam((String)importUtil.getCellValue(row,30));//项目组
+                costEstimate = (String) importUtil.getCellValue(row,31);
                 if (null!=costEstimate&&!costEstimate.equals("")){
                     project.setCostEstimate(Double.parseDouble(costEstimate));//费用估算
                 }
-                project.setWhetherRheUpwind((String)importUtil.getCellValue(row,29));//是否迎风期度夏项目
-                project.setSureDaDate((String)importUtil.getCellValue(row,30));//确定下达时间
-                project.setTextRemark((String)importUtil.getCellValue(row,31));//备注
-                project.setPowerLine((String)importUtil.getCellValue(row,32));//停电线路
-                project.setPowerScope((String)importUtil.getCellValue(row,33));//停电范围
-                project.setProjectType((String)importUtil.getCellValue(row,34));//项目类型
-                project.setPowerFlagPackage((String)importUtil.getCellValue(row,35));//是否为停电打包项目
-                project.setPreliminaryJudgment((String)importUtil.getCellValue(row,36));//证处初步判断
-                project.setFlagCivilEngineering((String)importUtil.getCellValue(row,37));//是否含土建
-                project.setSteelTubePole((String)importUtil.getCellValue(row,38));//钢管杆基础类型
-                project.setFlagApprovalPlanning((String)importUtil.getCellValue(row,39));//是否需要规划报批
-                project.setEquCreateType((String)importUtil.getCellValue(row,40));//设备改造类型
-                project.setEquCreateSize((String)importUtil.getCellValue(row,41));//间隔数
-                project.setFlagNewEquName((String)importUtil.getCellValue(row,42));//是否新设备命名
-                project.setIncludeBdzNews((String)importUtil.getCellValue(row,43));//是否含变电站新闻格投运
-                project.setFlagNoElectrical((String)importUtil.getCellValue(row,44));//是否非射电电气施工
-                project.setDrawingsWork((String)importUtil.getCellValue(row,45));//图纸标注的带点作业情况
-                project.setFlagAutomation((String)importUtil.getCellValue(row,46));//是否含自动化
-                project.setTwoAndThreeRemote((String)importUtil.getCellValue(row,47));//二遥或三
-                project.setPhoneStyle((String)importUtil.getCellValue(row,48));//通信方式
-                project.setStayOpenArea((String)importUtil.getCellValue(row,49));//柱开集中或就业地
-                project.setRingNetworkCabinet((String)importUtil.getCellValue(row,50));//环网柜
-                project.setStationDtu((String)importUtil.getCellValue(row,51));//站房dtu
+                project.setWhetherRheUpwind((String)importUtil.getCellValue(row,32));//是否迎风期度夏项目
+                project.setSureDaDate((String)importUtil.getCellValue(row,33));//确定下达时间
+                project.setTextRemark((String)importUtil.getCellValue(row,34));//备注
+                project.setPowerLine((String)importUtil.getCellValue(row,35));//停电线路
+                project.setPowerScope((String)importUtil.getCellValue(row,36));//停电范围
+                project.setProjectType((String)importUtil.getCellValue(row,37));//项目类型
+                project.setPowerFlagPackage((String)importUtil.getCellValue(row,38));//是否为停电打包项目
+                project.setPreliminaryJudgment((String)importUtil.getCellValue(row,39));//证处初步判断
+                project.setFlagCivilEngineering((String)importUtil.getCellValue(row,40));//是否含土建
+                project.setSteelTubePole((String)importUtil.getCellValue(row,41));//钢管杆基础类型
+                project.setFlagApprovalPlanning((String)importUtil.getCellValue(row,42));//是否需要规划报批
+                project.setEquCreateType((String)importUtil.getCellValue(row,43));//设备改造类型
+                project.setEquCreateSize((String)importUtil.getCellValue(row,44));//间隔数
+                project.setFlagNewEquName((String)importUtil.getCellValue(row,45));//是否新设备命名
+                project.setIncludeBdzNews((String)importUtil.getCellValue(row,46));//是否含变电站新闻格投运
+                project.setFlagNoElectrical((String)importUtil.getCellValue(row,47));//是否非射电电气施工
+                project.setDrawingsWork((String)importUtil.getCellValue(row,48));//图纸标注的带点作业情况
+                project.setFlagAutomation((String)importUtil.getCellValue(row,49));//是否含自动化
+                project.setTwoAndThreeRemote((String)importUtil.getCellValue(row,50));//二遥或三
+                project.setPhoneStyle((String)importUtil.getCellValue(row,51));//通信方式
+                project.setStayOpenArea((String)importUtil.getCellValue(row,52));//柱开集中或就业地
+                project.setRingNetworkCabinet((String)importUtil.getCellValue(row,53));//环网柜
+                project.setStationDtu((String)importUtil.getCellValue(row,54));//站房dtu
+                project.setItemType((String)importUtil.getCellValue(row,55));//项目类型
                 project.setStatus("0");
                 list.add(project);
             }
@@ -109,6 +113,7 @@ public  class ProExcelInfo {
         String indexFive =  (String)importUtil.getCellValue(row,5);
         String indexSix = (String)importUtil.getCellValue(row,6);
         String indexNine = (String)importUtil.getCellValue(row,9);
+        String indexFives= (String)importUtil.getCellValue(row,55);
         if (!indexFive.contains("项目")){
             flag = true;
         }
@@ -118,6 +123,9 @@ public  class ProExcelInfo {
         if (!indexNine.contains("角色")){
             flag = true;
         }
+        if (!indexFives.contains("类型")){
+            flag = true;
+        }
         return flag;
     }
 
@@ -158,11 +166,20 @@ public  class ProExcelInfo {
             if (null==project.getConstructionUnitRole()||"".equals(project.getConstructionUnitRole())){//施工单位:施工单位角色
                 str+="施工单位角色不能为空;";
             }
+            if (null==project.getConstructionUnitManage()||"".equals(project.getConstructionUnitManage())){//施工单位:施工单位角色
+                str+="施工单位项目经理不能为空;";
+            }
+            if (null==project.getConstructionUnitLeader()||"".equals(project.getConstructionUnitLeader())){//施工单位:施工单位角色
+                str+="施工单位领导不能为空;";
+            }
             if (null==project.getDesignUnit()||"".equals(project.getDesignUnit())){//设计单位
                 str+="设计单位不能为空;";
             }
-            if (null==project.getDesignUnitRole()||"".equals(project.getDesignUnitRole())){//设计单位角色
-                str+="设计单位角色不能为空;";
+            if (null==project.getDesignUnitManage()||"".equals(project.getDesignUnitManage())){//设计单位角色
+                str+="设计单位项目经理不能为空;";
+            }
+            if (null==project.getDesignUnitLeader()||"".equals(project.getDesignUnitLeader())){//设计单位
+                str+="设计单位领导不能为空;";
             }
             if (null!=project.getType()){//类型
                 flag = getJudge(project.getType(), PRO_TYPE);
@@ -284,6 +301,12 @@ public  class ProExcelInfo {
                     str+="环网柜填写有误;";
                 }
             }
+            if (null!=project.getItemType()){
+                flag = getJudge(project.getItemType(),PRO_ITEM_TYPE);
+                if (flag){
+                    str+="项目类型填写有误";
+                }
+            }
 
         }
         if (!"".equals(str)){

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

@@ -281,6 +281,11 @@ public class ProjectController extends BaseController {
 				j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
 				return j;
 			}
+			if (null==projects||projects.size()<=0){
+				j.setSuccess(false);
+				j.setMsg("导入失败:无符合数据.");
+				return j;
+			}
 			projectService.saveList(projects);
 			j.setMsg( "已成功导入 "+projects.size()+" 条项目表单记录");
 		} catch (Exception e) {

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

@@ -137,15 +137,35 @@
 					<td class="width-35">
 						<form:input path="constructionUnitRole" 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="designUnitManage" 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="designUnitLeader" 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"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class=""><font color="red">*</font>设计单位角色：</label></td>
+					<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"/>
+					</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"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>项目类型：</label></td>
 					<td class="width-35">
-						<form:input path="designUnitRole" htmlEscape="false" class="form-control required"/>
+						<form:input path="itemType" htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>交底类型：</label></td>
 					<td class="width-35">

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

@@ -202,17 +202,31 @@ $(document).ready(function() {
                        width:110
                    }
                    ,{
+                       field: 'constructionUnitManage',
+                       title: '施工单位项目经理',
+                       width:130
+                   }
+                   ,{
+                       field: 'constructionUnitLeader',
+                       title: '施工单位领导',
+                       width:110
+                   }
+                   ,{
                        field: 'designUnit',
                        title: '设计单位',
                        width:110
                    }
                    ,{
-                       field: 'designUnitRole',
-                       title: '设计单位角色',
+                       field: 'designUnitManage',
+                       title: '设计单位项目经理',
+                       width:130
+                   }
+                   ,{
+                       field: 'designUnitLeader',
+                       title: '设计单位领导',
                        width:110
                    }
                    ,{
-                       title: '设计单位角色',
                        field: 'clarificaitonType',
                        title: '交底类型',
                        width:100
@@ -257,7 +271,7 @@ $(document).ready(function() {
                    ,{
                        field: 'whetherRheUpwind',
                        title: '是否迎风期度夏项目',
-                       width:140
+                       width:150
 
                    }
                    ,{
@@ -290,7 +304,7 @@ $(document).ready(function() {
                    ,{
                        field: 'powerFlagPackage',
                        title: '是否为停电打包项目',
-                       width:140
+                       width:150
                    }
                    ,{
                        field: 'preliminaryJudgment',
@@ -372,6 +386,11 @@ $(document).ready(function() {
                        title: '站房DTU',
                        width:120
                    }
+                   ,{
+                       field: 'itemType',
+                       title: '项目类型',
+                       width:120
+                   }
 
 		     ]