工程咨询、造价审核：项目登记模块代码更改

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -70,6 +70,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 
 	private String prrId;
 	private String projectReportName;
+	private String officeName;
 
 	public String getPrrId() {
 		return prrId;
@@ -130,13 +131,16 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	@NotNull(message = "委托方联系人不能为空")
 	private List<WorkClientLinkman> workClientLinkmanList;		// 委托方联系人
 	private List<WorkClientLinkman> workConstructionLinkmanList;		// 施工方及联系人
-	@NotBlank(message = "工程概况不能为空")
+	//@NotBlank(message = "工程概况不能为空")
 	private String projectDesc;		// 工程概况
 	@NotNull(message = "项目负责人不能为空")
 	private List<User> projectLeaders; //项目负责人
 
 	private List<User> projectMembers;  //项目组成员
 
+	private Date startDate;   //工作开始时间
+	private Date endingDate;  //工作结束时间
+
 	private String leaderNameStr;
 	private String leaderIds;
 	private String memberNameStr;
@@ -645,4 +649,28 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setProjectReportName(String projectReportName) {
 		this.projectReportName = projectReportName;
 	}
+
+	public String getOfficeName() {
+		return officeName;
+	}
+
+	public void setOfficeName(String officeName) {
+		this.officeName = officeName;
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Date getEndingDate() {
+		return endingDate;
+	}
+
+	public void setEndingDate(Date endingDate) {
+		this.endingDate = endingDate;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -127,8 +127,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         if(projectRecords!=null){
             String cid = projectRecords.getWorkContractInfo().getId();
             WorkContractInfo workContractInfo = contractInfoService.get(cid);
-            WorkClientInfo workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
-            workContractInfo.setClient(workClientInfo);
+            if(null != workContractInfo) {
+                WorkClientInfo workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+                workContractInfo.setClient(workClientInfo);
+            }
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         return projectRecords;

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -406,6 +406,22 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	}
 
 	/**
+	 * 设置项目组成员所属部门信息
+	 *
+	 * @param records
+	 */
+	public void queryOfficeName(RuralProjectRecords records) {
+		//查询负责人信息
+		List<User> users = workProjectUserDao.queryProjectUsers(records.getId(), "1");
+		List<Office> officeList = new ArrayList<>();
+		for (User user : users) {
+			User user1 = UserUtils.get(user.getId());
+			officeList.add(user1.getOffice());
+		}
+		records.setOfficeName(Collections3.extractToString(officeList, "name", ","));
+	}
+
+	/**
 	 * 设置联系人信息
 	 *
 	 * @param projectRecords
@@ -1055,6 +1071,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
         this.queryContractInfos(projectRecords);
         //设置项目组成员
         this.queryUserNames(projectRecords);
+        //设置项目组成员所属部门
+        this.queryOfficeName(projectRecords);
         //设置委托方联系人信息
         this.queryLinkmanInfos(projectRecords);
         //设置附件信息

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -236,8 +236,8 @@ public class RuralCostProjectMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value = {"holdSaveReport"})
-    public String holdSaveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes)  {
-        try{
+    public String holdSaveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes) throws Exception {
+        //try{
             String str = ruralProjectMessageService.saveData(projectcontentinfo,1);
             addMessage(redirectAttributes, "暂存报告"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
@@ -247,9 +247,9 @@ public class RuralCostProjectMessageController extends BaseController {
                 }
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
             }
-        }catch (Exception e){
+        /*}catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
-        }
+        }*/
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsUserController.java

@@ -86,7 +86,9 @@ public class RuralCostProjectRecordsUserController extends BaseController {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			//设置合同信息
 			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
-			workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()), "construction_project_type", ""));
+			if(null != workContractInfo){
+				workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()), "construction_project_type", ""));
+			}
 			projectRecords.setWorkContractInfo(workContractInfo);
 			//设置项目组成员
 			projectRecordsService.queryUserNames(projectRecords);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsUserController.java

@@ -85,8 +85,9 @@ public class RuralProjectRecordsUserController extends BaseController {
 	public String form(RuralProjectRecords projectRecords, Model model) {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			//设置合同信息
-			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
-			workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()), "construction_project_type", ""));
+			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());if(null != workContractInfo){
+				workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()), "construction_project_type", ""));
+			}
 			projectRecords.setWorkContractInfo(workContractInfo);
 			//设置项目组成员
 			projectRecordsService.queryUserNames(projectRecords);

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -1295,4 +1295,14 @@ public class UserController extends BaseController {
         return ajaxJson;
     }
 
