标识类型传送

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

@@ -108,10 +108,13 @@ public class WorkClientInfoController extends BaseController {
 		return "modules/workclientinfo/workClientInfoForm";
 	}
 
+	//二次进行增加联系人类型
 	@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
 	@RequestMapping(value = "type")
-	public String type(WorkClientInfo workClientInfo, Model model) {
+	public String type(WorkClientInfo workClientInfo, Model model,String linkType) {
 		model.addAttribute("workClientInfo", workClientInfo);
+		model.addAttribute("linkType",linkType);
+		System.out.println("-----"+linkType);
 		return "modules/workclientinfo/workClientInfoFormType";
 	}
 
@@ -121,7 +124,7 @@ public class WorkClientInfoController extends BaseController {
 	@RequestMapping(value = "formType")
 	public String formType(WorkClientInfo workClientInfo,String param, Model model) {
 		model.addAttribute("workClientInfo", workClientInfo);
-		model.addAttribute("type",param);
+		model.addAttribute("linkType",param);
 		return "modules/workclientinfo/workClientTypeForm";
 	}
     /**

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

@@ -869,6 +869,7 @@
                         <tr>
                             <th class="hide"></th>
                             <th width="20%"><font color="red">*</font>委托方</th>
+                            <th width="20%">统一社会信用代码</th>
                             <th width="20%">联系人姓名</th>
                             <th width="20%">联系方式1</th>
                             <th width="20%">联系方式2</th>
@@ -888,7 +889,9 @@
                 <td>
                     <input readonly="true" id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
                 </td>
-
+                <td>
+                    <input readonly="true" id="workClientLinkmanList{{idx}}_clientUscCode" name="workClientLinkmanList[{{idx}}].clientId.UscCode" type="text" value="{{row.clientId.UscCode}}"    class="form-control "/>
+                </td>
 
                 <td>
                     <input readonly="true" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
@@ -929,7 +932,6 @@
                     <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 nav-btns" style="float:left; margin-top: -39px;margin-left: 155px;" >
                     <a href="javascript:void(0)"
@@ -1089,7 +1091,7 @@
                 </div>
                 <div class="layui-item nav-btns" style="float:left; margin-top: -39px;margin-left: 155px;">
                     <a href="javascript:void(0)"
-                       onclick="openBuild('新增监理方', '${ctx}/workclientinfo/workClientInfo/formType?param=2','95%','95%',false,'inputForm')"
+                       onclick="openBuild('新增监理方', '${ctx}/workclientinfo/workClientInfo/formType?param=4','95%','95%',false,'inputForm')"
                        class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增监理方</a>
                 </div>
                 <div class="layui-item layui-col-xs12 form-table-container">

src/main/webapp/webpage/modules/sys/gridselect1.jsp

@@ -33,7 +33,8 @@
                 var label2 = $(this).parent().parent().parent().find(".codelabel2").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
-                var data= {'id':id,'name':label,'linkPhone':label1,'linkMobile':label2,'clientId':{'id':label4,'name':label3}};
+                var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
+                var data= {'id':id,'name':label,'linkPhone':label1,'linkMobile':label2,'clientId':{'id':label4,'name':label3,'uscCode':label5}};
                 arr.push(data);
 			})
             return arr;
@@ -88,7 +89,8 @@
 						<tr>
 							<th width="50"><input type="checkbox" class="i-checks"></th>
 								<th style="display:none">委托方编号</th>
-								<th>委托方</th>
+								<th width="25%">委托方</th>
+								<th width="25%">统一社会信用代码</th>
 								<th width="25%">联系人</th>
 								<th width="25%">联系电话</th>
 								<th width="25%">手机号</th>
@@ -102,6 +104,8 @@
 							<td> <input type="checkbox" id="${fns:getValue(obj, 'id')}" class="i-checks"></td>
 							<td title="${obj.clientId.id}" class="codelabel4" style="display:none">${obj.clientId.id}</td>
 							<td title="${obj.clientId.name}" class="codelabel3">${obj.clientId.name}</td>
+							<%--<td title="${obj.clientId.uscCode}" class="codelabel5">${obj.clientId.uscCode}</td>--%>
+							<td title="${fns:getValue(obj, 'uscCode')}" class="codelabel5">${fns:getValue(obj, 'uscCode')}</td>
 							<c:forEach items="${labelValues}" var="value"  varStatus="status">
 								<c:if test="${status.first==true}">
 									<td title="${fns:getValue(obj, value)}" class="codelabel">${fns:getValue(obj, value)}</td>

src/main/webapp/webpage/modules/sys/gridselectClientSuper.jsp

@@ -31,7 +31,8 @@
                 var label2 = $(this).parent().parent().parent().find(".codelabel2").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
-                var data=  {'clientId':{'id':label,'name':label4},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
+                var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
+                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
                 arr.push(data);
 			})
             return arr;

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormType.jsp

@@ -415,6 +415,7 @@
                    method="post" class="form-horizontal">
             <form:hidden path="id"/>
             <input type="hidden" id="jobTypeStr" name="jobTypeStr" value="">
+            <input type="hidden" id="linkType" name="jobTypeStr" value="${linkType}">
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>基本信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/workclientinfo/workClientTypeForm.jsp

@@ -208,19 +208,15 @@
                                 exitName=false
                                /* $("#uscPh").html("该客户已存在");*/
                                 console.log(data);
-                                /*if (confirm('该客户已存在是否进添加行联系人的类型')){
-                                    var typeId=data.workClientInfo.id;
-                                    window.location.href="${ctx}/workclientinfo/workClientInfo/type?id="+typeId+"&param=1";
 
-                                }else{
-                                    alert('no');
-                                }*/
                                 layer.confirm('该客户已存在是否进行添加行联系人的类型？', {
                                     btn: ['确定', '取消'] //可以无限个按钮
 
                                 }, function(index, layero){
+                                    var linkType=${linkType};
+                                    console.log("---------"+linkType);
                                     var typeId=data.workClientInfo.id;
-                                    window.location.href="${ctx}/workclientinfo/workClientInfo/type?id="+typeId+"&param=1";
+                                    window.location.href="${ctx}/workclientinfo/workClientInfo/type?id="+typeId+"&param=1&linkType="+linkType;
 
                                 }, function(index){
                                     return "false";
@@ -446,6 +442,7 @@
                    method="post" class="form-horizontal">
             <form:hidden path="id"/>
             <input type="hidden" id="jobTypeStr" name="jobTypeStr" value="">
+            <input type="hidden" id="linkType" name="jobTypeStr" value="${linkType}">
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>基本信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw7">