浏览代码

建设,施工,监理,设计添加显示和类型的显示

user7 5 年之前
父节点
当前提交
325e23f45c
共有 19 个文件被更改,包括 1723 次插入102 次删除
  1. 27 0
      src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordsAlter.java
  2. 34 9
      src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsAlterService.java
  3. 68 10
      src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java
  4. 6 0
      src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientInfoDao.java
  5. 3 0
      src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientLinkmanDao.java
  6. 19 0
      src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java
  7. 17 1
      src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java
  8. 1 0
      src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java
  9. 24 0
      src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml
  10. 12 0
      src/main/resources/mappings/modules/workclientinfo/WorkClientLinkmanDao.xml
  11. 144 0
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterAudit.jsp
  12. 278 4
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp
  13. 287 5
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterModify.jsp
  14. 341 46
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterView.jsp
  15. 146 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp
  16. 62 23
      src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp
  17. 82 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp
  18. 147 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp
  19. 25 1
      src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

+ 27 - 0
src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordsAlter.java

@@ -59,6 +59,9 @@ public class ProjectRecordsAlter extends ActEntity<ProjectRecordsAlter> {
 	@NotNull(message = "委托方联系人不能为空")
 	private List<WorkClientLinkman> workClientLinkmanList;		// 委托方联系人
 	private List<WorkClientLinkman> workConstructionLinkmanList;		// 施工方及联系人
+	private List<WorkClientLinkman> workBuildLinkmanList;//建设方联系人
+	private List<WorkClientLinkman> workSuperLinkmanList;		// 监理方及联系人
+	private List<WorkClientLinkman> workDesignLinkmanList;//设计方联系人
 	@NotBlank(message = "工程概况不能为空")
 	private String projectDesc;		// 工程概况
 	@NotNull(message = "项目负责人不能为空")
@@ -525,4 +528,28 @@ public class ProjectRecordsAlter extends ActEntity<ProjectRecordsAlter> {
 	public void setProjectTypeId(String projectTypeId) {
 		this.projectTypeId = projectTypeId;
 	}
+
+	public List<WorkClientLinkman> getWorkBuildLinkmanList() {
+		return workBuildLinkmanList;
+	}
+
+	public void setWorkBuildLinkmanList(List<WorkClientLinkman> workBuildLinkmanList) {
+		this.workBuildLinkmanList = workBuildLinkmanList;
+	}
+
+	public List<WorkClientLinkman> getWorkSuperLinkmanList() {
+		return workSuperLinkmanList;
+	}
+
+	public void setWorkSuperLinkmanList(List<WorkClientLinkman> workSuperLinkmanList) {
+		this.workSuperLinkmanList = workSuperLinkmanList;
+	}
+
+	public List<WorkClientLinkman> getWorkDesignLinkmanList() {
+		return workDesignLinkmanList;
+	}
+
+	public void setWorkDesignLinkmanList(List<WorkClientLinkman> workDesignLinkmanList) {
+		this.workDesignLinkmanList = workDesignLinkmanList;
+	}
 }

+ 34 - 9
src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsAlterService.java

@@ -177,10 +177,19 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
 		this.saveProjectUsers(projectRecordsAlter.getId(), leaders, true);
 		//保存委托方联系人
 		List<WorkClientLinkman> workClientLinkmanList = projectRecordsAlter.getWorkClientLinkmanList();
-		this.saveLinkmanInfos(projectRecordsAlter.getId(), workClientLinkmanList, true);
+		this.saveLinkmanInfos(projectRecordsAlter.getId(), workClientLinkmanList, "1");
+        //保存建设方联系信息2(新添代码)
+        List<WorkClientLinkman> buildLinkmanList = projectRecordsAlter.getWorkBuildLinkmanList();
+        this.saveLinkmanInfos(projectRecordsAlter.getId(), buildLinkmanList, "2");
 		//保存施工方联系信息
 		List<WorkClientLinkman> constructionLinkmanList = projectRecordsAlter.getWorkConstructionLinkmanList();
-		this.saveLinkmanInfos(projectRecordsAlter.getId(), constructionLinkmanList, false);
+		this.saveLinkmanInfos(projectRecordsAlter.getId(), constructionLinkmanList, "3");
+        //保存监理方联系信息4(新添代码)
+        List<WorkClientLinkman> superLinkmanList = projectRecordsAlter.getWorkSuperLinkmanList();
+        this.saveLinkmanInfos(projectRecordsAlter.getId(), superLinkmanList, "4");
+        //保存设计方联系信息5(新添代码)
+        List<WorkClientLinkman> designLinkmanList = projectRecordsAlter.getWorkDesignLinkmanList();
+        this.saveLinkmanInfos(projectRecordsAlter.getId(), designLinkmanList, "5");
 		this.saveAttachments(projectRecordsAlter);
 		if (AlterStatusEnum.TSTORE.getValue()== projectRecordsAlter.getProjectStatus()||AlterStatusEnum.REJECTED.getValue()==oldStatus)return;
 		//启动审批流程
@@ -195,10 +204,10 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
 	 * 保存委托方和施工方联系人信息
 	 *
 	 * @param projectId
-	 * @param linkmanList
+	 * @param linkmanList 1委托方,3施工方,2建设,4监理,5设计
 	 * @param isEntrust   是否委托方
 	 */
-	private void saveLinkmanInfos(String projectId, List<WorkClientLinkman> linkmanList, boolean isEntrust) {
+	private void saveLinkmanInfos(String projectId, List<WorkClientLinkman> linkmanList, String isEntrust) {
 	    if (null != linkmanList){
             List<WorkClientLinkman> newLinkmanList = new ArrayList<WorkClientLinkman>();
             Iterator<WorkClientLinkman> iterator = linkmanList.iterator();
@@ -218,8 +227,8 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
             map.put("projectId", projectId);
             map.put("linkmanList", newLinkmanList);
             int entrust = 0;
-            if (isEntrust) {
-                entrust = 1;
+            if (StringUtils.isNotEmpty(isEntrust)) {
+                entrust = Integer.parseInt(isEntrust);
             }
             clientLinkmanDao.deleteProjectLinkmans(projectId, entrust);
             map.put("isEntrust", entrust);
@@ -267,7 +276,13 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
 		//删除委托方联系人
 		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 1);
 		//删除施工方联系人
-		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 0);
+		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 3);
+        //删除建设方联系人
+        clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 2);
+        //删除监理方联系人
+        clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 4);
+        //删除设计方联系人
+        clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 5);
 		super.delete(projectRecords);
 		//修改原项目状态
 		if (projectRecords.getAlterBeforeRecords()!=null){
@@ -314,8 +329,18 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
 	public void queryLinkmanInfos(ProjectRecordsAlter projectRecords) {
 		List<WorkClientLinkman> clientLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 1);
 		projectRecords.setWorkClientLinkmanList(clientLinkmanList);
-		List<WorkClientLinkman> constructionLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 0);
+		List<WorkClientLinkman> constructionLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 3);
 		projectRecords.setWorkConstructionLinkmanList(constructionLinkmanList);
