项目进度管理大菜单下五个子菜单，搜索条件都统一按照，

施工技术交底--施工交底进度 进行修改

储备管理模块 修改和导入变更为专职人员和项目经理分开调用

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ReserveManagementController.java

@@ -9,8 +9,6 @@ import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveM
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.ReserveManagementService;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.utils.ReserveExportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.utils.ReserveManagementProUtil;
-import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -53,18 +51,25 @@ public class ReserveManagementController extends BaseController {
     }
 
     /**
-     * 工程管理表单列表页面
+     * 项目储备信息列表页面
+     * @param reserveManagement
+     * @param model
+     * @return
      */
     @RequiresPermissions("sg:managementcenter:reserveManagement:list")
     @RequestMapping(value = "skipList")
     public String skipList(ReserveManagement reserveManagement, Model model) {
-        User user = UserUtils.getUser();
         model.addAttribute("reserveManagement", reserveManagement);
         return "modules/sg/managementcenter/reserveManagement/reserveManagementInformation";
     }
 
     /**
-     * 项目前期基本信息 数据列表
+     * 项目储备信息数据列表
+     * @param reserveManagement
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @ResponseBody
     @RequiresPermissions("sg:managementcenter:reserveManagement:list")
@@ -76,23 +81,32 @@ public class ReserveManagementController extends BaseController {
     }
 
     /**
-     * 增加，编辑表单页面
+     * 专职人员增加，编辑表单页面
+     * @param reserveManagement
+     * @param model
+     * @return
      */
     @RequiresPermissions(value={"sg:managementcenter:reserveManagement:add","sg:managementcenter:reserveManagement:edit"},logical= Logical.OR)
     @RequestMapping(value = "form")
     public String form(ReserveManagement reserveManagement, Model model) {
-        User user = UserUtils.getUser();
         model.addAttribute("reserveManagement", reserveManagement);
         //判断id是否为空 如果未空则为新增 否则为修改
         if(StringUtils.isBlank(reserveManagement.getId())){
             return "modules/sg/managementcenter/reserveManagement/reserveManagementForm";
         }
-        //判断是储备专职还是项目经理
-        // xmglzxcbzz：储备专职
-        // xmglzxld：储备经理
-        if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())){
-            return "modules/sg/managementcenter/reserveManagement/reserveManagementModifyByzz";
-        }
+        return "modules/sg/managementcenter/reserveManagement/reserveManagementModifyByzz";
+    }
+
+    /**
+     * 项目经理编辑表单页面
+     * @param reserveManagement
+     * @param model
+     * @return
+     */
+    @RequiresPermissions(value={"sg:managementcenter:reserveManagement:jlEdit"},logical= Logical.OR)
+    @RequestMapping(value = "jlEdit")
+    public String jlEdit(ReserveManagement reserveManagement, Model model) {
+        model.addAttribute("reserveManagement", reserveManagement);
         return "modules/sg/managementcenter/reserveManagement/reserveManagementModifyByjl";
     }
 
@@ -107,7 +121,9 @@ public class ReserveManagementController extends BaseController {
     }
 
     /**
-     * 保存表单
+     * 专职人员保存表单
+     * @param reserveManagement
+     * @return
      */
     @ResponseBody
     @RequiresPermissions(value={"sg:managementcenter:reserveManagement:add"},logical=Logical.OR)
