Merge remote-tracking branch 'origin/master'

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

@@ -141,6 +141,11 @@ public class RuralProjectRecordChooseCheckAllController extends BaseController {
         if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = service.get(projectRecords.getId());
             ruralProjectRecordsService.queryProjectDetail(projectRecords);
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
             ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
             projectPlanInfo.setProjectId(projectRecords.getId());
             //获取项目计划信息
@@ -312,6 +317,11 @@ public class RuralProjectRecordChooseCheckAllController extends BaseController {
         List<User> auditUserList = userService.getAuditUserList();
         projectRecords.setBzshbUserList(auditUserList);
         ruralProjectRecordsService.queryProjectDetail(projectRecords);
+        if(null != projectRecords.getWorkContractInfo()){
+            if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+            }
+        }
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/check/all/ruralProjectRecordsAllModify";
     }

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

@@ -141,6 +141,11 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
         if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = service.get(projectRecords.getId());
             ruralProjectRecordsService.queryProjectDetail(projectRecords);
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
             ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
             projectPlanInfo.setProjectId(projectRecords.getId());
             //获取项目计划信息
@@ -312,6 +317,11 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
         List<User> auditUserList = userService.getAuditUserList();
         projectRecords.setBzshbUserList(auditUserList);
         ruralProjectRecordsService.queryProjectDetail(projectRecords);
+        if(null != projectRecords.getWorkContractInfo()){
+            if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+            }
+        }
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/check/ruralProjectRecordsModify";
     }

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1380,6 +1380,11 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 					ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getCheckProcessInstanceId()));
 					ruralProjectRecords.setHome("home");