+
+        //建设
+        List<WorkClientLinkman> buildLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 2);
+        projectRecords.setWorkBuildLinkmanList(buildLinkmanList);
+        //监理
+        List<WorkClientLinkman> superLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 4);
+        projectRecords.setWorkSuperLinkmanList(superLinkmanList);
+        //设计
+        List<WorkClientLinkman> designLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 5);
+        projectRecords.setWorkDesignLinkmanList(designLinkmanList);
 	}
 
 	/**
@@ -954,7 +979,7 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
         this.queryContractInfo(projectRecordsAlter);
         //设置项目组成员
         this.queryUserNames(projectRecordsAlter);
-        //设置委托方联系人信息
+        //设置委托方,建设,监理,施工,设计联系人信息
         this.queryLinkmanInfos(projectRecordsAlter);
         //设置附件信息
         this.queryWorkAttachment(projectRecordsAlter);

+ 68 - 10
src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -272,6 +272,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		if(StringUtils.isBlank(projectRecords.getProjectId())){
             projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(),ProjectRecords.SERIAL_BIZCODE));
         }
+		//保存项目登记信息
         if(projectRecords.getProjectStatus()==ProjectStatusEnum.INVALID.getValue()){
             projectRecords.setId(IdGen.uuid());
             dao.insert(projectRecords);
@@ -284,12 +285,21 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 			this.saveProjectUsers(projectRecords.getId(), leaders, true);
 		}
 
-		//保存委托方联系人
+		//保存委托方联系人1
 		List<WorkClientLinkman> workClientLinkmanList = projectRecords.getWorkClientLinkmanList();
-		this.saveLinkmanInfos(projectRecords.getId(), workClientLinkmanList, true);
-		//保存施工方联系信息
+		this.saveLinkmanInfos(projectRecords.getId(), workClientLinkmanList, "1");
+		//保存建设方联系信息2(新添代码)
+		List<WorkClientLinkman> buildLinkmanList = projectRecords.getWorkBuildLinkmanList();
+		this.saveLinkmanInfos(projectRecords.getId(), buildLinkmanList, "2");
+		//保存施工方联系信息3
 		List<WorkClientLinkman> constructionLinkmanList = projectRecords.getWorkConstructionLinkmanList();
-		this.saveLinkmanInfos(projectRecords.getId(), constructionLinkmanList, false);
+		this.saveLinkmanInfos(projectRecords.getId(), constructionLinkmanList, "3");
+		//保存监理方联系信息4(新添代码)
+		List<WorkClientLinkman> superLinkmanList = projectRecords.getWorkSuperLinkmanList();
+		this.saveLinkmanInfos(projectRecords.getId(), superLinkmanList, "4");
+		//保存设计方联系信息5(新添代码)
+		List<WorkClientLinkman> designLinkmanList = projectRecords.getWorkDesignLinkmanList();
+		this.saveLinkmanInfos(projectRecords.getId(), designLinkmanList, "5");
         long t4 = System.currentTimeMillis();
 		//保存项目计划附件信息
 		if (projectRecords.getProjectStatus()==ProjectStatusEnum.INVALID.getValue()) {
@@ -318,12 +328,12 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
     }
 
     /**
-	 * 保存委托方和施工方联系人信息
+	 * 保存委托方和施工方联系人信息(以前代码)
 	 *
 	 * @param projectId
 	 * @param linkmanList
 	 * @param isEntrust   是否委托方,1委托方,0施工方
-	 */
+	 *//*
 	private void saveLinkmanInfos(String projectId, List<WorkClientLinkman> linkmanList, boolean isEntrust) {
 		assert (projectId != null);
 		if(linkmanList == null || linkmanList.isEmpty()){
@@ -339,6 +349,37 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		clientLinkmanDao.deleteProjectLinkmans(projectId, entrust);
 		map.put("isEntrust", entrust);
 		clientLinkmanDao.batchInsert(map);
+	}*/
+	/**
+	 * 保存委托方和施工方联系人信息
+	 *
+	 * @param projectId
+	 * @param linkmanList(新添代码)
+	 * @param isEntrust   是否委托方,1委托方,3施工方,2建设,4监理,5设计
+	 */
+	private void saveLinkmanInfos(String projectId, List<WorkClientLinkman> linkmanList,  String isEntrust) {
+		assert (projectId != null);
+		if(linkmanList == null || linkmanList.isEmpty()){
+			return;
+		}
+		//便利这个集合如果出现id为空就剔除这个集合
+		Iterator iterator=linkmanList.iterator();
+		while (iterator.hasNext()){
+			WorkClientLinkman linkman= (WorkClientLinkman) iterator.next();
+			if(StringUtils.isEmpty(linkman.getId())){
+				iterator.remove();
+			}
+		}
+		HashMap<String, Object> map = new HashMap<>(5);
+		map.put("projectId", projectId);
+		map.put("linkmanList", linkmanList);
+		int entrust = 0;
+		if (StringUtils.isNotEmpty(isEntrust)) {
+			entrust = Integer.parseInt(isEntrust);
+		}
+		clientLinkmanDao.deleteProjectLinkmans(projectId, entrust);
+		map.put("isEntrust", entrust);
+		clientLinkmanDao.batchInsert(map);
 	}
 
 	/**
@@ -381,7 +422,13 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		//删除委托方联系人
 		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 1);
 		//删除施工方联系人
-		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 0);
+		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 3);
+		//删除设计方联系人
+		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 2);
+		//删除监理方联系人
+		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 4);
+		//删除设计方联系人
+		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 5);
 		super.delete(projectRecords);
         WorkProjectNotify notify = new WorkProjectNotify();
         notify.setNotifyId(projectRecords.getId());
@@ -414,18 +461,29 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 
 	/**
 	 * 设置联系人信息
-	 *
+	 *委托人1,建设2,施工3,监理4,建设5
 	 * @param projectRecords
 	 */
 	public void queryLinkmanInfos(ProjectRecords projectRecords) {
+		//委托
 		List<WorkClientLinkman> clientLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 1);
 		for(WorkClientLinkman linkman :clientLinkmanList){
 			WorkClientInfo clientInfo = workClientInfoService.get(linkman.getClientId().getId());
 			linkman.setClientId(clientInfo);
 		}
 		projectRecords.setWorkClientLinkmanList(clientLinkmanList);
-		List<WorkClientLinkman> constructionLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 0);
+		//施工(根据项目id)
+		List<WorkClientLinkman> constructionLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 3);
 		projectRecords.setWorkConstructionLinkmanList(constructionLinkmanList);
+		//建设
+		List<WorkClientLinkman> buildLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 2);
+		projectRecords.setWorkBuildLinkmanList(buildLinkmanList);
+		//监理
+		List<WorkClientLinkman> superLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 4);
+		projectRecords.setWorkSuperLinkmanList(superLinkmanList);
+		//设计
+		List<WorkClientLinkman> designLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 5);
+		projectRecords.setWorkDesignLinkmanList(designLinkmanList);
 	}
 
 	/**
@@ -1100,7 +1158,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
         this.queryContractInfos(projectRecords);
         //设置项目组成员
         this.queryUserNames(projectRecords);
-        //设置委托方联系人信息
+        //设置委托方,建设方,施工方,监理,设计联系人信息
         this.queryLinkmanInfos(projectRecords);
         //设置附件信息
         this.queryWorkAttachment(projectRecords);

+ 6 - 0
src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientInfoDao.java

@@ -7,8 +7,10 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientJobTypeInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户管理DAO接口
@@ -36,4 +38,8 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
     int getCount(WorkClientInfo workClientInfo);
 
     List<WorkClientInfo> findList3(WorkClientInfo workClientInfo);
+    //根据统一社会信用代码查出来对应的客户信息表
+    WorkClientInfo findWorkClientInfo(WorkClientInfo workClientInfo);
+    //根据客户信息表查出来对应的联系人类型
+    List<Map> getJopType(WorkClientInfo work);
 }

+ 3 - 0
src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientLinkmanDao.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workclientinfo.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientJobTypeInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontent.entity.WorkContentInvestmentCost;
@@ -51,4 +52,6 @@ public interface WorkClientLinkmanDao extends CrudDao<WorkClientLinkman> {
     void jobTypeInsert(List<WorkClientJobTypeInfo> wlist);
 
     void jobTypeDelete(String workClientId);
+    //根据客户信息表id查出来对应的联系人信息
+    List<WorkClientLinkman> getLinkMan(WorkClientLinkman workClientLinkman);
 }

+ 19 - 0
src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -290,6 +290,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         if(flag){
             if(StringUtils.isNotBlank(workClientInfo.getJobTypeStr())){
                 workClientLinkmanDao.jobTypeDelete(workClientInfo.getId());
+
             }
         }
         //保存客户和工作类型关系信息
@@ -710,4 +711,22 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         workClientInfo.setDelFlag("0");
         return workClientInfoDao.findList3(workClientInfo);
     }
+
+    /**
+     * 根据统一社会信用代码进行查询获取客户对象
+     */
+    public WorkClientInfo findUscCode(WorkClientInfo workClientInfo){
+        //根据统一社会信用代码查出来对应的客户信息表
+        WorkClientInfo work=workClientInfoDao.findWorkClientInfo(workClientInfo);
+        //根据客户信息表id查出来对应的联系人信息
+        WorkClientLinkman workLink=new WorkClientLinkman();
+        workLink.getClientId().setId(work.getId());
+        List<WorkClientLinkman> workmManList=workClientLinkmanDao.getLinkMan(workLink);
+        work.setWorkClientLinkmanList(workmManList);
+        //根据客户信息表查出来对应的联系人类型
+        List<Map> jopType=workClientInfoDao.getJopType(work);
+
+        return work;
+
+    }
 }

+ 17 - 1
src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -845,5 +845,21 @@ public class WorkClientInfoController extends BaseController {
 		}
 		return ajaxJson;
 	}
-
+	/**
+	 * 查询是否拥有统一社会信用代码checkClientUscCode
+	 */
+	@ResponseBody
+	@RequestMapping("checkClientUscCode")
+	public Map checkClientUscCode(WorkClientInfo workClientInfo,Model model){
+		WorkClientInfo getWorkClientInfo=workClientInfoService.findUscCode(workClientInfo);
+		Map<String,Object> maps=new HashMap<>();
+		if(StringUtils.isNotEmpty(getWorkClientInfo.getId())){
+			maps.put("workClientInfo",getWorkClientInfo);
+			maps.put("code","false");
+			return maps;
+		}else{
+			maps.put("code","true");
+			return maps;
+		}
+	}
 }