+    @ResponseBody
+    @RequestMapping(value = "getUserById")
+    public AjaxJson getUserById(String userId) {
+        AjaxJson ajaxJson = new AjaxJson();
+        User user = UserUtils.get(userId);
+        ajaxJson.put("data",user.getOffice());
+        return ajaxJson;
+    }
+
+
 }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -41,7 +41,9 @@
 		a.unit_fees AS "unitFees",
 		a.building_unit_fees AS "buildingUnitFees",
 		a.install_unit_fees AS "installUnitFees",
-		a.total_fees AS "totalFees"
+		a.total_fees AS "totalFees",
+		a.start_date AS "startDate",
+		a.ending_date AS "endingDate"
 	</sql>
 	
 	<sql id="projectRecordsJoins">
@@ -383,7 +385,9 @@
 		    building_unit_fees,
 		    install_unit_fees,
 		    total_fees,
-		    project_type
+		    project_type,
+		    start_date,
+		    ending_date
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -422,7 +426,9 @@
 			#{buildingUnitFees},
 			#{installUnitFees},
 			#{totalFees},
-			#{projectType}
+			#{projectType},
+			#{startDate},
+			#{endingDate}
 		)
 	</insert>
 	
@@ -460,7 +466,9 @@
 		    unit_fees = #{unitFees},
 		    building_unit_fees = #{buildingUnitFees},
 		    install_unit_fees =  #{installUnitFees},
-		    total_fees =  #{totalFees}
+		    total_fees =  #{totalFees},
+		    start_date =  #{startDate},
+		    ending_date =  #{endingDate}
 		WHERE id = #{id}
 	</update>
 	

src/main/webapp/WEB-INF/tags/sys/gridselect1.tag

