合同登记

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectContactPersonDao.java

@@ -0,0 +1,19 @@
+package com.jeeplus.modules.ruralprojectrecords.dao;
+
+import com.jeeplus.common.persistence.CrudDao;
+import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectContactPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@MyBatisDao
+public interface RuralProjectContactPersonDao extends CrudDao<RuralProjectContactPerson> {
+
+    int insertNewProjectContactPerson(RuralProjectContactPerson ruralProjectContactPerson);
+
+    List<RuralProjectContactPerson> selectProjectContactPersonByProjectId(@Param("projectId") String projectId);
+
+    int updateProjectContactPerson(RuralProjectContactPerson ruralProjectContactPerson);
+    int deleteProjectContactPerson(@Param("projectId")String projectId);
+}

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

@@ -0,0 +1,60 @@
+package com.jeeplus.modules.ruralprojectrecords.entity;
+
+import com.jeeplus.common.persistence.DataEntity;
+
+public class RuralProjectContactPerson extends DataEntity<RuralProjectContactPerson> {
+    private String projectCode;//项目编号
+    private String unitName;//单位名称
+    private String contactPersonName;
+    private String phone1;
+    private String phone2;
+    private Integer type;
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public String getContactPersonName() {
+        return contactPersonName;
+    }
+
+    public void setContactPersonName(String contactPersonName) {
+        this.contactPersonName = contactPersonName;
+    }
+
+    public String getPhone1() {
+        return phone1;
+    }
+
+    public void setPhone1(String phone1) {
+        this.phone1 = phone1;
+    }
+
+    public String getPhone2() {
+        return phone2;
+    }
+
+    public void setPhone2(String phone2) {
+        this.phone2 = phone2;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

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

@@ -319,6 +319,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private List<ProjectReportData> projectReportData = Lists.newArrayList();
 	private List<ProjectFilingBatchProInfo> proInfos=Lists.newArrayList();
 
+	private String reviewerPerson;//审核人
+
 	public String getPrrId() {
 		return prrId;
 	}
@@ -2254,4 +2256,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setPermissionOfficeIdList(List<String> permissionOfficeIdList) {
 		this.permissionOfficeIdList = permissionOfficeIdList;
 	}
+
+	public String getReviewerPerson() {
+		return reviewerPerson;
+	}
+
+	public void setReviewerPerson(String reviewerPerson) {
+		this.reviewerPerson = reviewerPerson;
+	}
 }

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

@@ -0,0 +1,92 @@
+package com.jeeplus.modules.ruralprojectrecords.service;
+
+import com.jeeplus.common.service.CrudService;
+import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectContactPersonDao;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectContactPerson;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(readOnly = true)
+public class RuralProjectContactPersonService extends CrudService<RuralProjectContactPersonDao, RuralProjectContactPerson> {
+    @Autowired
+    private RuralProjectContactPersonDao ruralProjectContactPersonDao;
+
+    /**
+     * 将施工联系人与委托联系人添加入数据库中
+     *
+     * @param projectRecords
+     */
+    @Transactional(readOnly = false)
+    public void addNewProjectContactPerson(RuralProjectRecords projectRecords) {
+        //删除
+        ruralProjectContactPersonDao.deleteProjectContactPerson(projectRecords.getProjectId());
+        //修改
+        RuralProjectContactPerson ruralProjectContactPerson = new RuralProjectContactPerson();
+        ruralProjectContactPerson.setProjectCode(projectRecords.getProjectId());
+        if(null!=projectRecords.getWorkClientLinkmanList()){
+            projectRecords.getWorkClientLinkmanList().forEach(w -> {
+                ruralProjectContactPerson.setUnitName(w.getClientId().getName());
+                ruralProjectContactPerson.setContactPersonName(w.getName());
+                ruralProjectContactPerson.setPhone1(w.getLinkPhone());
+                ruralProjectContactPerson.setPhone2(w.getLinkMobile());
+                ruralProjectContactPerson.setType(1);
+                ruralProjectContactPerson.preInsert();
+                ruralProjectContactPersonDao.insertNewProjectContactPerson(ruralProjectContactPerson);
+
+            });
+        }
+
+        if(null!=projectRecords.getWorkConstructionLinkmanList()){
+            projectRecords.getWorkConstructionLinkmanList().forEach(w -> {
+                ruralProjectContactPerson.setUnitName(w.getClientId().getName());
+                ruralProjectContactPerson.setContactPersonName(w.getName());
+                ruralProjectContactPerson.setPhone1(w.getLinkPhone());
+                ruralProjectContactPerson.setPhone2(w.getLinkMobile());
+                ruralProjectContactPerson.setType(2);
+                ruralProjectContactPerson.preInsert();
+                ruralProjectContactPersonDao.insertNewProjectContactPerson(ruralProjectContactPerson);
+
+            });
+        }
+
+    }
+
+    /**
+     * 根据项目编号查询联系人
+     */
+    @Transactional(readOnly = true)
+    public List<RuralProjectContactPerson> findProjectContactPersonByProjectId(String projectId) {
+        return ruralProjectContactPersonDao.selectProjectContactPersonByProjectId(projectId);
+    }
+
+    /**
+     * 修改联系人
+     */
+    @Transactional(readOnly = false)
+    public void modifyProjectContactPerson(RuralProjectRecords projectRecords) {
+        RuralProjectContactPerson ruralProjectContactPerson = new RuralProjectContactPerson();
+        ruralProjectContactPerson.setProjectCode(projectRecords.getProjectId());
+        projectRecords.getWorkClientLinkmanList().forEach(w -> {
+            ruralProjectContactPerson.setUnitName(w.getClientId().getName());
+            ruralProjectContactPerson.setContactPersonName(w.getName());
+            ruralProjectContactPerson.setPhone1(w.getLinkPhone());
+            ruralProjectContactPerson.setPhone2(w.getLinkMobile());
+            ruralProjectContactPerson.setId(w.getProjectPersonId());
+            ruralProjectContactPersonDao.updateProjectContactPerson(ruralProjectContactPerson);
+        });
+        projectRecords.getWorkConstructionLinkmanList().forEach(w -> {
+            ruralProjectContactPerson.setUnitName(w.getClientId().getName());
+            ruralProjectContactPerson.setContactPersonName(w.getName());
+            ruralProjectContactPerson.setPhone1(w.getLinkPhone());
+            ruralProjectContactPerson.setPhone2(w.getLinkMobile());
+            ruralProjectContactPerson.setId(w.getProjectPersonId());
+            ruralProjectContactPersonDao.updateProjectContactPerson(ruralProjectContactPerson);
+        });
+    }
+
+}

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

@@ -26,10 +26,7 @@ import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.*;
-import com.jeeplus.modules.ruralprojectrecords.service.ProjectPaperFilingService;
-import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
-import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
-import com.jeeplus.modules.ruralprojectrecords.service.SubProjectInfoService;
+import com.jeeplus.modules.ruralprojectrecords.service.*;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.UserService;
@@ -39,6 +36,7 @@ import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
@@ -109,6 +107,8 @@ public class RuralProjectViewController extends BaseController {
     private RuralWorkProjectUserDao workProjectUserDao;
     @Autowired
     private ProjectFilingBatchService projectFilingBatchService;
+    @Autowired
+    private RuralProjectContactPersonService ruralProjectContactPersonService;
     /**
      * 项目查看
      * 传参：项目id
@@ -189,7 +189,29 @@ public class RuralProjectViewController extends BaseController {
 
             model.addAttribute("flagProjectReportData",projectReportData);
 
+            //根据项目编号查询委托/施工方联系人
+            List<RuralProjectContactPerson> projectContactPersonByProjectIdList = ruralProjectContactPersonService.findProjectContactPersonByProjectId(projectRecords.getProjectId());
+            projectRecords.setWorkClientLinkmanList(new ArrayList<>());
+            for(RuralProjectContactPerson person:projectContactPersonByProjectIdList){
+                WorkClientLinkman workClientLinkman = new WorkClientLinkman();
+                WorkClientInfo workClientInfo = new WorkClientInfo();
+                workClientLinkman.setClientId(workClientInfo);
+                if(person.getType()==1){
+                    workClientLinkman.getClientId().setName(person.getUnitName());
+                    workClientLinkman.setName(person.getContactPersonName());
+                    workClientLinkman.setLinkPhone(person.getPhone1());
+                    workClientLinkman.setLinkMobile(person.getPhone2());
+                    projectRecords.getWorkClientLinkmanList().add(workClientLinkman);
+                }else{
+                    workClientLinkman.getClientId().setName(person.getUnitName());
+                    workClientLinkman.setName(person.getContactPersonName());
+                    workClientLinkman.setLinkPhone(person.getPhone1());
+                    workClientLinkman.setLinkMobile(person.getPhone2());
+                    projectRecords.getWorkConstructionLinkmanList().add(workClientLinkman);
+                }
+            }
         }
+
         model.addAttribute("projectRecords", projectRecords);
         long l8 = System.currentTimeMillis();
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientLinkman.java

@@ -30,6 +30,7 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 	private List<String> clientIds;
 	private String uscCode;
 	private String createName;   //创建人
+	private String projectPersonId;//联系人id
 	public WorkClientLinkman() {
 		super();
 	}
@@ -154,4 +155,12 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 	public void setCreateName(String createName) {
 		this.createName = createName;
 	}
+
+	public String getProjectPersonId() {
+		return projectPersonId;
+	}
+
+	public void setProjectPersonId(String projectPersonId) {
+		this.projectPersonId = projectPersonId;
+	}
 }

src/main/resources/mappings/modules/ruralprojectcontactperson/RuralProjectContactPersonDao.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectContactPersonDao">
+
+    <sql id="projectContactPersonColumns">
+        a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+		a.project_code as "projectCode",
+		a.unit_name as"unitName",
+		a.contact_person_name as"contactPersonName",
+		a.phone1 as "phone1",
+		a.phone2 as "phone2",
+		a.type as "type"
+
+    </sql>
+    <insert id="insertNewProjectContactPerson">
+        INSERT INTO rural_project_contact_person
+        (
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        remarks,
+        del_flag,
+        project_code,
+        unit_name,
+        contact_person_name,
+        phone1,
+        phone2,
+        `type`
+        )
+		VALUES
+		(
+		#{id},
+		#{createBy.id},
+		#{createDate},
+		#{updateBy.id},
+		#{updateDate},
+		#{remarks},
+		#{delFlag},
+		#{projectCode},
+		#{unitName},
+		#{contactPersonName},
+		#{phone1},
+		#{phone2},
+		#{type}
+		);
+    </insert>
+	<update id="updateProjectContactPerson">
+		update rural_project_contact_person
+		set
+		unit_name = #{unitName},
+        contact_person_name = #{contactPersonName},
+        phone1 = #{phone1},
+        phone2 = #{phone2}
+        where id=#{id}
+
+	</update>
+	<delete id="deleteProjectContactPerson">
+		delete from rural_project_contact_person where project_code=#{projectId}
+	</delete>
+
+	<select id="selectProjectContactPersonByProjectId"
+			resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectContactPerson">
+		select
+		<include refid="projectContactPersonColumns"/>
+		from
+		rural_project_contact_person a
+		<where>
+			project_code=#{projectId}
+		</where>
+	</select>
+</mapper>

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

@@ -71,7 +71,9 @@
 		a.quality_signature_file_name as "qualitySignatureFileName",
 		a.quality_signature_upload_file_user as "qualitySignatureUploadFileUser.id",
 		a.quality_signature_upload_date as "qualitySignatureUploadDate",
-		a.belonging_department as "belongingDepartment"
+		a.belonging_department as "belongingDepartment",
+		a.reviewer_person as "reviewerPerson"
+
 	</sql>
 
 	<sql id="projectRecordsColumnss">
@@ -120,7 +122,8 @@
 		a.over_due_status as "overDueStatus",
 		ifnull(a.record_state,0) as "projectRecordStatus",
 		a.over_record_status as "overRecordStatus",
-		a.emergency_project as "emergencyProject"
+		a.emergency_project as "emergencyProject",
+		a.reviewer_person as "reviewerPerson"
 	</sql>
 
 	<sql id="projectRecordsJoins">
@@ -780,7 +783,8 @@
 			submit_scale,
 			emergency_project,
 			reported_state,
-			belonging_department
+			belonging_department,
+			reviewer_person
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -833,7 +837,8 @@
 		    #{submitScale},
 		    #{emergencyProject},
 		    #{reportedState},
-		    #{belongingDepartment}
+		    #{belongingDepartment},
+		    #{reviewerPerson}
 		)
 	</insert>
 
@@ -886,7 +891,8 @@
 			engineering_type =#{engineeringType},
 			project_properties =#{projectProperties},
 			submit_scale =#{submitScale},
-			emergency_project=#{emergencyProject}
+			emergency_project=#{emergencyProject},
+			reviewer_person = #{reviewerPerson}
 
 			<choose>
 				<when test="reportedState ==null or reportedState == ''">
@@ -948,7 +954,8 @@
 		    attachment_project_sort = #{attachmentProjectSort},
 			submit_scale = #{submitScale},
 			emergency_project = #{emergencyProject},
-			belonging_department = #{belongingDepartment}
+			belonging_department = #{belongingDepartment},
+		reviewer_person = #{reviewerPerson}
 			<if test="engineeringType != null and engineeringType != ''">
 				,engineering_type =#{engineeringType}
 			</if>

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

@@ -42,13 +42,15 @@ function searchGrid${id}(){
 		},
 		  cancel: function(index){
 	       }
+
 	});
 };
+
 </script>
 
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group" style="width: 100%">
-		<input id="${id}Name" placeholder="请选择合同" name="${labelName }" ${allowInput?'':'readonly="readonly"'} onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="请选择合同"  name="${labelName }" ${allowInput?'':'readonly="readonly"'} onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button" onclick="searchGrid${id}()" id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

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

@@ -684,7 +684,7 @@
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>项目合同信息</h2></div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <div class="layui-item layui-col-sm6 lw7" style="display: none">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
                             <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
@@ -869,9 +869,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">项目责任人：</label>
+                    <label class="layui-form-label">审核人：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.reviewerPerson}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -903,7 +903,7 @@
                         </button>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <label class="layui-form-label"><span class="require-item">*</span>项目等级：</label>
                     <div class="layui-input-block">
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">

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

@@ -55,11 +55,21 @@
                     top.layer.msg("请选择委托方联系人！", {icon: 5});
                     return;
                 }
+
+
                 var startDate = new Date($("#startDate").val());
                 var endingDate = new Date($("#endingDate").val());
 
                 var projectStartDate = new Date('${projectStartDate}');
                 var projectEndDate = new Date('${projectEndDate}');
+                if(null == startDate||undefined==startDate ||"Invalid Date"==startDate){
+                    parent.layer.msg("工作开始日期不能为空!", {icon: 5});
+                    return false;
+                }
+                if(null==endingDate||undefined==endingDate||"Invalid Date" == endingDate){
+                    parent.layer.msg("工作结束日期不能为空!", {icon: 5});
+                    return false;
+                }
 
                 if(startDate.getTime() > endingDate.getTime()){
                     parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
@@ -106,7 +116,7 @@
                         return false;
                     }
                     //500万及500万以上为A及，500万以下为B及
-                    if(submitMoney==1 ){
+                    /*if(submitMoney==1 ){
                         if (submitScale>=500){
                             parent.layer.msg("送审规模大于500万元,项目等级请选择A级!", {icon: 5});
                             return false;
@@ -123,7 +133,7 @@
                             return false;
                         }
 
-                    }
+                    }*/
 
 
                     var attachmentProjectSort=$("#attachmentProjectSort").val();
@@ -512,7 +522,7 @@
             $("#installUnitFees").val(pp);
         }
 
-        function setLinkMan(newClientId) {
+        /*function setLinkMan(newClientId) {
             $.ajax({
                 url:"${ctx}/ruralProject/ruralCostProjectRecords/getLinkManByClientId",
                 data:{"clientId":newClientId},
@@ -551,7 +561,7 @@
                     $("#linkmanButton").addClass("forbidden");
                 }
             });
-        }
+        }*/
         function setValuee(obj){
             var successRows = 0;
             ss = $("#workClientLinkmanList tr").length;
@@ -895,7 +905,7 @@
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>项目合同信息</h2></div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <div class="layui-item layui-col-sm6 lw7" style="display: none">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
                             <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
@@ -1058,9 +1068,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>项目责任人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>审核人</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
+                        <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="reviewerPerson" labelValue="${ruralProjectRecords.reviewerPerson}"
                                        cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
@@ -1102,11 +1112,11 @@
                     </div>
                 </div>
 
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <label class="layui-form-label"><span class="require-item">*</span>项目等级：</label>
                     <div class="layui-input-block">
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
-                            <input type="radio" name="submitMoney" lay-filter="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                        <input type="radio" name="submitMoney" lay-filter="submitMoney" id="submitMoney" value="${v.value}" <c:if test="${v.value==1}">checked</c:if> title="${v.label}" <%--<c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>--%>>
                         </c:forEach>
 <%--                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>--%>
                         <p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
@@ -1114,7 +1124,7 @@
                 </div>
 
                 <c:if test="${ruralProjectRecords.createReportFlag}">
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <div class="layui-item layui-col-sm6 lw7" style="display: none">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>是否生成报告号：</label>
                         <div class="layui-input-block">
                             <div style="margin-right: 30px;">
@@ -1294,11 +1304,14 @@
             <div>
                 <div class="form-group-label"><h2><span class="require-item">*</span>委托方联系人信息</h2></div>
                 <div id="linkmanDiv" class="layui-item nav-btns" style="float: left;width: 155px">
-                    <sys:gridselect1  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+                    <a class="nav-btn nav-btn-add"
+                       onclick="workClientLinkmanTplInfo('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;"
+                       title="新增委托方联系人"><i class="fa fa-plus"></i> 新增委托方联系人</a>
+                    <%--<sys:gridselect1  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
                                       name="linkman.id"  title="选择客户"
                                       value="${ruralProjectRecords.workContractInfo.workClinetInfoIds}"
                                       cssClass="form-control judgment" fieldLabels="联系人" fieldKeys="name"
-                                      searchLabel="联系人" searchKey="name"></sys:gridselect1>
+                                      searchLabel="联系人" searchKey="name"></sys:gridselect1>--%>
                 </div>
 <%--                <div id="addUserButton" class="layui-item nav-btns" style="float: left;">--%>
 <%--                    <a id="aButton" href="javascript:void(0)"--%>
@@ -1329,17 +1342,17 @@
                     <input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control judgment"/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control judgment"/>
                 </td>
 
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
                 </td>
                 <td class="text-center op-td" >
                     {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delEntrustRow(this, '#workClientLinkmanList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
@@ -1349,6 +1362,10 @@
                     <script type="text/javascript">
                         var workClientLinkmanRowIdx = 0,
                             workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+                        function workClientLinkmanTplInfo(id,workClientLinkmanRowIdx,workClientLinkmanTpl){
+                            addRow(id, workClientLinkmanRowIdx, workClientLinkmanTpl, "");
+                        }
+
                         $(document).ready(function () {
                             var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
                             if(data!=null && data.length() > 0){
@@ -1365,8 +1382,11 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>施工方信息</h2></div>
                 <div class="layui-item nav-btns" style="float: left;width: 155px">
-                    <sys:gridselectConstruction url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList" title="选择施工单位"
-                                                cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name" searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectConstruction>
+                    <a class="nav-btn nav-btn-add"
+                       onclick="workClientLinkmanTplInfo('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl);workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;"
+                       title="新增施工方联系人"><i class="fa fa-plus"></i> 新增施工方联系人</a>
+                    <%--<sys:gridselectConstruction url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList" title="选择施工单位"
+                                                cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name" searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectConstruction>--%>
                 </div>
 
                 <div class="layui-item layui-col-xs12 form-table-container">
@@ -1392,17 +1412,17 @@
                         <input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
 					</td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;" readonly="true" id="workConstructionLinkmanList{{idx}}_clientName" name="workConstructionLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_clientName" name="workConstructionLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
                     </td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;" readonly="true" id="workConstructionLinkmanList{{idx}}_name" name="workConstructionLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_name" name="workConstructionLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
                     </td>
 
                     <td>
-                        <input <input style="background-color: #FFFFFF;" readonly="true" id="workConstructionLinkmanList{{idx}}_linkPhone" name="workConstructionLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_linkPhone" name="workConstructionLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
                     </td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;" readonly="true" id="workConstructionLinkmanList{{idx}}_linkMobile" name="workConstructionLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_linkMobile" name="workConstructionLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
                     </td>
 					<td class="text-center" width="10">
 						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workConstructionLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
@@ -1412,6 +1432,9 @@
                     <script>
                         var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        function workConstructionLinkmanTplInfo(id,workConstructionLinkmanRowIdx,workConstructionLinkmanTpl){
+                            addRow(id, workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, "");
+                        }
                         $(document).ready(function() {
                             var data = ${fns:toJson(ruralProjectRecords.workClientLinkmanList)};
                             if (data!=null) {

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

@@ -230,9 +230,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">项目责任人：</label>
+					<label class="layui-form-label">审核人：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.reviewerPerson}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">