@@ -131,14 +147,15 @@ public class ReserveManagementController extends BaseController {
     }
 
     /**
-     * 修改表单
+     * 专职人员修改表单
+     * @param reserveManagement
+     * @return
      */
     @ResponseBody
     @RequiresPermissions(value={"sg:managementcenter:reserveManagement:edit"},logical=Logical.OR)
     @RequestMapping(value = "update")
     public AjaxJson update(ReserveManagement reserveManagement){
         AjaxJson j = new AjaxJson();
-        User user = UserUtils.getUser();
         /**
          * 后台hibernate-validation插件校验
          */
@@ -149,11 +166,32 @@ public class ReserveManagementController extends BaseController {
             return j;
         }
         //新增或编辑表单保存
-        if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())){
-            service.update(reserveManagement);
-        }else if("xmglzxld".equals(user.getRoleList().get(0).getEnname())){//经理人员修改对应信息
-            service.updatejl(reserveManagement);
+        service.update(reserveManagement);
+        j.setSuccess(true);
+        j.setMsg("修改储备项目基本信息成功");
+        return j;
+    }
+
+    /**
+     * 项目经理修改表单
+     * @param reserveManagement
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions(value={"sg:managementcenter:reserveManagement:jlEdit"},logical=Logical.OR)
+    @RequestMapping(value = "jlUpdate")
+    public AjaxJson jlUpdate(ReserveManagement reserveManagement){
+        AjaxJson j = new AjaxJson();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(reserveManagement);
+        if (StringUtils.isNotBlank(errMsg)){
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
         }
+        service.updatejl(reserveManagement);
         j.setSuccess(true);
         j.setMsg("修改储备项目基本信息成功");
         return j;
@@ -176,14 +214,13 @@ public class ReserveManagementController extends BaseController {
     }
 
     /**
-     * 导入Excel数据
+     * 专职人员导入Excel数据
      */
     @ResponseBody
     @RequiresPermissions("sg:managementcenter:reserveManagement:import")
     @RequestMapping(value = "import")
     public AjaxJson importBasic(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
         AjaxJson j = new AjaxJson();
-        User user = UserUtils.getUser();
         try {
             ImportUtil importUtil = new ImportUtil(file, 0, 0);
             //获取导入表格所有数据
@@ -197,33 +234,49 @@ public class ReserveManagementController extends BaseController {
 
             //对未存在的数据进行批量导入
             if(withoutList.size()>0){
-                //判断 只有专职人员才可以进行新增操作
-                if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())) {
-                    service.insertList(withoutList);
-                }
+                service.insertList(withoutList);
             }
 
             //对已存在的数据进行修改
             if(existList.size()>0){
-                // xmglzxcbzz：储备专职
-                // xmglzxld：储备经理
-                //专职人员修改对应信息
-                if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())){
-                    for (ReserveManagement reserveManagement : existList) {
-                        service.update(reserveManagement);
-                    }
-                }else if("xmglzxld".equals(user.getRoleList().get(0).getEnname())){//经理人员修改对应信息
-                    for (ReserveManagement reserveManagement : existList) {
-                        service.updatejl(reserveManagement);
-                    }
+                for (ReserveManagement reserveManagement : existList) {
+                    service.update(reserveManagement);
                 }
             }
             int i = withoutList.size() + existList.size();