+ 1 - 0
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1082,6 +1082,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 				} else if (workProjectNotify.getType().equals("39")) {    //项目登记
 					boolean flag = false;
+					//通过通知信息id获取项目登记对象
 					ProjectRecords projectRecords = projectRecordsService.get(workProjectNotify.getNotifyId());
 					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(workProjectNotify.getNotifyId());
 					if (projectRecords != null && StringUtils.isNotBlank(projectRecords.getId())) {

+ 24 - 0
src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -515,4 +515,28 @@
 			</otherwise>
 		</choose>
 	</select>
+
+	<!--根据统一信用代码获取客户信息对象-->
+	<select id="findWorkClientInfo" resultType="WorkClientInfo">
+		SELECT
+		<include refid="workClientInfoColumns"/>
+		FROM work_client_info a
+		<include refid="workClientInfoJoins"/>
+		<where>
+		a.del_flag = #{DEL_FLAG_NORMAL} and
+			a.usc_code=#{uscCode}
+
+		</where>
+	</select>
+	<!--根据客户信息表查出来对应的联系人类型-->
+	<select id="getJopType" resultType="map">
+		SELECT work_client_id as workClientId,job_type_id as jobTypeId
+
+		FROM work_client_job_type_info
+
+		<where>
+			job_type_id=#{id}
+
+		</where>
+	</select>
 </mapper>

+ 12 - 0
src/main/resources/mappings/modules/workclientinfo/WorkClientLinkmanDao.xml

@@ -326,5 +326,17 @@
 		delete from work_client_job_type_info where work_client_id =#{workClientId}
 	</delete>
 
+	<!--根据客户id获取联系人集合信息-->
+	<select id="getLinkMan" resultType="WorkClientLinkman" >
+		SELECT
+		<include refid="workClientLinkmanColumns"/>
+		FROM work_client_linkman a
+		<include refid="workClientLinkmanJoins"/>
+		WHERE
+		a.del_flag = #{DEL_FLAG_NORMAL}
+		<if test="clientId.id != null and clientId.id != ''">
+		a.client_id = #{clientId.id}
+		</if>
 
+	</select>
 </mapper>

+ 144 - 0
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterAudit.jsp

@@ -349,6 +349,48 @@
                     </script>
                 </div>
             </div>
+
+            <%--建设方信息(start)--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>建设方信息</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="contentBuild" class="table table-bordered table-condensed no-bottom-margin details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th width="25%">建设方单位名称</th>
+                            <th width="25%">联系人姓名</th>
+                            <th width="25%">联系方式1</th>
+                            <th width="25%">联系方式2</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workBuildLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workBuildLinkmanTpl">//<!--
+					<tr id="workBuildLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workBuildLinkmanList{{idx}}_id" name="workBuildLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workBuildLinkmanList{{idx}}_delFlag" name="workBuildLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+                    </script>
+                </div>
+            </div>
+            <%--建设方信息(end)--%>
+
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>施工方信息</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
@@ -387,6 +429,87 @@
                     </script>
                 </div>
             </div>
+
+            <%--监理方信息(start)--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>监理方信息</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="contentSuper" class="table table-bordered table-condensed no-bottom-margin details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th width="25%">监理方单位名称</th>
+                            <th width="25%">联系人姓名</th>
+                            <th width="25%">联系方式1</th>
+                            <th width="25%">联系方式2</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workSuperLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workSuperLinkmanTpl">//<!--
+					<tr id="workSuperLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workSuperLinkmanList{{idx}}_id" name="workSuperLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workSuperLinkmanList{{idx}}_delFlag" name="workSuperLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+                    </script>
+                </div>
+            </div>
+            <%--监理方信息(end)--%>
+            <%--设计方信息(start)--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>设计方信息</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="contentDesign" class="table table-bordered table-condensed no-bottom-margin details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th width="25%">设计方单位名称</th>
+                            <th width="25%">联系人姓名</th>
+                            <th width="25%">联系方式1</th>
+                            <th width="25%">联系方式2</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workDesignLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workDesignLinkmanTpl">//<!--
+					<tr id="workDesignLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workDesignLinkmanList{{idx}}_id" name="workDesignLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workDesignLinkmanList{{idx}}_delFlag" name="workDesignLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+                    </script>
+                </div>
+            </div>
+            <%--设计方信息(end)--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
@@ -520,6 +643,9 @@
 			<script>
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workBuildLinkmanRowIdx = 0, workBuildLinkmanTpl = $("#workBuildLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workSuperLinkmanRowIdx = 0, workSuperLinkmanTpl = $("#workSuperLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workDesignLinkmanRowIdx = 0, workDesignLinkmanTpl = $("#workDesignLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 $(document).ready(function() {
                     var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
                     for (var i=0; i<data.length; i++){
@@ -531,6 +657,24 @@
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
                     }
+                    /*建设*/
+                    var dataBuild = ${fns:toJson(projectRecordsAlter.workBuildLinkmanList)};
+                    for (var i=0; i<dataBuild.length; i++){
+                        addRow('#workBuildLinkmanList', workBuildLinkmanRowIdx, workBuildLinkmanTpl, dataBuild[i]);
+                        workBuildLinkmanRowIdx = workBuildLinkmanRowIdx + 1;
+                    }
+                    /*监理*/
+                    var dataSuper = ${fns:toJson(projectRecordsAlter.workSuperLinkmanList)};
+                    for (var i=0; i<dataSuper.length; i++){
+                        addRow('#workSuperLinkmanList', workSuperLinkmanRowIdx, workSuperLinkmanTpl, dataSuper[i]);
+                        workSuperLinkmanRowIdx = workSuperLinkmanRowIdx + 1;
+                    }
+                    /*设计*/
+                    var dataDesign = ${fns:toJson(projectRecordsAlter.workDesignLinkmanList)};
+                    for (var i=0; i<dataDesign.length; i++){
+                        addRow('#workDesignLinkmanList', workDesignLinkmanRowIdx, workDesignLinkmanTpl, dataDesign[i]);
+                        workDesignLinkmanRowIdx = workDesignLinkmanRowIdx + 1;
+                    }
                 });
 
 			</script>

+ 278 - 4
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp

@@ -269,7 +269,7 @@
             }
             return false;
         }
-
+        /*施工单位*/
         function setClientInfo(obj) {
             for(var i=0;i<obj.length;i++){
                 var idArr = $("#workConstructionLinkmanList tr:visible .linkmanId");
@@ -279,7 +279,37 @@
                 }
             }
         }
+        /*建设单位*/
+        function setClientBuild(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workBuildLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workBuildLinkmanList",workBuildLinkmanRowIdx,workBuildLinkmanTpl,obj[i]);
+                    workBuildLinkmanRowIdx=workBuildLinkmanRowIdx+1;
+                }
+            }
+        }
 
+        /*监理单位*/
+        function setClientSuper(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workSuperLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workSuperLinkmanList",workSuperLinkmanRowIdx,workSuperLinkmanTpl,obj[i]);
+                    workSuperLinkmanRowIdx=workSuperLinkmanRowIdx+1;
+                }
+            }
+        }
+        /*设计单位*/
+        function setClientDesign(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workDesignLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workDesignLinkmanList",workDesignLinkmanRowIdx,workDesignLinkmanTpl,obj[i]);
+                    workDesignLinkmanRowIdx=workDesignLinkmanRowIdx+1;
+                }
+            }
+        }
         function existConstructionLinkman(obj,length) {
             for (var i=0;i<length;i++) {
                 var val = $('#workConstructionLinkmanList'+i+'_id').val();
@@ -290,7 +320,37 @@
             }
             return false;
         }
+        function existBuildLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workBuildLinkmanList'+i+'_id').val();
+                var cid = $('#workBuildLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
 
+        function existSuperLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workSuperLinkmanList'+i+'_id').val();
+                var cid = $('#workSuperLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
+        function existDesignLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workDesignLinkmanList'+i+'_id').val();
+                var cid = $('#workDesignLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
         function addRow(list, idx, tpl, row){
             // var idx1 = $("#workClientLinkmanList tr").length;
             bornTemplete(list, idx, tpl, row, idx);
@@ -715,7 +775,79 @@
                     </script>
                 </div>
             </div>
+            <%--新添加代码建设方信息(start)--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>建设方信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <sys:gridselectClientBuild url="${ctx}/workclientinfo/workClientInfo/clientInfoBuild" id="buildOrgList"   title="选择建设单位"
+                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name">
+                    </sys:gridselectClientBuild>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTableBuild" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th style="text-align: center" width="20%">建设方单位名称</th>
+                            <th style="text-align: center" width="20%">联系人姓名</th>
+                            <th style="text-align: center" width="20%">联系方式1</th>
+                            <th style="text-align: center" width="20%">联系方式2</th>
+                            <th width="20%">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workBuildLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workBuildLinkmanTpl">//<!--
+					<tr id="workBuildLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workBuildLinkmanList{{idx}}_id" name="workBuildLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}" class="linkmanId"/>
+						<input id="workBuildLinkmanList{{idx}}_delFlag" name="workBuildLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td style="text-align: center">
+						<input id="workBuildLinkmanList{{idx}}_cid" name = "workBuildLinkmanList[{{idx}}].clientId.id" type="hidden" value="{{row.clientId.id}}"/>
+						{{row.clientId.name}}
+					</td>
+					<td style="text-align: center">
+						{{row.name }}
+					</td>
+					<td style="text-align: center">
+						{{row.linkPhone}}
+					</td>
+					<td style="text-align: center">
+						{{row.linkMobile}}
+					</td>
+					<td class="text-center" width="10">
+						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workBuildLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+					</td>
+				</tr>//-->
+                    </script>
+                    <script>
+                        var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var workBuildLinkmanRowIdx = 0, workBuildLinkmanTpl = $("#workBuildLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        $(document).ready(function() {
+                            var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
+
+                            if (data!=null) {
+                                for (var i = 0; i < data.length; i++) {
+                                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                    workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                }
+                            }
+                            var dataBuild = ${fns:toJson(projectRecordsAlter.workBuildLinkmanList)};
+                            if (dataBuild!=null) {
+                                for (var i = 0; i < dataBuild.length; i++) {
+                                    addRow('#workBuildLinkmanList', workBuildLinkmanRowIdx, workBuildLinkmanTpl, dataBuild[i]);
+                                    workBuildLinkmanRowIdx = workBuildLinkmanRowIdx + 1;
+                                }
+                            }
+                        });
 
+                    </script>
+                </div>
+            </div>
+            <%--end--%>
+            <%--施工单位(start)--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>施工方信息</h2></div>
                 <div class="layui-item nav-btns">
@@ -764,14 +896,14 @@
                     </script>
 
                     <script>
-                        var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        //var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         $(document).ready(function() {
-                            var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
+                            /*var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
                             for (var i=0; i<data.length; i++){
                                 addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
                                 workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                            }
+                            }*/
                             var dataBank = ${fns:toJson(projectRecordsAlter.workConstructionLinkmanList)};
                             for (var i=0; i<dataBank.length; i++){
                                 addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
@@ -782,6 +914,148 @@
                     </script>
                 </div>
             </div>
+            <%--施工单位(end)--%>
+            <%--监理单位(start)--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>监理方信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <sys:gridselectClientSuper url="${ctx}/workclientinfo/workClientInfo/clientInfoSuper" id="superOrgList"   title="选择施工单位"
+                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientSuper>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTableSuper" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th style="text-align: center" width="20%">监理方单位名称</th>
+                            <th style="text-align: center" width="20%">联系人姓名</th>
+                            <th style="text-align: center" width="20%">联系方式1</th>
+                            <th style="text-align: center" width="20%">联系方式2</th>
+                            <th width="20%">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workSuperLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workSuperLinkmanTpl">//<!--
+					<tr id="workSuperLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workSuperLinkmanList{{idx}}_id" name="workSuperLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}" class="linkmanId"/>
+						<input id="workSuperLinkmanList{{idx}}_delFlag" name="workSuperLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td style="text-align: center">
+						<input id="workSuperLinkmanList{{idx}}_cid" name = "workSuperLinkmanList[{{idx}}].clientId.id" type="hidden" value="{{row.clientId.id}}"/>
+						{{row.clientId.name}}
+					</td>
+					<td style="text-align: center">
+						{{row.name }}
+					</td>
+					<td style="text-align: center">
+						{{row.linkPhone}}
+					</td>
+					<td style="text-align: center">
+						{{row.linkMobile}}
+					</td>
+					<td class="text-center" width="10">
+						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workSuperLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+					</td>
+				</tr>//-->
+                    </script>
+                    <script>
+                        //var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var workSuperLinkmanRowIdx = 0, workSuperLinkmanTpl = $("#workSuperLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        $(document).ready(function() {
+                            /*var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
+                            if (data!=null) {
+                                for (var i = 0; i < data.length; i++) {
+                                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                    workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                }
+                            }*/
+                            var dataSuper = ${fns:toJson(projectRecordsAlter.workSuperLinkmanList)};
+                            if (dataSuper!=null) {
+                                for (var i = 0; i < dataSuper.length; i++) {
+                                    addRow('#workSuperLinkmanList', workSuperLinkmanRowIdx, workSuperLinkmanTpl, dataSuper[i]);
+                                    workSuperLinkmanRowIdx = workSuperLinkmanRowIdx + 1;
+                                }
+                            }
+                        });
+
+                    </script>
+                </div>
+            </div>
+            <%--end--%>
+
+            <%--设计单位--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>设计方信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <sys:gridselectClientDesign url="${ctx}/workclientinfo/workClientInfo/clientInfoDesign" id="designOrgList"   title="选择设计单位"
+                                                cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientDesign>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTableDesign" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th style="text-align: center" width="20%">设计方单位名称</th>
+                            <th style="text-align: center" width="20%">联系人姓名</th>
+                            <th style="text-align: center" width="20%">联系方式1</th>
+                            <th style="text-align: center" width="20%">联系方式2</th>
+                            <th width="20%">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workDesignLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workDesignLinkmanTpl">//<!--
+					<tr id="workDesignLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workDesignLinkmanList{{idx}}_id" name="workDesignLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}" class="linkmanId"/>
+						<input id="workDesignLinkmanList{{idx}}_delFlag" name="workDesignLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td style="text-align: center">
+						<input id="workDesignkmanList{{idx}}_cid" name = "workDesignLinkmanList[{{idx}}].clientId.id" type="hidden" value="{{row.clientId.id}}"/>
+						{{row.clientId.name}}
+					</td>
+					<td style="text-align: center">
+						{{row.name }}
+					</td>
+					<td style="text-align: center">
+						{{row.linkPhone}}
+					</td>
+					<td style="text-align: center">
+						{{row.linkMobile}}
+					</td>
+					<td class="text-center" width="10">
+						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workDesignLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+					</td>
+				</tr>//-->
+                    </script>
+                    <script>
+                       // var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var workDesignLinkmanRowIdx = 0, workDesignLinkmanTpl = $("#workDesignLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        $(document).ready(function() {
+                            /*var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
+                            if (data!=null) {
+                                for (var i = 0; i < data.length; i++) {
+                                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                    workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                }
+                            }*/
+                            var dataDesign = ${fns:toJson(projectRecordsAlter.workDesignLinkmanList)};
+                            if (dataDesign!=null) {
+                                for (var i = 0; i < dataDesign.length; i++) {
+                                    addRow('#workDesignLinkmanList', workDesignLinkmanRowIdx, workDesignLinkmanTpl, dataDesign[i]);
+                                    workDesignLinkmanRowIdx = workDesignLinkmanRowIdx + 1;
+                                }
+                            }
+                        });
+
+                    </script>
+                </div>
+            </div>
+            <%--end--%>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2><span class="require-item">*</span>项目计划附件信息</h2></div>