@@ -21,6 +21,11 @@
 <script type="text/javascript">
 function searchGrid${id}(clientId){
 	var uri;
+	var length = $("#workClientLinkmanList tr").length;
+	if(length>0){
+		top.layer.msg("仅可添加一名委托方联系人。", {icon: 0});
+		return false;
+	}
 	if(clientId==null||clientId==''){
 		// top.layer.msg("请先选择合同信息");
 		// top.layer.msg('<span id="confirm" style="border:1px solid red;background:#fff;color:red;margin-left:-25px;padding: 14px 25px 15px 25px;overflow:hidden;position:relative;border-right:none;">请先选择合同信息<b style="position:absolute;top:-1px;width:24px;height:46px;right:-25px;border:1px solid red;border-left:none;background:#fff;"></b></span>')
@@ -44,7 +49,10 @@ function searchGrid${id}(clientId){
 	    	 if(item == "-1"){
 		    	 return;
 	    	 }
-
+			 if (item.length>1){
+				 top.layer.msg("不能进行多选，请重新选择。", {icon: 0});
+				 return false;
+			 }
 			 top.layer.close(index);//关闭对话框。
            	 setValuee(item);
 		  },

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -31,7 +31,7 @@
                 //     return;
                 // }
                 if($("#workClientLinkmanList tr").length==0){
-                    top.layer.alert('请至少选择一个委托方联系人！', {icon: 0});
+                    top.layer.alert('请选择委托方联系人！', {icon: 0});
                     return;
                 }
                 /*if($("#workConstructionLinkmanList tr").length==0){
@@ -120,6 +120,36 @@
                 });
             })
 
+
+            $('#masterId').on("change", function () {
+                var masterId = $("#masterId").val();
+                $("#officeName").val('');
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/sys/user/getUserById",
+                    data : {'userId':masterId},
+                    //请求成功
+                    success : function(result) {
+                        var officeName = result.body.data.name;
+                        if(officeName != '') {
+                            $("#officeName").val(officeName);
+                        }
+                    },
+
+                });
+            })
+
+            laydate.render({
+                elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
+            laydate.render({
+                elem: '#endingDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
+
         });
 
 
@@ -352,6 +382,10 @@
             $(obj).val(t.split("").reverse().join("") + "." + r);
         }
         function openBill2(title,url,width,height,target,formId){
+            if($("#workClientLinkmanList tr").length>0){
+                top.layer.msg('仅可添加一名委托方联系人！', {icon: 0});
+                return false;
+            }
             var frameIndex = parent.layer.getFrameIndex(window.name);
             var urls = url+"&index="+frameIndex;
             if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
@@ -513,9 +547,9 @@
                     <div class="layui-input-block">
                         <div class="input-group">
                             <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-                            <span class="input-group-btn">
+                            <%--<span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty ruralProjectRecords.projectStatus}">${fns:getDictLabel(ruralProjectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
-                             </span>
+                             </span>--%>
                         </div>
                     </div>
                 </div>
@@ -575,17 +609,35 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建人：</label>
+                    <div class="layui-input-block">
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectt id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
+                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">创建人：</label>
+                    <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
-                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                        <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <div class="layui-input-block">
+                        <input id="startDate" name="startDate" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                               value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>"/>
+                        </input>
+                        <span class="group-sep">—</span>
+                        <input id="endingDate" name="endingDate" placeholder="结束时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                               value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>"/>
+                        </input>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -616,9 +668,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
+                    <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" onchange="getFee()"/>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -688,13 +740,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程概况：</label>
+                    <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label ">特殊要求：</label>
+                    <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
                         <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
@@ -843,7 +895,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>项目计划附件信息</h2></div>
+                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                     <a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralCostProjectRecords/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify.jsp

@@ -15,7 +15,7 @@
                   return;
               }
               if($("#workClientLinkmanList tr").length==0){
-                  top.layer.alert('请至少选择一个委托方联系人！', {icon: 0});
+                  top.layer.alert('请选择委托方联系人！', {icon: 0});
                   return;
               }
 		      if(i==2){
@@ -79,6 +79,35 @@
 
                 });
             })
+
+            $('#masterId').on("change", function () {
+                var masterId = $("#masterId").val();
+                $("#officeName").val('');
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/sys/user/getUserById",
+                    data : {'userId':masterId},
+                    //请求成功
+                    success : function(result) {
+                        var officeName = result.body.data.name;
+                        if(officeName != '') {
+                            $("#officeName").val(officeName);
+                        }
+                    },
+
+                });
+            })
+
+            laydate.render({
+                elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
+            laydate.render({
+                elem: '#endingDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
 		});
 
         function setContractValue(obj){
@@ -382,17 +411,35 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建人：</label>
+                    <div class="layui-input-block">
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:treeselect id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
+                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">创建人：</label>
+                    <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
-                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                        <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <div class="layui-input-block">
+                        <input id="startDate" name="startDate" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                               value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>"/>
+                        </input>
+                        <span class="group-sep">—</span>
+                        <input id="endingDate" name="endingDate" placeholder="结束时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                               value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>"/>
+                        </input>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -423,9 +470,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
+                    <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" onchange="getFee()"/>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -495,13 +542,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程概况：</label>
+                    <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label ">特殊要求：</label>
+                    <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
                         <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
@@ -557,7 +604,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>施工方信息</h2></div>
+                <div class="form-group-label"><h2>施工方信息</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:gridselectClientLink url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList"   title="选择施工单位"
                                               cssClass="form-control required" fieldLabels="客户编号" fieldKeys="name"  searchLabel="客户名称" searchKey="name"></sys:gridselectClientLink>
@@ -622,7 +669,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>项目计划附件信息</h2></div>
+                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsView.jsp

@@ -177,15 +177,33 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目负责人：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">创建人：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">工作开始日期：</label>
+					<div class="layui-input-block">
+						<input readonly="true" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
+						<span class="group-sep">—</span>
+						<input readonly="true" placeholder="结束时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -213,7 +231,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
+					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
 						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
 					</div>
@@ -231,7 +249,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元)：</label>
+					<label class="layui-form-label double-line">咨询标的额(万元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -220,16 +220,34 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">创建人：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">工作开始日期：</label>
+					<div class="layui-input-block">
+						<input readonly="true" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
+						<span class="group-sep">—</span>
+						<input readonly="true" placeholder="结束时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -257,9 +275,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
+					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
-						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
+						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
@@ -275,7 +293,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元)：</label>
+					<label class="layui-form-label double-line">咨询标的额(万元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -31,7 +31,7 @@
                 //     return;
                 // }
                 if($("#workClientLinkmanList tr").length==0){
-                    top.layer.alert('请至少选择一个委托方联系人！', {icon: 0});
+                    top.layer.alert('请选择委托方联系人！', {icon: 0});
                     return;
                 }
                 /*if($("#workConstructionLinkmanList tr").length==0){
@@ -129,6 +129,34 @@
                 });
             })
 
+            $('#masterId').on("change", function () {
+                var masterId = $("#masterId").val();
+                $("#officeName").val('');
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/sys/user/getUserById",
+                    data : {'userId':masterId},
+                    //请求成功
+                    success : function(result) {
+                        var officeName = result.body.data.name;
+                        if(officeName != '') {
+                            $("#officeName").val(officeName);
+                        }
+                    },
+
+                });
+            })
+
+            laydate.render({
+                elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
+            laydate.render({
+                elem: '#endingDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
         });
 
 
@@ -363,6 +391,11 @@
             $(obj).val(t.split("").reverse().join("") + "." + r);
         }
         function openBill2(title,url,width,height,target,formId){
+
+            if($("#workClientLinkmanList tr").length>0){
+                top.layer.msg('仅可添加一名委托方联系人！', {icon: 0});
+                return false;
+            }
             var frameIndex = parent.layer.getFrameIndex(window.name);
             var urls = url+"&index="+frameIndex;
             if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
@@ -524,9 +557,9 @@
                     <div class="layui-input-block">
                         <div class="input-group">
                             <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-                            <span class="input-group-btn">
+                            <%--<span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty ruralProjectRecords.projectStatus}">${fns:getDictLabel(ruralProjectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
-                             </span>
+                             </span>--%>
                         </div>
                     </div>
                 </div>
@@ -586,17 +619,35 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建人：</label>
+                    <div class="layui-input-block">
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectt id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
+                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">创建人：</label>
+                    <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
-                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                        <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <div class="layui-input-block">
+                        <input id="startDate" name="startDate" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                               value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>"/>
+                        </input>
+                        <span class="group-sep">—</span>
+                        <input id="endingDate" name="endingDate" placeholder="结束时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                               value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>"/>
+                        </input>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -627,9 +678,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
+                    <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" onchange="getFee()"/>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -699,13 +750,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程概况：</label>
+                    <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label ">特殊要求：</label>
+                    <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
                         <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
@@ -854,7 +905,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>项目计划附件信息</h2></div>
+                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                     <a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralProjectRecords/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -15,7 +15,7 @@
                   return;
               }
               if($("#workClientLinkmanList tr").length==0){
-                  top.layer.alert('请至少选择一个委托方联系人！', {icon: 0});
+                  top.layer.alert('请选择委托方联系人！', {icon: 0});
                   return;
               }
 		      if(i==2){
@@ -79,6 +79,35 @@
 
                 });
             })
+
+            $('#masterId').on("change", function () {
+                var masterId = $("#masterId").val();
+                $("#officeName").val('');
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/sys/user/getUserById",
+                    data : {'userId':masterId},
+                    //请求成功
+                    success : function(result) {
+                        var officeName = result.body.data.name;
+                        if(officeName != '') {
+                            $("#officeName").val(officeName);
+                        }
+                    },
+
+                });
+            })
+
+            laydate.render({
+                elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
+            laydate.render({
+                elem: '#endingDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+            });
 		});
 
         function setContractValue(obj){
@@ -382,17 +411,35 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建人：</label>
+                    <div class="layui-input-block">
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:treeselect id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
+                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">创建人：</label>
+                    <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
-                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                        <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <div class="layui-input-block">
+                        <input id="startDate" name="startDate" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                               value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>"/>
+                        </input>
+                        <span class="group-sep">—</span>
+                        <input id="endingDate" name="endingDate" placeholder="结束时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                               value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>"/>
+                        </input>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -423,9 +470,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
+                    <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" onchange="getFee()"/>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -495,13 +542,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程概况：</label>
+                    <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label ">特殊要求：</label>
+                    <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
                         <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
@@ -557,7 +604,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>施工方信息</h2></div>
+                <div class="form-group-label"><h2>施工方信息</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:gridselectClientLink url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList"   title="选择施工单位"
                                               cssClass="form-control required" fieldLabels="客户编号" fieldKeys="name"  searchLabel="客户名称" searchKey="name"></sys:gridselectClientLink>
@@ -622,7 +669,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>项目计划附件信息</h2></div>
+                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -177,15 +177,33 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目负责人：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">创建人：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">工作开始日期：</label>
+					<div class="layui-input-block">
+						<input readonly="true" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
+						<span class="group-sep">—</span>
+						<input readonly="true" placeholder="结束时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -213,7 +231,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
+					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
 						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
 					</div>
@@ -231,7 +249,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元)：</label>
+					<label class="layui-form-label double-line">咨询标的额(万元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
 					</div>