Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -204,7 +204,15 @@ public class WorkClientInfoController extends BaseController {
 		}else{//新增表单保存
 			workClientInfoService.save(workClientInfo);//保存
 		}
-		map.put("workLinkList",workClientInfo.getWorkClientLinkmanList());
+		//map.put("workLinkList",workClientInfo.getWorkClientLinkmanList());
+		WorkClientLinkman linkman = workClientInfo.getWorkClientLinkmanList().get(0);
+		map.put("id",linkman.getId());
+		map.put("clientId",workClientInfo.getId());
+		map.put("clientName",workClientInfo.getName());
+		map.put("uscCode",linkman.getUscCode());
+		map.put("linkName",linkman.getName());
+		map.put("linkMobile",linkman.getLinkMobile());
+		map.put("linkPhone",linkman.getLinkPhone());
 		addMessage(redirectAttributes, "保存客户管理成功");
 
 		//return "redirect:"+Global.getAdminPath()+"/workclientinfo/workClientInfo/?repage";

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -542,8 +542,8 @@
                             parent.layer.msg("保存客户信息异常!",{icon:2});
                             return false;
                         }
-
-                        /*addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);
+                        console.log("-------集合"+d);
+                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);
                         workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
                         var row = workClientLinkmanRowIdx - 1 ;
 
@@ -552,11 +552,11 @@
                         $("#"+"workClientLinkmanList"+row+"_clientName").val(d.clientName);
                         $("#"+"workClientLinkmanList"+row+"_name").val(d.linkName);
                         $("#"+"workClientLinkmanList"+row+"_linkMobile").val(d.linkMobile);
-                        $("#"+"workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone)*/
-                        /*if(isMasterClient){
+                        $("#"+"workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone)
+                        if(isMasterClient){
                             $("#contractClientName").val(d.clientName);
                             isMasterClient = false;
-                        }*/
+                        }
                         parent.layer.msg(d.str,{icon:1});
                         top.layer.close(index)
                     }