+ 287 - 5
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterModify.jsp

@@ -181,7 +181,37 @@
                 }
             }
         }
-		
+        /*建设单位*/
+        function setClientBuild(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workBuildLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workBuildLinkmanList",workBuildLinkmanRowIdx,workBuildLinkmanTpl,obj[i]);
+                    workBuildLinkmanRowIdx=workBuildLinkmanRowIdx+1;
+                }
+            }
+        }
+
+        /*监理单位*/
+        function setClientSuper(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workSuperLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workSuperLinkmanList",workSuperLinkmanRowIdx,workSuperLinkmanTpl,obj[i]);
+                    workSuperLinkmanRowIdx=workSuperLinkmanRowIdx+1;
+                }
+            }
+        }
+        /*设计单位*/
+        function setClientDesign(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workDesignLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workDesignLinkmanList",workDesignLinkmanRowIdx,workDesignLinkmanTpl,obj[i]);
+                    workDesignLinkmanRowIdx=workDesignLinkmanRowIdx+1;
+                }
+            }
+        }
         function existConstructionLinkman(obj,length) {
             for (var i=0;i<length;i++) {
                 var val = $('#workConstructionLinkmanList'+i+'_id').val();
@@ -192,7 +222,38 @@
             }
             return false;
         }
-        
+        function existBuildLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workBuildLinkmanList'+i+'_id').val();
+                var cid = $('#workBuildLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        function existSuperLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workSuperLinkmanList'+i+'_id').val();
+                var cid = $('#workSuperLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
+        function existDesignLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workDesignLinkmanList'+i+'_id').val();
+                var cid = $('#workDesignLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
+
         function addRow(list, idx, tpl, row){
             // var idx1 = $("#workClientLinkmanList tr").length;
                 bornTemplete(list, idx, tpl, row, idx);
@@ -386,6 +447,16 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label">项目类型:</label>
+                <div class="layui-input-block">
+                    <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectRecordsAlter.projectTypeId}">
+                        <%--<form:option value=""/>
+                        <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                        <form:options items="${fns:getProjectType()}" itemLabel="typeName" itemValue="typeId"></form:options>
+                    </form:select>
+                </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"/>
@@ -558,7 +629,78 @@
                     </script>
                 </div>
             </div>
+            <%--新添加代码建设方信息(start)--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>建设方信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <sys:gridselectClientBuild url="${ctx}/workclientinfo/workClientInfo/clientInfoBuild" id="buildOrgList"   title="选择建设单位"
+                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name">
+                    </sys:gridselectClientBuild>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTableBuild" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th style="text-align: center" width="20%">建设方单位名称</th>
+                            <th style="text-align: center" width="20%">联系人姓名</th>
+                            <th style="text-align: center" width="20%">联系方式1</th>
+                            <th style="text-align: center" width="20%">联系方式2</th>
+                            <th width="20%">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workBuildLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workBuildLinkmanTpl">//<!--
+					<tr id="workBuildLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workBuildLinkmanList{{idx}}_id" name="workBuildLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}" class="linkmanId"/>
+						<input id="workBuildLinkmanList{{idx}}_delFlag" name="workBuildLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td style="text-align: center">
+						<input id="workBuildLinkmanList{{idx}}_cid" name = "workBuildLinkmanList[{{idx}}].clientId.id" type="hidden" value="{{row.clientId.id}}"/>
+						{{row.clientId.name}}
+					</td>
+					<td style="text-align: center">
+						{{row.name }}
+					</td>
+					<td style="text-align: center">
+						{{row.linkPhone}}
+					</td>
+					<td style="text-align: center">
+						{{row.linkMobile}}
+					</td>
+					<td class="text-center" width="10">
+						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workBuildLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+					</td>
+				</tr>//-->
+                    </script>
+                    <script>
+                        var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var workBuildLinkmanRowIdx = 0, workBuildLinkmanTpl = $("#workBuildLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        $(document).ready(function() {
+                            var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
+
+                            if (data!=null) {
+                                for (var i = 0; i < data.length; i++) {
+                                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                    workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                }
+                            }
+                            var dataBuild = ${fns:toJson(projectRecordsAlter.workBuildLinkmanList)};
+                            if (dataBuild!=null) {
+                                for (var i = 0; i < dataBuild.length; i++) {
+                                    addRow('#workBuildLinkmanList', workBuildLinkmanRowIdx, workBuildLinkmanTpl, dataBuild[i]);
+                                    workBuildLinkmanRowIdx = workBuildLinkmanRowIdx + 1;
+                                }
+                            }
+                        });
 
+                    </script>
+                </div>
+            </div>
+            <%--end--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2><span class="require-item">*</span>施工方信息</h2></div>
                 <div class="layui-item nav-btns">
@@ -605,14 +747,14 @@
                         </tr>//-->
                     </script>
                     <script>
-                        var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                       // var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         $(document).ready(function() {
-                            var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
+                            /*var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
                             for (var i=0; i<data.length; i++){
                                 addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
                                 workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                            }
+                            }*/
                             var dataBank = ${fns:toJson(projectRecordsAlter.workConstructionLinkmanList)};
                             for (var i=0; i<dataBank.length; i++){
                                 addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
@@ -623,7 +765,147 @@
                     </script>
                 </div>
             </div>
+            <%--监理单位(start)--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>监理方信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <sys:gridselectClientSuper url="${ctx}/workclientinfo/workClientInfo/clientInfoSuper" id="superOrgList"   title="选择施工单位"
+                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientSuper>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTableSuper" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th style="text-align: center" width="20%">监理方单位名称</th>
+                            <th style="text-align: center" width="20%">联系人姓名</th>
+                            <th style="text-align: center" width="20%">联系方式1</th>
+                            <th style="text-align: center" width="20%">联系方式2</th>
+                            <th width="20%">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workSuperLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workSuperLinkmanTpl">//<!--
+					<tr id="workSuperLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workSuperLinkmanList{{idx}}_id" name="workSuperLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}" class="linkmanId"/>
+						<input id="workSuperLinkmanList{{idx}}_delFlag" name="workSuperLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td style="text-align: center">
+						<input id="workSuperLinkmanList{{idx}}_cid" name = "workSuperLinkmanList[{{idx}}].clientId.id" type="hidden" value="{{row.clientId.id}}"/>
+						{{row.clientId.name}}
+					</td>
+					<td style="text-align: center">
+						{{row.name }}
+					</td>
+					<td style="text-align: center">
+						{{row.linkPhone}}
+					</td>
+					<td style="text-align: center">
+						{{row.linkMobile}}
+					</td>
+					<td class="text-center" width="10">
+						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workSuperLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+					</td>
+				</tr>//-->
+                    </script>
+                    <script>
+                        //var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var workSuperLinkmanRowIdx = 0, workSuperLinkmanTpl = $("#workSuperLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        $(document).ready(function() {
+                            /*var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
+                            if (data!=null) {
+                                for (var i = 0; i < data.length; i++) {
+                                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                    workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                }
+                            }*/
+                            var dataSuper = ${fns:toJson(projectRecordsAlter.workSuperLinkmanList)};
+                            if (dataSuper!=null) {
+                                for (var i = 0; i < dataSuper.length; i++) {
+                                    addRow('#workSuperLinkmanList', workSuperLinkmanRowIdx, workSuperLinkmanTpl, dataSuper[i]);
+                                    workSuperLinkmanRowIdx = workSuperLinkmanRowIdx + 1;
+                                }
+                            }
+                        });
 