+					if(null != ruralProjectRecords.getWorkContractInfo()){
+						if(null != ruralProjectRecords.getWorkContractInfo().getContractTypeDoc()){
+							ruralProjectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(ruralProjectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+						}
+					}
 					model.addAttribute("processInstanceId", ruralProjectRecords.getCheckProcessInstanceId());
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					//处理项目类别

src/main/webapp/static/layer-v2.3/layim/demo/index.html

@@ -25,9 +25,9 @@ if(!/^http(s*):\/\//.test(location.href)){
 
 layui.use('layim', function(layim){
 
-  
+
   var autoReplay = [
-    '您好，我现在有事不在，一会再和您联系。', 
+    '您好，我现在有事不在，一会再和您联系。',
     '你没发错吧？face[微笑] ',
     '洗澡中，请勿打扰，偷窥请购票，个体四十，团体八折，订票电话：一般人我不告诉他！face[哈哈] ',
     '你好，我是主人的美女秘书，有什么事就跟我说吧，等他回来我会转告他的。face[心] face[心] face[心] ',
@@ -37,7 +37,7 @@ layui.use('layim', function(layim){
     'face[黑线]  你慢慢说，别急……',
     '(*^__^*) face[嘻嘻] ，是贤心吗？'
   ];
-  
+
   //基础配置
   layim.config({
 
@@ -55,7 +55,7 @@ layui.use('layim', function(layim){
       url: './json/getMembers.json'
       ,data: {}
     }
-    
+
     ,uploadImage: {
       url: '' //（返回的数据格式见下文）
       ,type: '' //默认post
@@ -65,7 +65,7 @@ layui.use('layim', function(layim){
       url: '' //（返回的数据格式见下文）
       ,type: '' //默认post
     }
-    
+
     //,skin: ['aaa.jpg'] //新增皮肤
     //,isfriend: false //是否开启好友
     //,isgroup: false //是否开启群组
@@ -94,7 +94,7 @@ layui.use('layim', function(layim){
   layim.on('sendMessage', function(data){
     var To = data.to;
     console.log(data);
-    
+
     //发送消息倒Socket服务
     /*
     socket.send({
@@ -132,9 +132,8 @@ layui.use('layim', function(layim){
   layim.on('online', function(data){
     console.log(data);
   });
-   
-  
-  
+
+
   //监听收到的聊天消息
   /*
   socket.on('chatMessage', function (res) {
@@ -150,7 +149,7 @@ layui.use('layim', function(layim){
 
   //layim建立就绪
   layim.on('ready', function(res){
-  
+
     //添加好友（如果检测到该socket）
     layim.addList({
       type: 'group'
@@ -167,7 +166,7 @@ layui.use('layim', function(layim){
       ,id: "1233333312121212"
       ,remark: "本人冲田杏梨将结束AV女优的工作"
     });
-    
+
     //接受消息（如果检测到该socket）
     setTimeout(function(){
       //不在好友列表，则为临时会话
@@ -195,13 +194,13 @@ layui.use('layim', function(layim){
   layim.on('members', function(data){
     console.log(data);
   });
-  
+
   //监听聊天窗口的切换
   layim.on('chatChange', function(data){
     console.log(data);
   });
-  
-  
+
+
 
 });
 

src/main/webapp/webpage/modules/iim/chatHistoryList.jsp

@@ -6,10 +6,10 @@
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
 		$(document).ready(function() {
-			laydate({
+			/*laydate({
 	            elem: '#createDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 	            event: 'focus' //响应事件。如果没有传入event，则按照默认的click
-	        });
+	        });*/
 		});
 	   function search(){//查询，页码清零
 			$("#pageNo").val(0);

src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllForm.jsp

@@ -98,9 +98,9 @@
 				</div>
 				<div id="divv3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
 						</div>
 					</div>
 				</div>
@@ -216,7 +216,7 @@
 				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label">选查要求：</label>
 					<div class="layui-input-block">
-						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
+						<form:textarea path="checkRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control"/>
 					</div>
 				</div>
 			</div>
@@ -235,6 +235,22 @@
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
+							<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+								<tr>
+									<td >
+											${info.clientId.name}
+									</td>
+									<td>
+											${info.name}
+									</td>
+									<td>
+											${info.linkPhone}
+									</td>
+									<td>
+											${info.linkMobile}
+									</td>
+								</tr>
+							</c:forEach>
 						</tbody>
 					</table>
 				</div>
@@ -254,6 +270,22 @@
 						</tr>
 						</thead>
 						<tbody id="workConstructionLinkmanList">
+							<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+								<tr>
+									<td >
+											${info.clientId.name}
+									</td>
+									<td>
+											${info.name}
+									</td>
+									<td>
+											${info.linkPhone}
+									</td>
+									<td>
+											${info.linkMobile}
+									</td>
+								</tr>
+							</c:forEach>
 						</tbody>
 					</table>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllModify.jsp

@@ -132,9 +132,9 @@
                 </div>
                 <div id="divv3">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">工程分类：</label>
+                        <label class="layui-form-label">合同类型：</label>
                         <div class="layui-input-block">
-                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
                         </div>
                     </div>
                 </div>
@@ -286,6 +286,16 @@
                 </div>
             </div>
 
+            <div class="form-group layui-row first">
+                <div class="form-group-label"><h2>选查要求</h2></div>
+                <div class="layui-item layui-col-sm12 lw6 with-textarea">
+                    <label class="layui-form-label">选查要求：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="checkRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control"/>
+                    </div>
+                </div>
+            </div>
+
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>委托方联系人信息</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
@@ -300,6 +310,22 @@
                         </tr>
                         </thead>
                         <tbody id="workClientLinkmanList">
+                        <c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+                            <tr>
+                                <td >
+                                        ${info.clientId.name}
+                                </td>
+                                <td>
+                                        ${info.name}
+                                </td>
+                                <td>
+                                        ${info.linkPhone}
+                                </td>
+                                <td>
+                                        ${info.linkMobile}
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
                 </div>
@@ -319,6 +345,22 @@
                         </tr>
                         </thead>
                         <tbody id="workConstructionLinkmanList">
+                        <c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+                            <tr>
+                                <td >
+                                        ${info.clientId.name}
+                                </td>
+                                <td>
+                                        ${info.name}
+                                </td>
+                                <td>
+                                        ${info.linkPhone}
+                                </td>
+                                <td>
+                                        ${info.linkMobile}
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
                 </div>

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

@@ -163,9 +163,9 @@
 				</div>
 				<div id="div3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
 						</div>
 					</div>
 				</div>
@@ -318,6 +318,16 @@
 				</div>
 			</div>
 
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>选查要求</h2></div>
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
+					<label class="layui-form-label">选查要求：</label>
+					<div class="layui-input-block">
+						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.checkRemarks}</textarea>
+					</div>
+				</div>
+			</div>
+
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>委托方联系人信息</h2></div>
@@ -333,6 +343,22 @@
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
+						<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>
@@ -351,6 +377,22 @@
 						</tr>
 						</thead>
 						<tbody id="workConstructionLinkmanList">
+						<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsDownAudit.jsp

@@ -177,9 +177,9 @@
 				</div>
 				<div id="div3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
 						</div>
 					</div>
 				</div>
@@ -275,18 +275,6 @@
 						</div>
 					</c:otherwise>
 				</c:choose>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false" id="fileNum" name="fileNum"  class="form-control layui-input" value="${projectRecords.fileNum}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
-					<div class="layui-input-block">
-						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum" value="${projectRecords.fileNumTow}"/>
-					</div>
-				</div>
 
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所属部门：</label>
@@ -344,6 +332,16 @@
 				</div>
 			</div>
 
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>选查要求</h2></div>
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
+					<label class="layui-form-label">选查要求：</label>
+					<div class="layui-input-block">
+						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.checkRemarks}</textarea>
+					</div>
+				</div>
+			</div>
+
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>委托方联系人信息</h2></div>
@@ -359,6 +357,22 @@
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
+						<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>
@@ -377,6 +391,22 @@
 						</tr>
 						</thead>
 						<tbody id="workConstructionLinkmanList">
+						<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>
@@ -431,6 +461,21 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>提交说明</h2></div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" id="fileNum" name="fileNum"  class="form-control layui-input" value="${projectRecords.fileNum}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
+					<div class="layui-input-block">
+						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum" value="${projectRecords.fileNumTow}"/>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>提交说明</h2></div>
 				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label">提交说明：</label>
 					<div class="layui-input-block">

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

@@ -98,9 +98,9 @@
 				</div>
 				<div id="divv3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
 						</div>
 					</div>
 				</div>
@@ -247,6 +247,22 @@
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
+						<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>
@@ -266,6 +282,22 @@
 						</tr>
 						</thead>
 						<tbody id="workConstructionLinkmanList">
+						<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>

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

@@ -132,9 +132,9 @@
                 </div>
                 <div id="divv3">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">工程分类：</label>
+                        <label class="layui-form-label">合同类习惯：</label>
                         <div class="layui-input-block">
-                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
                         </div>
                     </div>
                 </div>
@@ -286,6 +286,16 @@
                 </div>
             </div>
 
+            <div class="form-group layui-row first">
+                <div class="form-group-label"><h2>选查要求</h2></div>
+                <div class="layui-item layui-col-sm12 lw6 with-textarea">
+                    <label class="layui-form-label">选查要求：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="checkRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control"/>
+                    </div>
+                </div>
+            </div>
+
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>委托方联系人信息</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
@@ -300,6 +310,22 @@
                         </tr>
                         </thead>
                         <tbody id="workClientLinkmanList">
+                        <c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+                            <tr>
+                                <td >
+                                        ${info.clientId.name}
+                                </td>
+                                <td>
+                                        ${info.name}
+                                </td>
+                                <td>
+                                        ${info.linkPhone}
+                                </td>
+                                <td>
+                                        ${info.linkMobile}
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
                 </div>
@@ -319,6 +345,22 @@
                         </tr>
                         </thead>
                         <tbody id="workConstructionLinkmanList">
+                        <c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+                            <tr>
+                                <td >
+                                        ${info.clientId.name}
+                                </td>
+                                <td>
+                                        ${info.name}
+                                </td>
+                                <td>
+                                        ${info.linkPhone}
+                                </td>
+                                <td>
+                                        ${info.linkMobile}
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
                 </div>

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

@@ -121,7 +121,7 @@
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${fns:getMainDictLabel(ruralProjectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
 						</div>
 					</div>
 				</div>
@@ -376,28 +376,24 @@
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
+						<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
-					<script type="text/template" id="workClientLinkmanTpl">//<!--
-					<tr id="workClientLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{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>
 
@@ -415,28 +411,24 @@
 						</tr>
 						</thead>
 						<tbody id="workConstructionLinkmanList">
+						<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</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>//-->
-					</script>
 				</div>
 			</div>