-            if("xmglzxcbzz".equals(user.getRoleList().get(0).getEnname())){
-                j.setMsg("已成功导入" + i + "条项目储备信息记录");
-            }else if("xmglzxld".equals(user.getRoleList().get(0).getEnname())){//经理人员修改对应信息
-                j.setMsg("已成功导入" + existList.size() + "条项目储备信息记录");
+            j.setMsg("已成功导入" + i + "条项目储备信息记录");
+
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入项目储备信息失败！失败信息：" + e.getMessage());
+        }
+        return j;
+    }
+
+    /**
+     * 经理导入Excel数据
+     */
+    @ResponseBody
+    @RequiresPermissions("sg:managementcenter:reserveManagement:jlImport")
+    @RequestMapping(value = "jlImport")
+    public AjaxJson jlImportBasic(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+        AjaxJson j = new AjaxJson();
+        try {
+            ImportUtil importUtil = new ImportUtil(file, 0, 0);
+            //获取导入表格所有数据
+            List<ReserveManagement> reserveManagementList = ReserveManagementProUtil.getProjectUtil(importUtil);
+            //查询已有的参数数据 并分类返回已存在数据和未存在数据
+            Map map = service.getExistProjectList(reserveManagementList);
+            //已存在数据
+            List<ReserveManagement> existList = (List<ReserveManagement>) map.get("exist");
+
+            //对已存在的数据进行修改
+            if(existList.size()>0){
+                for (ReserveManagement reserveManagement : existList) {
+                    service.updatejl(reserveManagement);
+                }
             }
+            j.setMsg("已成功导入" + existList.size() + "条项目储备信息记录");
 
         } catch (Exception e) {
             j.setSuccess(false);

src/main/java/com/jeeplus/modules/sg/scheduleView/mapper/xml/ScheduleViewMapper.xml

@@ -76,14 +76,20 @@
         <where>
             1 = 1
             and
-            secondPower = 0
+            xmp.secondPower = 0
             <if test="projectList!=null and projectList.size>0 and projectList!=''">
-            and project_id in(
+            and xmp.projectId in(
                 <foreach collection="projectList" item="item" separator=",">
                     #{item}
                 </foreach>
                 )
             </if>
+            <if test="reserveProjectName!=null and reserveProjectName!=''">
+                and xmp.reserveProjectName like concat('%',#{reserveProjectName}, '%')
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and xmp.projectName like concat('%', #{projectName}, '%')
+            </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
@@ -196,6 +202,12 @@
                 </foreach>
                 )
             </if>
+            <if test="reserveProjectName!=null and reserveProjectName!=''">
+                and a.reserveProjectName like concat('%',#{reserveProjectName}, '%')
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
@@ -229,6 +241,12 @@
                 </foreach>
                 )
             </if>
+            <if test="reserveProjectName!=null and reserveProjectName!=''">
+                and a.reserveProjectName like concat('%',#{reserveProjectName}, '%')
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
@@ -262,6 +280,12 @@
                 </foreach>
                 )
             </if>
+            <if test="reserveProjectName!=null and reserveProjectName!=''">
+                and a.reserveProjectName like concat('%',#{reserveProjectName}, '%')
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementInformation.js

@@ -577,6 +577,34 @@ $(document).ready(function () {
         });
     });
 
+    $("#jlImport").click(function () {
+        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}/sg/managementCenter/reserveManagement/jlImport', function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        refresh();
+                    } else {
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+
+            btn2: function (index) {
+                //  jp.close(index);
+            }
+        });
+    });
+
     $("#btnExport").click(function () {
         var projectReserveId = $("#projectReserveId").val();
         var projectName = $("#projectName").val();
@@ -629,6 +657,13 @@ function edit(id) {//没有权限时，不显示确定按钮
     jp.openSaveDialog('编辑储备项目基本信息', "${ctx}/sg/managementCenter/reserveManagement/form?id=" + id, '800px', '500px');
 }
 
+function jlEdit(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openSaveDialog('编辑储备项目基本信息', "${ctx}/sg/managementCenter/reserveManagement/jlEdit?id=" + id, '800px', '500px');
+}
+
 function view(id) {//没有权限时，不显示确定按钮
     if (id == undefined) {
         id = getIdSelections();

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementInformation.jsp

@@ -59,7 +59,12 @@
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:edit">
 				<button id="edit" class="btn btn-primary" onclick="edit()">
-					<i class="glyphicon glyphicon-edit"></i> 修改
+					<i class="glyphicon glyphicon-edit"></i> 专职修改
+				</button>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="sg:managementcenter:reserveManagement:jlEdit">
+				<button id="jlEdit" class="btn btn-primary" onclick="jlEdit()">
+					<i class="glyphicon glyphicon-edit"></i> 经理修改
 				</button>
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:del">
@@ -69,7 +74,12 @@
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:import">
 				<button id="btnImport" class="btn btn-info">
-					<i class="fa fa-folder-open-o"></i> 导入
+					<i class="fa fa-folder-open-o"></i> 专职导入
+				</button>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="sg:managementcenter:reserveManagement:jlImport">
+				<button id="jlImport" class="btn btn-info">
+					<i class="fa fa-folder-open-o"></i> 经理导入
 				</button>
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:export">

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementModifyByjl.jsp

@@ -17,7 +17,7 @@
 				return false;
 			}else{
 				jp.loading();
-				jp.post("${ctx}/sg/managementCenter/reserveManagement/update",$('#inputForm').serialize(),function(data){
+				jp.post("${ctx}/sg/managementCenter/reserveManagement/jlUpdate",$('#inputForm').serialize(),function(data){
 					if(data.success){
 						jp.getParent().refresh();
 						var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引

src/main/webapp/webpage/modules/sg/scheduleView/show/civilView.jsp

@@ -39,8 +39,16 @@
                         <div class="accordion-inner">
                             <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
                                 <div class="col-xs-12 col-sm-6 col-md-4">
-                                    <label class="label-item single-overflow pull-left" title="项目定义编码：">项目定义编码：</label>
-                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                    <label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
+                                    <form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+                                    <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                                    <form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
                                 </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
                                     <div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/scheduleView/show/closureView.jsp

@@ -47,8 +47,16 @@
                         <div class="accordion-inner">
                             <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
                                 <div class="col-xs-12 col-sm-6 col-md-4">
-                                    <label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                    <label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
+                                    <form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+                                    <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                                    <form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
                                 </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
                                     <div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/scheduleView/show/designView.jsp

@@ -45,8 +45,16 @@
                         <div class="accordion-inner">
                             <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
                                 <div class="col-xs-12 col-sm-6 col-md-4">
-                                    <label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                    <label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
+                                    <form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+                                    <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                                    <form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
                                 </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
                                     <div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/scheduleView/show/electricView.jsp

@@ -39,8 +39,16 @@
                         <div class="accordion-inner">
                             <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
                                 <div class="col-xs-12 col-sm-6 col-md-4">
-                                    <label class="label-item single-overflow pull-left" title="项目定义编码：">项目定义编码：</label>
-                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                    <label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
+                                    <form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+                                    <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                                    <form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
                                 </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
                                     <div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/scheduleView/show/policyView.jsp

@@ -45,8 +45,16 @@
                         <div class="accordion-inner">
                             <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
                                 <div class="col-xs-12 col-sm-6 col-md-4">
-                                    <label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                    <label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
+                                    <form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+                                    <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                                    <form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
                                 </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
                                     <div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/scheduleView/show/scheduleView.jsp

@@ -41,8 +41,16 @@
                         <div class="accordion-inner">
                             <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
                                 <div class="col-xs-12 col-sm-6 col-md-4">
-                                    <label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                    <label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
+                                    <form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+                                    <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                                    <form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
                                 </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
                                     <div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/scheduleView/show/settView.jsp

@@ -38,8 +38,16 @@
                         <div class="accordion-inner">
                             <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
                                 <div class="col-xs-12 col-sm-6 col-md-4">
-                                    <label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                    <label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
+                                    <form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+                                    <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                                    <form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
                                 </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
                                     <div style="margin-top:26px">