+                    </script>
+                </div>
+            </div>
+            <%--end--%>
+
+            <%--设计单位--%>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>设计方信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <sys:gridselectClientDesign url="${ctx}/workclientinfo/workClientInfo/clientInfoDesign" id="designOrgList"   title="选择设计单位"
+                                                cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientDesign>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTableDesign" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th style="text-align: center" width="20%">设计方单位名称</th>
+                            <th style="text-align: center" width="20%">联系人姓名</th>
+                            <th style="text-align: center" width="20%">联系方式1</th>
+                            <th style="text-align: center" width="20%">联系方式2</th>
+                            <th width="20%">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workDesignLinkmanList">
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workDesignLinkmanTpl">//<!--
+					<tr id="workDesignLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workDesignLinkmanList{{idx}}_id" name="workDesignLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}" class="linkmanId"/>
+						<input id="workDesignLinkmanList{{idx}}_delFlag" name="workDesignLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td style="text-align: center">
+						<input id="workDesignkmanList{{idx}}_cid" name = "workDesignLinkmanList[{{idx}}].clientId.id" type="hidden" value="{{row.clientId.id}}"/>
+						{{row.clientId.name}}
+					</td>
+					<td style="text-align: center">
+						{{row.name }}
+					</td>
+					<td style="text-align: center">
+						{{row.linkPhone}}
+					</td>
+					<td style="text-align: center">
+						{{row.linkMobile}}
+					</td>
+					<td class="text-center" width="10">
+						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workDesignLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+					</td>
+				</tr>//-->
+                    </script>
+                    <script>
+                        // var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var workDesignLinkmanRowIdx = 0, workDesignLinkmanTpl = $("#workDesignLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        $(document).ready(function() {
+                            /*var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
+                            if (data!=null) {
+                                for (var i = 0; i < data.length; i++) {
+                                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                    workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                }
+                            }*/
+                            var dataDesign = ${fns:toJson(projectRecordsAlter.workDesignLinkmanList)};
+                            if (dataDesign!=null) {
+                                for (var i = 0; i < dataDesign.length; i++) {
+                                    addRow('#workDesignLinkmanList', workDesignLinkmanRowIdx, workDesignLinkmanTpl, dataDesign[i]);
+                                    workDesignLinkmanRowIdx = workDesignLinkmanRowIdx + 1;
+                                }
+                            }
+                        });
+
+                    </script>
+                </div>
+            </div>
+            <%--end--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2><span class="require-item">*</span>项目计划附件信息</h2></div>
                 <div class="layui-item nav-btns">

+ 341 - 46
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterView.jsp

@@ -149,6 +149,16 @@
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.leaderNameStr}"/>
                                 </div>
                             </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">项目类型:</label>
+                                <div class="layui-input-block">
+                                    <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectRecordsAlter.projectTypeId}" readonly="true">
+                                        <%--<form:option value=""/>
+                                        <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                                        <form:options items="${fns:getProjectType()}" itemLabel="typeName" itemValue="typeId" readonly="true"></form:options>
+                                    </form:select>
+                                </div>
+                            </div>
                             <div class="layui-item layui-col-sm6 lw6">
                                 <label class="layui-form-label">变更人:</label>
                                 <div class="layui-input-block">
@@ -303,7 +313,46 @@
                                 </script>
                             </div>
                         </div>
-
+                            <%--建设方信息(start)--%>
+                        <div class="form-group layui-row">
+                            <div class="form-group-label"><h2>建设方信息</h2></div>
+                            <div class="layui-item layui-col-xs12 form-table-container" >
+                                <table id="contentBuild" class="table table-bordered table-condensed no-bottom-margin details">
+                                    <thead>
+                                    <tr>
+                                        <th class="hide"></th>
+                                        <th width="25%">建设方单位名称</th>
+                                        <th width="25%">联系人姓名</th>
+                                        <th width="25%">联系方式1</th>
+                                        <th width="25%">联系方式2</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody id="workBuildLinkmanList">
+                                    </tbody>
+                                </table>
+                                <script type="text/template" id="workBuildLinkmanTpl">//<!--
+                                    <tr id="workBuildLinkmanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="workBuildLinkmanList{{idx}}_id" name="workBuildLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="workBuildLinkmanList{{idx}}_delFlag" name="workBuildLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    </td>
+                                    <td>
+                                        {{row.clientId.name}}
+                                    </td>
+                                    <td>
+                                        {{row.name }}
+                                    </td>
+                                    <td>
+                                        {{row.linkPhone}}
+                                    </td>
+                                    <td>
+                                        {{row.linkMobile}}
+                                    </td>
+                                </tr>//-->
+                                </script>
+                            </div>
+                        </div>
+                            <%--建设方信息(end)--%>
                         <div class="form-group layui-row">
                             <div class="form-group-label"><h2>施工方信息</h2></div>
                             <div class="layui-item layui-col-xs12 form-table-container" >
@@ -321,32 +370,114 @@
                                     </tbody>
                                 </table>
                                 <script type="text/template" id="workConstructionLinkmanTpl">//<!--
-					<tr id="workConstructionLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workConstructionLinkmanList{{idx}}_id" name="workConstructionLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name }}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
+                                    <tr id="workConstructionLinkmanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="workConstructionLinkmanList{{idx}}_id" name="workConstructionLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    </td>
+                                    <td>
+                                        {{row.clientId.name}}
+                                    </td>
+                                    <td>
+                                        {{row.name }}
+                                    </td>
+                                    <td>
+                                        {{row.linkPhone}}
+                                    </td>
+                                    <td>
+                                        {{row.linkMobile}}
+                                    </td>
+                                </tr>//-->
                                 </script>
                             </div>
                         </div>
-
+                            <%--监理方信息(start)--%>
+                        <div class="form-group layui-row">
+                            <div class="form-group-label"><h2>监理方信息</h2></div>
+                            <div class="layui-item layui-col-xs12 form-table-container" >
+                                <table id="contentSuper" class="table table-bordered table-condensed no-bottom-margin details">
+                                    <thead>
+                                    <tr>
+                                        <th class="hide"></th>
+                                        <th width="25%">监理方单位名称</th>
+                                        <th width="25%">联系人姓名</th>
+                                        <th width="25%">联系方式1</th>
+                                        <th width="25%">联系方式2</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody id="workSuperLinkmanList">
+                                    </tbody>
+                                </table>
+                                <script type="text/template" id="workSuperLinkmanTpl">//<!--
+                                    <tr id="workSuperLinkmanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="workSuperLinkmanList{{idx}}_id" name="workSuperLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="workSuperLinkmanList{{idx}}_delFlag" name="workSuperLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    </td>
+                                    <td>
+                                        {{row.clientId.name}}
+                                    </td>
+                                    <td>
+                                        {{row.name }}
+                                    </td>
+                                    <td>
+                                        {{row.linkPhone}}
+                                    </td>
+                                    <td>
+                                        {{row.linkMobile}}
+                                    </td>
+                                </tr>//-->
+                                </script>
+                            </div>
+                        </div>
+                            <%--监理方信息(end)--%>
+                            <%--设计方信息(start)--%>
+                        <div class="form-group layui-row">
+                            <div class="form-group-label"><h2>设计方信息</h2></div>
+                            <div class="layui-item layui-col-xs12 form-table-container" >
+                                <table id="contentDesign" class="table table-bordered table-condensed no-bottom-margin details">
+                                    <thead>
+                                    <tr>
+                                        <th class="hide"></th>
+                                        <th width="25%">设计方单位名称</th>
+                                        <th width="25%">联系人姓名</th>
+                                        <th width="25%">联系方式1</th>
+                                        <th width="25%">联系方式2</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody id="workDesignLinkmanList">
+                                    </tbody>
+                                </table>
+                                <script type="text/template" id="workDesignLinkmanTpl">//<!--
+                                    <tr id="workDesignLinkmanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="workDesignLinkmanList{{idx}}_id" name="workDesignLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="workDesignLinkmanList{{idx}}_delFlag" name="workDesignLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    </td>
+                                    <td>
+                                        {{row.clientId.name}}
+                                    </td>
+                                    <td>
+                                        {{row.name }}
+                                    </td>
+                                    <td>
+                                        {{row.linkPhone}}
+                                    </td>
+                                    <td>
+                                        {{row.linkMobile}}
+                                    </td>
+                                </tr>//-->
+                                </script>
+                            </div>
+                        </div>
+                            <%--设计方信息(end)--%>
 
                         <script>
                             var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                             var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                            var workBuildLinkmanRowIdx = 0, workBuildLinkmanTpl = $("#workBuildLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                            var workSuperLinkmanRowIdx = 0, workSuperLinkmanTpl = $("#workSuperLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                            var workDesignLinkmanRowIdx = 0, workDesignLinkmanTpl = $("#workDesignLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                             $(document).ready(function() {
                                 var data = ${fns:toJson(projectRecordsAlter.workClientLinkmanList)};
                                 for (var i=0; i<data.length; i++){
@@ -358,6 +489,25 @@
                                     addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
                                     workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
                                 }
+
+                                /*建设*/
+                                var dataBuild = ${fns:toJson(projectRecordsAlter.workBuildLinkmanList)};
+                                for (var i=0; i<dataBuild.length; i++){
+                                    addRow('#workBuildLinkmanList', workBuildLinkmanRowIdx, workBuildLinkmanTpl, dataBuild[i]);
+                                    workBuildLinkmanRowIdx = workBuildLinkmanRowIdx + 1;
+                                }
+                                /*监理*/
+                                var dataSuper = ${fns:toJson(projectRecordsAlter.workSuperLinkmanList)};
+                                for (var i=0; i<dataSuper.length; i++){
+                                    addRow('#workSuperLinkmanList', workSuperLinkmanRowIdx, workSuperLinkmanTpl, dataSuper[i]);
+                                    workSuperLinkmanRowIdx = workSuperLinkmanRowIdx + 1;
+                                }
+                                /*设计*/
+                                var dataDesign = ${fns:toJson(projectRecordsAlter.workDesignLinkmanList)};
+                                for (var i=0; i<dataDesign.length; i++){
+                                    addRow('#workDesignLinkmanList', workDesignLinkmanRowIdx, workDesignLinkmanTpl, dataDesign[i]);
+                                    workDesignLinkmanRowIdx = workDesignLinkmanRowIdx + 1;
+                                }
                             });
 
                         </script>
@@ -493,29 +643,24 @@
                             </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="${projectRecordsAlter.alterBeforeRecords.scaleType}"/>
-                            </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="${projectRecordsAlter.alterBeforeRecords.scaleUnit}"/>
+                                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.alterBeforeRecords.area.name}"/>
                             </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="${projectRecordsAlter.alterBeforeRecords.scaleQuantity}"/>
+                                <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="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="${projectRecordsAlter.alterBeforeRecords.area.name}"/>
+                                <form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
                             </div>
                         </div>
+
                         <div class="layui-item layui-col-sm6 lw6">
                             <label class="layui-form-label">建设地点:</label>
                             <div class="layui-input-block">
@@ -528,6 +673,16 @@
                                 <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.alterBeforeRecords.leaderNameStr}"/>
                             </div>
                         </div>
+                        <div class="layui-item layui-col-sm6 lw7">
+                            <label class="layui-form-label">项目类型:</label>
+                            <div class="layui-input-block">
+                                <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectRecordsAlter.alterBeforeRecords.projectTypeId}" readonly="true">
+                                    <%--<form:option value=""/>
+                                    <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                                    <form:options items="${fns:getProjectType()}" itemLabel="typeName" itemValue="typeId" readonly="true"></form:options>
+                                </form:select>
+                            </div>
+                        </div>
                         <div class="layui-item layui-col-sm6 lw6">
                             <label class="layui-form-label">创建人:</label>
                             <div class="layui-input-block">
@@ -567,10 +722,10 @@
                                     <th width="25%">联系方式2</th>
                                 </tr>
                                 </thead>
-                                <tbody id="oldworkClientLinkmanList1">
+                                <tbody id="oldWorkClientLinkmanList">
                                 </tbody>
                             </table>
-                            <script type="text/template" id="workClientLinkmanTpl1">//<!--
+                            <script type="text/template" id="oldWorkClientLinkmanTpl">//<!--
 					<tr id="workClientLinkmanList{{idx}}">
 					<td class="hide">
 						<input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
@@ -593,7 +748,46 @@
                         </div>
                     </div>
 
-
+                        <%--建设方信息(start)--%>
+                    <div class="form-group layui-row">
+                        <div class="form-group-label"><h2>建设方信息</h2></div>
+                        <div class="layui-item layui-col-xs12 form-table-container" >
+                            <table id="oldContentBuild" class="table table-bordered table-condensed no-bottom-margin details">
+                                <thead>
+                                <tr>
+                                    <th class="hide"></th>
+                                    <th width="25%">建设方单位名称</th>
+                                    <th width="25%">联系人姓名</th>
+                                    <th width="25%">联系方式1</th>
+                                    <th width="25%">联系方式2</th>
+                                </tr>
+                                </thead>
+                                <tbody id="oldWorkBuildLinkmanList">
+                                </tbody>
+                            </table>
+                            <script type="text/template" id="oldWorkBuildLinkmanTpl">//<!--
+                                    <tr id="workBuildLinkmanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="workBuildLinkmanList{{idx}}_id" name="workBuildLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="workBuildLinkmanList{{idx}}_delFlag" name="workBuildLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    </td>
+                                    <td>
+                                        {{row.clientId.name}}
+                                    </td>
+                                    <td>
+                                        {{row.name }}
+                                    </td>
+                                    <td>
+                                        {{row.linkPhone}}
+                                    </td>
+                                    <td>
+                                        {{row.linkMobile}}
+                                    </td>
+                                </tr>//-->
+                            </script>
+                        </div>
+                    </div>
+                        <%--建设方信息(end)--%>
                     <div class="form-group layui-row">
                         <div class="form-group-label"><h2>施工方信息</h2></div>
                         <div class="layui-item layui-col-xs12 form-table-container" >
@@ -607,10 +801,10 @@
                                     <th width="25%">联系方式2</th>
                                 </tr>
                                 </thead>
-                                <tbody id="oldworkConstructionLinkmanList1">
+                                <tbody id="oldWorkConstructionLinkmanList">
                                 </tbody>
                             </table>
-                            <script type="text/template" id="workConstructionLinkmanTpl1">//<!--
+                            <script type="text/template" id="oldWorkConstructionLinkmanTpl">//<!--
 					<tr id="workConstructionLinkmanList{{idx}}">
 					<td class="hide">
 						<input id="workConstructionLinkmanList{{idx}}_id" name="workConstructionLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
@@ -632,20 +826,121 @@
                             </script>
                         </div>
                     </div>
-
+                        <%--监理方信息(start)--%>
+                    <div class="form-group layui-row">
+                        <div class="form-group-label"><h2>监理方信息</h2></div>
+                        <div class="layui-item layui-col-xs12 form-table-container" >
+                            <table id="oldContentSuper" class="table table-bordered table-condensed no-bottom-margin details">
+                                <thead>
+                                <tr>
+                                    <th class="hide"></th>
+                                    <th width="25%">监理方单位名称</th>
+                                    <th width="25%">联系人姓名</th>
+                                    <th width="25%">联系方式1</th>
+                                    <th width="25%">联系方式2</th>
+                                </tr>
+                                </thead>
+                                <tbody id="oldWorkSuperLinkmanList">
+                                </tbody>
+                            </table>
+                            <script type="text/template" id="oldWorkSuperLinkmanTpl">//<!--
+                                    <tr id="workSuperLinkmanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="workSuperLinkmanList{{idx}}_id" name="workSuperLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="workSuperLinkmanList{{idx}}_delFlag" name="workSuperLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    </td>
+                                    <td>
+                                        {{row.clientId.name}}
+                                    </td>
+                                    <td>
+                                        {{row.name }}
+                                    </td>
+                                    <td>
+                                        {{row.linkPhone}}
+                                    </td>
+                                    <td>
+                                        {{row.linkMobile}}
+                                    </td>
+                                </tr>//-->
+                            </script>
+                        </div>
+                    </div>
+                        <%--监理方信息(end)--%>
+                        <%--设计方信息(start)--%>
+                    <div class="form-group layui-row">
+                        <div class="form-group-label"><h2>设计方信息</h2></div>
+                        <div class="layui-item layui-col-xs12 form-table-container" >
+                            <table id="oldContentDesign" class="table table-bordered table-condensed no-bottom-margin details">
+                                <thead>
+                                <tr>
+                                    <th class="hide"></th>
+                                    <th width="25%">设计方单位名称</th>
+                                    <th width="25%">联系人姓名</th>
+                                    <th width="25%">联系方式1</th>
+                                    <th width="25%">联系方式2</th>
+                                </tr>
+                                </thead>
+                                <tbody id="oldWorkDesignLinkmanList">
+                                </tbody>
+                            </table>
+                            <script type="text/template" id="oldWorkDesignLinkmanTpl">//<!--
+                                    <tr id="workDesignLinkmanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="workDesignLinkmanList{{idx}}_id" name="workDesignLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="workDesignLinkmanList{{idx}}_delFlag" name="workDesignLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    </td>
+                                    <td>
+                                        {{row.clientId.name}}
+                                    </td>
+                                    <td>
+                                        {{row.name }}
+                                    </td>
+                                    <td>
+                                        {{row.linkPhone}}
+                                    </td>
+                                    <td>
+                                        {{row.linkMobile}}
+                                    </td>
+                                </tr>//-->
+                            </script>
+                        </div>
+                    </div>
+                        <%--设计方信息(end)--%>
                     <script>
-                        var workClientLinkmanRow1Idx = 0, workClientLinkmanTpl1 = $("#workClientLinkmanTpl1").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                        var workConstructionLinkmanRow1Idx = 0, workConstructionLinkmanTpl1 = $("#workConstructionLinkmanTpl1").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var oldWorkClientLinkmanRowIdx = 0, oldWorkClientLinkmanTpl = $("#oldWorkClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var oldWorkConstructionLinkmanRowIdx = 0, oldWorkConstructionLinkmanTpl = $("#oldWorkConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var oldWorkBuildLinkmanRowIdx = 0, oldWorkBuildLinkmanTpl = $("#oldWorkBuildLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var oldWorkSuperLinkmanRowIdx = 0, oldWorkSuperLinkmanTpl = $("#oldWorkSuperLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        var oldWorkDesignLinkmanRowIdx = 0, oldWorkDesignLinkmanTpl = $("#oldWorkDesignLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         $(document).ready(function() {
                             var data = ${fns:toJson(projectRecordsAlter.alterBeforeRecords.workClientLinkmanList)};
                             for (var i=0; i<data.length; i++){
-                                addRow('#oldworkClientLinkmanList1', workClientLinkmanRow1Idx, workClientLinkmanTpl1, data[i]);
-                                workClientLinkmanRow1Idx = workClientLinkmanRow1Idx + 1;
+                                addRow('#oldWorkClientLinkmanList', oldWorkClientLinkmanRowIdx, oldWorkClientLinkmanTpl, data[i]);
+                                oldWorkClientLinkmanRowIdx = oldWorkClientLinkmanRowIdx + 1;
                             }
                             var dataBank = ${fns:toJson(projectRecordsAlter.alterBeforeRecords.workConstructionLinkmanList)};
                             for (var i=0; i<dataBank.length; i++){
-                                addRow('#oldworkConstructionLinkmanList1', workConstructionLinkmanRow1Idx, workConstructionLinkmanTpl1, dataBank[i]);
-                                workConstructionLinkmanRow1Idx = workConstructionLinkmanRow1Idx + 1;
+                                addRow('#oldWorkConstructionLinkmanList', oldWorkConstructionLinkmanRowIdx, oldWorkConstructionLinkmanTpl, dataBank[i]);
+                                oldWorkConstructionLinkmanRowIdx = oldWorkConstructionLinkmanRowIdx + 1;
+                            }
+
+                            /*建设*/
+                            var dataBuild = ${fns:toJson(projectRecordsAlter.alterBeforeRecords.workBuildLinkmanList)};
+                            for (var i=0; i<dataBuild.length; i++){
+                                addRow('#oldWorkBuildLinkmanList', oldWorkBuildLinkmanRowIdx, oldWorkBuildLinkmanTpl, dataBuild[i]);
+                                oldWorkBuildLinkmanRowIdx = oldWorkBuildLinkmanRowIdx + 1;
+                            }
+                            /*监理*/
+                            var dataSuper = ${fns:toJson(projectRecordsAlter.alterBeforeRecords.workSuperLinkmanList)};
+                            for (var i=0; i<dataSuper.length; i++){
+                                addRow('#oldWorkSuperLinkmanList', oldWorkSuperLinkmanRowIdx, oldWorkSuperLinkmanTpl, dataSuper[i]);
+                                oldWorkSuperLinkmanRowIdx = oldWorkSuperLinkmanRowIdx + 1;
+                            }
+                            /*设计*/
+                            var dataDesign = ${fns:toJson(projectRecordsAlter.alterBeforeRecords.workDesignLinkmanList)};
+                            for (var i=0; i<dataDesign.length; i++){
+                                addRow('#oldWorkDesignLinkmanList', oldWorkDesignLinkmanRowIdx, oldWorkDesignLinkmanTpl, dataDesign[i]);
+                                oldWorkDesignLinkmanRowIdx = oldWorkDesignLinkmanRowIdx + 1;
                             }
                         });
 

+ 146 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -353,7 +353,7 @@
 				</div>
 			</div>
 
-
+			<%--委托方(start)--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>委托方联系人信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
@@ -392,6 +392,48 @@
 					</script>
 				</div>
 			</div>
+			<%--委托方(end)--%>
+			<%--建设方信息(start)--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>建设方信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="contentBuild" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th class="hide"></th>
+							<th width="25%">建设方单位名称</th>
+							<th width="25%">联系人姓名</th>
+							<th width="25%">联系方式1</th>
+							<th width="25%">联系方式2</th>
+						</tr>
+						</thead>
+						<tbody id="workBuildLinkmanList">
+						</tbody>
+					</table>
+					<script type="text/template" id="workBuildLinkmanTpl">//<!--
+					<tr id="workBuildLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workBuildLinkmanList{{idx}}_id" name="workBuildLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workBuildLinkmanList{{idx}}_delFlag" name="workBuildLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+					</script>
+				</div>
+			</div>
+			<%--建设方信息(end)--%>
+			<%--施工方(start)--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>施工方信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
@@ -430,6 +472,87 @@
 					</script>
 				</div>
 			</div>
+			<%--施工方(end)--%>
+			<%--监理方信息(start)--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>监理方信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="contentSuper" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th class="hide"></th>
+							<th width="25%">监理方单位名称</th>
+							<th width="25%">联系人姓名</th>
+							<th width="25%">联系方式1</th>
+							<th width="25%">联系方式2</th>
+						</tr>
+						</thead>
+						<tbody id="workSuperLinkmanList">
+						</tbody>
+					</table>
+					<script type="text/template" id="workSuperLinkmanTpl">//<!--
+					<tr id="workSuperLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workSuperLinkmanList{{idx}}_id" name="workSuperLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workSuperLinkmanList{{idx}}_delFlag" name="workSuperLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+					</script>
+				</div>
+			</div>
+			<%--监理方信息(end)--%>
+			<%--设计方信息(start)--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>设计方信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="contentDesign" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th class="hide"></th>
+							<th width="25%">设计方单位名称</th>
+							<th width="25%">联系人姓名</th>
+							<th width="25%">联系方式1</th>
+							<th width="25%">联系方式2</th>
+						</tr>
+						</thead>
+						<tbody id="workDesignLinkmanList">
+						</tbody>
+					</table>
+					<script type="text/template" id="workDesignLinkmanTpl">//<!--
+					<tr id="workDesignLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workDesignLinkmanList{{idx}}_id" name="workDesignLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workDesignLinkmanList{{idx}}_delFlag" name="workDesignLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+					</script>
+				</div>
+			</div>
+			<%--设计方信息(end)--%>
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
@@ -492,6 +615,9 @@
 			<script>
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+				var workBuildLinkmanRowIdx = 0, workBuildLinkmanTpl = $("#workBuildLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+				var workSuperLinkmanRowIdx = 0, workSuperLinkmanTpl = $("#workSuperLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+				var workDesignLinkmanRowIdx = 0, workDesignLinkmanTpl = $("#workDesignLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 $(document).ready(function() {
                     var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
                     for (var i=0; i<data.length; i++){
@@ -503,6 +629,25 @@
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
                     }
+
+					/*建设*/
+					var dataBuild = ${fns:toJson(projectRecords.workBuildLinkmanList)};
+					for (var i=0; i<dataBuild.length; i++){
+						addRow('#workBuildLinkmanList', workBuildLinkmanRowIdx, workBuildLinkmanTpl, dataBuild[i]);
+						workBuildLinkmanRowIdx = workBuildLinkmanRowIdx + 1;
+					}
+					/*监理*/
+					var dataSuper = ${fns:toJson(projectRecords.workSuperLinkmanList)};
+					for (var i=0; i<dataSuper.length; i++){
+						addRow('#workSuperLinkmanList', workSuperLinkmanRowIdx, workSuperLinkmanTpl, dataSuper[i]);
+						workSuperLinkmanRowIdx = workSuperLinkmanRowIdx + 1;
+					}
+					/*设计*/
+					var dataDesign = ${fns:toJson(projectRecords.workDesignLinkmanList)};
+					for (var i=0; i<dataDesign.length; i++){
+						addRow('#workDesignLinkmanList', workDesignLinkmanRowIdx, workDesignLinkmanTpl, dataDesign[i]);
+						workDesignLinkmanRowIdx = workDesignLinkmanRowIdx + 1;
+					}
                 });
 
 			</script>

+ 62 - 23
src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -334,6 +334,37 @@
             }
             return false;
         }
+        function existBuildLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workBuildLinkmanList'+i+'_id').val();
+                var cid = $('#workBuildLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        function existSuperLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workSuperLinkmanList'+i+'_id').val();
+                var cid = $('#workSuperLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
+        function existDesignLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workDesignLinkmanList'+i+'_id').val();
+                var cid = $('#workDesignLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
 
         function insertTitle(tValue){
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
@@ -378,8 +409,16 @@
         }
 
         function delRow(obj, prefix){
+            /*var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            $(obj).parent().parent().remove();*/
             var id = $(prefix+"_id");
             var delFlag = $(prefix+"_delFlag");
+            const clientId = $("#contractClientId").val();
+            if(id.val() === clientId){
+                parent.layer.msg('主委托方不允许删除',{icon:5});
+                return;
+            }
             $(obj).parent().parent().remove();
         }
         function formatNum(obj) {
@@ -637,7 +676,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目类型:</label>
                     <div class="layui-input-block">
-                        <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectTypeId}">
+                        <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectRecords.projectTypeId}">
                             <%--<form:option value=""/>
                             <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
                             <form:options items="${fns:getProjectType()}" itemLabel="typeName" itemValue="typeId"></form:options>
@@ -821,20 +860,20 @@
                 </td>
             </tr>//-->
                     </script>
-                    <script type="text/javascript">
-                        var workClientLinkmanRowIdx = 0,
-                            workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-                        $(document).ready(function () {
-                            var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
-                            if(data!=null && data.length() > 0){
-                                for (var i = 0; i < data.length; i++) {
-                                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                                    workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                        <%--<script type="text/javascript">
+                            var workClientLinkmanRowIdx = 0,
+                                workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+                            $(document).ready(function () {
+                                var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
+                                if(data!=null && data.length() > 0){
+                                    for (var i = 0; i < data.length; i++) {
+                                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                    }
                                 }
-                            }
-                        });
+                            });
 
-                    </script>
+                        </script>--%>
                 </div>
             </div>
 
@@ -881,7 +920,7 @@
 						{{row.linkMobile}}
 					</td>
 					<td class="text-center" width="10">
-						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workConstructionLinkmanList2{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workBuildLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
 					</td>
 				</tr>//-->
                     </script>
@@ -957,16 +996,16 @@
 				</tr>//-->
                     </script>
                     <script>
-                        var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        //var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         $(document).ready(function() {
-                            var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
+                            /*var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
                             if (data!=null) {
                                 for (var i = 0; i < data.length; i++) {
                                     addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
                                     workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
                                 }
-                            }
+                            }*/
                             var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
                             if (dataBank!=null) {
                                 for (var i = 0; i < dataBank.length; i++) {
@@ -1027,16 +1066,16 @@
 				</tr>//-->
                     </script>
                     <script>
-                        var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        //var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         var workSuperLinkmanRowIdx = 0, workSuperLinkmanTpl = $("#workSuperLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         $(document).ready(function() {
-                            var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
+                            /*var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
                             if (data!=null) {
                                 for (var i = 0; i < data.length; i++) {
                                     addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
                                     workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
                                 }
-                            }
+                            }*/
                             var dataSuper = ${fns:toJson(projectRecords.workSuperLinkmanList)};
                             if (dataSuper!=null) {
                                 for (var i = 0; i < dataSuper.length; i++) {
@@ -1098,16 +1137,16 @@
 				</tr>//-->
                     </script>
                     <script>
-                        var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        //var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         var workDesignLinkmanRowIdx = 0, workDesignLinkmanTpl = $("#workDesignLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         $(document).ready(function() {
-                            var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
+                            /*var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
                             if (data!=null) {
                                 for (var i = 0; i < data.length; i++) {
                                     addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
                                     workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
                                 }
-                            }
+                            }*/
                             var dataDesign = ${fns:toJson(projectRecords.workDesignLinkmanList)};
                             if (dataDesign!=null) {
                                 for (var i = 0; i < dataDesign.length; i++) {

+ 82 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -183,7 +183,48 @@
                 }
             }
         }
-		
+        /*施工单位*/
+        function setClientInfo(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workConstructionLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workConstructionLinkmanList",workConstructionLinkmanRowIdx,workConstructionLinkmanTpl,obj[i]);
+                    workConstructionLinkmanRowIdx=workConstructionLinkmanRowIdx+1;
+                }
+            }
+        }
+
+        /*建设单位*/
+        function setClientBuild(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workBuildLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workBuildLinkmanList",workBuildLinkmanRowIdx,workBuildLinkmanTpl,obj[i]);
+                    workBuildLinkmanRowIdx=workBuildLinkmanRowIdx+1;
+                }
+            }
+        }
+
+        /*监理单位*/
+        function setClientSuper(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workSuperLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workSuperLinkmanList",workSuperLinkmanRowIdx,workSuperLinkmanTpl,obj[i]);
+                    workSuperLinkmanRowIdx=workSuperLinkmanRowIdx+1;
+                }
+            }
+        }
+        /*设计单位*/
+        function setClientDesign(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workDesignLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workDesignLinkmanList",workDesignLinkmanRowIdx,workDesignLinkmanTpl,obj[i]);
+                    workDesignLinkmanRowIdx=workDesignLinkmanRowIdx+1;
+                }
+            }
+        }
         function existConstructionLinkman(obj,length) {
             for (var i=0;i<length;i++) {
                 var val = $('#workConstructionLinkmanList'+i+'_id').val();
@@ -194,7 +235,37 @@
             }
             return false;
         }
+        function existBuildLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workBuildLinkmanList'+i+'_id').val();
+                var cid = $('#workBuildLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
 
+        function existSuperLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workSuperLinkmanList'+i+'_id').val();
+                var cid = $('#workSuperLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
+        function existDesignLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workDesignLinkmanList'+i+'_id').val();
+                var cid = $('#workDesignLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
         function insertTitle(tValue){
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = $("#id").val();
@@ -389,6 +460,16 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">项目类型:</label>
+                    <div class="layui-input-block">
+                        <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectRecords.projectTypeId}">
+                            <%--<form:option value=""/>
+                            <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                            <form:options items="${fns:getProjectType()}" itemLabel="typeName" itemValue="typeId"></form:options>
+                        </form:select>
+                    </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"/>

+ 147 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp

@@ -307,7 +307,7 @@
 					</div>
 				</div>
 			</div>
-
+			<%--委托方信息(start)--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>委托方联系人信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
@@ -346,7 +346,49 @@
 					</script>
 				</div>
 			</div>
+			<%--委托方信息(end)--%>
+			<%--建设方信息(start)--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>建设方信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="contentBuild" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th class="hide"></th>
+							<th width="25%">建设方单位名称</th>
+							<th width="25%">联系人姓名</th>
+							<th width="25%">联系方式1</th>
+							<th width="25%">联系方式2</th>
+						</tr>
+						</thead>
+						<tbody id="workBuildLinkmanList">
+						</tbody>
+					</table>
+					<script type="text/template" id="workBuildLinkmanTpl">//<!--
+					<tr id="workBuildLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workBuildLinkmanList{{idx}}_id" name="workBuildLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workBuildLinkmanList{{idx}}_delFlag" name="workBuildLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+					</script>
+				</div>
+			</div>
+			<%--建设方信息(end)--%>
 
+			<%--施工方信息(start)--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>施工方信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
@@ -385,6 +427,87 @@
 					</script>
 				</div>
 			</div>
+			<%--施工方信息(end)--%>
+			<%--监理方信息(start)--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>监理方信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="contentSuper" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th class="hide"></th>
+							<th width="25%">监理方单位名称</th>
+							<th width="25%">联系人姓名</th>
+							<th width="25%">联系方式1</th>
+							<th width="25%">联系方式2</th>
+						</tr>
+						</thead>
+						<tbody id="workSuperLinkmanList">
+						</tbody>
+					</table>
+					<script type="text/template" id="workSuperLinkmanTpl">//<!--
+					<tr id="workSuperLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workSuperLinkmanList{{idx}}_id" name="workSuperLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workSuperLinkmanList{{idx}}_delFlag" name="workSuperLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+					</script>
+				</div>
+			</div>
+			<%--监理方信息(end)--%>
+			<%--设计方信息(start)--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>设计方信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="contentDesign" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th class="hide"></th>
+							<th width="25%">设计方单位名称</th>
+							<th width="25%">联系人姓名</th>
+							<th width="25%">联系方式1</th>
+							<th width="25%">联系方式2</th>
+						</tr>
+						</thead>
+						<tbody id="workDesignLinkmanList">
+						</tbody>
+					</table>
+					<script type="text/template" id="workDesignLinkmanTpl">//<!--
+					<tr id="workDesignLinkmanList{{idx}}">
+					<td class="hide">
+						<input id="workDesignLinkmanList{{idx}}_id" name="workDesignLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="workDesignLinkmanList{{idx}}_delFlag" name="workDesignLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+					</td>
+					<td>
+						{{row.clientId.name}}
+					</td>
+					<td>
+						{{row.name }}
+					</td>
+					<td>
+						{{row.linkPhone}}
+					</td>
+					<td>
+						{{row.linkMobile}}
+					</td>
+				</tr>//-->
+					</script>
+				</div>
+			</div>
+			<%--设计方信息(end)--%>
 
 			<c:if test="${not empty projectRecords.workAttachments}">
 			<div class="form-group layui-row">
@@ -438,17 +561,40 @@
 			<script>
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+				var workBuildLinkmanRowIdx = 0, workBuildLinkmanTpl = $("#workBuildLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+				var workSuperLinkmanRowIdx = 0, workSuperLinkmanTpl = $("#workSuperLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+				var workDesignLinkmanRowIdx = 0, workDesignLinkmanTpl = $("#workDesignLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 $(document).ready(function() {
+                	/*委托*/
                     var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
                     for (var i=0; i<data.length; i++){
                         addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
                         workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
                     }
+					/*施工*/
                     var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
                     for (var i=0; i<dataBank.length; i++){
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
                     }
+					/*建设*/
+					var dataBuild = ${fns:toJson(projectRecords.workBuildLinkmanList)};
+					for (var i=0; i<dataBuild.length; i++){
+						addRow('#workBuildLinkmanList', workBuildLinkmanRowIdx, workBuildLinkmanTpl, dataBuild[i]);
+						workBuildLinkmanRowIdx = workBuildLinkmanRowIdx + 1;
+					}
+					/*监理*/
+					var dataSuper = ${fns:toJson(projectRecords.workSuperLinkmanList)};
+					for (var i=0; i<dataSuper.length; i++){
+						addRow('#workSuperLinkmanList', workSuperLinkmanRowIdx, workSuperLinkmanTpl, dataSuper[i]);
+						workSuperLinkmanRowIdx = workSuperLinkmanRowIdx + 1;
+					}
+					/*设计*/
+					var dataDesign = ${fns:toJson(projectRecords.workDesignLinkmanList)};
+					for (var i=0; i<dataDesign.length; i++){
+						addRow('#workDesignLinkmanList', workDesignLinkmanRowIdx, workDesignLinkmanTpl, dataDesign[i]);
+						workDesignLinkmanRowIdx = workDesignLinkmanRowIdx + 1;
+					}
                 });
 
 			</script>

+ 25 - 1
src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -187,10 +187,33 @@
                     }
                 });
                 }
-
             )
             <%--var arr="${workClientInfo.clientType}".split(',');--%>
             // $('#clientType').selectpicker('val',arr);
+
+            /*新增代码传送统一社会信用代码*/
+            $("#uscCode").on("change",function(){
+                    var id = $("#id").val();
+                    var name = $("#name").val();
+                    var uscCode = $("#uscCode").val();
+                    $.ajax({
+                        url:"${ctx}/workclientinfo/workClientInfo/checkClientUscCode",
+                        type:"post",
+                        data:{"id":id,
+                            "name":name,
+                            "uscCode":uscCode},
+                        success:function(data){
+                            if(data.code==="false"){
+                                exitName=false
+                                $("#uscPh").html("该客户已存在");
+                            }else {
+                                exitName=true
+                                $("#uscPh").html('');
+                            }
+                        }
+                    });
+                }
+            )
            dismissDiv();
 
         });
@@ -445,6 +468,7 @@
                     <div class="layui-input-block">
                         <form:input path="uscCode" htmlEscape="false" id="uscCode" class="form-control required isUscCode layui-input"/>
                         <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
+                        <span id="uscPh" style="color:#cc5965"></span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">