Przeglądaj źródła

项目类型中单位类型根据统一代码类型的添加到各个单位

user7 5 lat temu
rodzic
commit
28ed7f7cdf

+ 1 - 1
src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -718,7 +718,7 @@ public class ProjectRecordsController extends BaseController {
 			map.put("id", linkman.getId());
 			map.put("clientId", workClientInfo.getId());
 			map.put("clientName", workClientInfo.getName());
-			map.put("cname",workClientInfo.getUscCode());
+			map.put("uscCode",workClientInfo.getUscCode());
 			map.put("linkName", linkman.getName());
 			map.put("linkMobile", linkman.getLinkMobile());
 			map.put("linkPhone", linkman.getLinkPhone());

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

@@ -732,7 +732,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         List<Map> jopType=workClientInfoDao.getJopType(work);
         String types=new String();
         for(Map mapTypes:jopType){
-            types+=mapTypes.get("jobTypeId");
+            types+=mapTypes.get("getJobTypeById");
         }
         work.setJobTypeStr(types);
         return work;

+ 50 - 21
src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -19,6 +19,7 @@ import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -45,10 +46,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
 import java.io.*;
 import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 客户管理Controller
@@ -105,7 +103,18 @@ public class WorkClientInfoController extends BaseController {
 	@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(WorkClientInfo workClientInfo, Model model) {
+		if(StringUtils.isBlank(workClientInfo.getId())){
+			WorkClientInfo workClientInfo1=new WorkClientInfo();
+			Area area=new Area();
+			area.setId("9AF3266E03384019BFE935DD9F35332F");
+			area.setName("南京");
+			workClientInfo1.setArea(area);
+			model.addAttribute("workClientInfo", workClientInfo1);
+			return "modules/workclientinfo/workClientInfoForm";
+		}
+
 		model.addAttribute("workClientInfo", workClientInfo);
+
 		return "modules/workclientinfo/workClientInfoForm";
 	}
 
@@ -120,17 +129,17 @@ public class WorkClientInfoController extends BaseController {
 	}
 
 	//二次进行增加联系人类型
-	/*@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
-	@RequestMapping(value = "type")
-	public String type(WorkClientInfo workClientInfo, Model model,String linkType) {
+	@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
+	@RequestMapping(value = "fType")
+	public String fType(WorkClientInfo workClientInfo, Model model,String linkType) {
 		model.addAttribute("workClientInfo", workClientInfo);
 		model.addAttribute("linkType",linkType);
 		System.out.println("-----"+linkType);
 		return "modules/workclientinfo/workClientInfoFormType";
-	}*/
+	}
 
 	//二次进行增加联系人类型
-	@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
+	/*@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
 	@RequestMapping(value = "type")
 	public Object type(WorkClientInfo workClientInfo, Model model,String linkType) {
 		model.addAttribute("workClientInfo", workClientInfo);
@@ -159,13 +168,14 @@ public class WorkClientInfoController extends BaseController {
 		System.out.println("-----"+linkType);
 		Map<String,Object> map = new HashMap<>();
 		return map;
-	}
+	}*/
 	//直接进行增加联系人类型
-	@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
+	//@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
+	@ResponseBody
 	@RequestMapping(value = "typeAdd")
-	public String typeAdd(WorkClientInfo workClientInfo, Model model,String linkType) {
-		model.addAttribute("workClientInfo", workClientInfo);
-		model.addAttribute("linkType",linkType);
+	public Map typeAdd(WorkClientInfo workClientInfo, Model model,String linkType) {
+		/*model.addAttribute("workClientInfo", workClientInfo);
+		model.addAttribute("linkType",linkType);*/
 		WorkClientLinkman linkman = workClientInfo.getWorkClientLinkmanList().get(0);
 		Map<String,Object> map = new HashMap<>();
 		map.put("id",linkman.getId());//联系人id
@@ -175,13 +185,12 @@ public class WorkClientInfoController extends BaseController {
 		map.put("linkName",linkman.getName());
 		map.put("linkMobile",linkman.getLinkMobile());
 		map.put("linkPhone",linkman.getLinkPhone());
-		//统一信用代码添加到WorkClientLinkman的统一信用代码里面
+		/*//统一信用代码添加到WorkClientLinkman的统一信用代码里面
 		if(workClientInfo.getWorkClientLinkmanList().size()>0){
 			for( int i=0;i<workClientInfo.getWorkClientLinkmanList().size();i++){
 				workClientInfo.getWorkClientLinkmanList().get(i).setUscCode(workClientInfo.getUscCode());
 				workClientInfo.getWorkClientLinkmanList().get(i).getClientId().setUscCode(workClientInfo.getUscCode());
 			}
-
 		}
 
 		ProjectRecords projectRecords=new ProjectRecords();
@@ -196,11 +205,12 @@ public class WorkClientInfoController extends BaseController {
 		}else if("5".equals(linkType)){
 			projectRecords.setWorkDesignLinkmanList(workClientInfo.getWorkClientLinkmanList());
 		}
-		model.addAttribute(projectRecords);
-		map.put("str","新增客户信息成功!");
-		System.out.println("-----"+linkType);
-		return "modules/projectrecord/projectRecordsForm";
+		model.addAttribute(projectRecords);*/
+
+
+		//return "modules/projectrecord/projectRecordsForm";
 		/*return "redirect:"+Global.getAdminPath()+"/modules/projectrecord/projectRecordsForm/?repage";*/
+		return map;
 	}
 
 	/**
@@ -208,6 +218,13 @@ public class WorkClientInfoController extends BaseController {
 	 */
 	@RequestMapping(value = "formType")
 	public String formType(WorkClientInfo workClientInfo,String param, Model model) {
+		if(StringUtils.isBlank(workClientInfo.getId())){
+
+			Area area=new Area();
+			area.setId("9AF3266E03384019BFE935DD9F35332F");
+			area.setName("南京");
+			workClientInfo.setArea(area);
+		}
 		model.addAttribute("workClientInfo", workClientInfo);
 		model.addAttribute("linkType",param);
 		return "modules/workclientinfo/workClientTypeForm";
@@ -280,6 +297,17 @@ public class WorkClientInfoController extends BaseController {
 //		workClientAttachments.addAll(workClientAttachmentList);
 //		workClientInfo.setWorkClientAttachmentList(workClientAttachments);
 		Map<String,Object> map = new HashMap<>();
+
+		String [] jobStr=workClientInfo.getJobTypeStr().split(",");
+		Set<String> setType=new HashSet<>();
+		for(String str:jobStr){
+			setType.add(str);
+		}
+
+		String str = StringUtils.join(setType.toArray(), ",");
+
+		workClientInfo.setJobTypeStr(str);
+
 		//保存当前人的公司
 		workClientInfo.setCompanyId(UserUtils.getSelectCompany().getId());
 		workClientInfo.setOfficeId(UserUtils.getSelectOffice().getId());
@@ -1007,8 +1035,9 @@ public class WorkClientInfoController extends BaseController {
 	/**
 	 * 查询是否拥有统一社会信用代码checkClientUscCode
 	 */
-	@ResponseBody
+
 	@RequestMapping("checkClientUscCode")
+	@ResponseBody
 	public Map checkClientUscCode(WorkClientInfo workClientInfo,Model model){
 		WorkClientInfo getWorkClientInfo=workClientInfoService.findUscCode(workClientInfo);
 		Map<String,Object> maps=new HashMap<>();

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

@@ -530,7 +530,7 @@
 	</select>
 	<!--根据客户信息表查出来对应的联系人类型-->
 	<select id="getJopType" resultType="map">
-		SELECT work_client_id as workClientId,job_type_id as jobTypeId
+		SELECT work_client_id as workClientId,job_type_id as getJobTypeById
 
 		FROM work_client_job_type_info
 

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

@@ -82,7 +82,7 @@
 
 	<select id="findList" resultType="WorkClientLinkman" >
 		SELECT
-			<include refid="workClientLinkmanColumns"/>
+			<include refid="workClientLinkmanColumns"/>,b.usc_Code as uscCode
 		FROM work_client_linkman a
 		<include refid="workClientLinkmanJoins"/>
 		<where>

+ 96 - 22
src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -1,19 +1,24 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+
 <html>
 <head>
     <title>项目管理</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+
     <style>
         #projectDesc-error{
             left:0;
             top:82px;
         }
         .layui-layer-dialog{
-            background: red;
+            background: #ff0000;
         }
         td input{
             margin-left:-10px !important;
@@ -100,7 +105,6 @@
                 }
             }
 
-
             $('#areaId').on("change", function () {
                 var areaId = $("#areaId").val();
                 $("#province").val('');
@@ -132,6 +136,8 @@
         });
 
 
+
+
         function setContractValue(obj){
             var clientId = $("#contractClientId").val();
             $.ajax({
@@ -216,10 +222,11 @@
                     // console.log(d);
                     addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
                     var row = workClientLinkmanRowIdx - 1 ;
+
                     $("#workClientLinkmanList"+row+"_id").val(d.id);
                     $("#workClientLinkmanList"+row+"_clientId_id").val(d.clientId);
                     $("#workClientLinkmanList"+row+"_clientName").val(d.clientName);
-                    $("#workClientLinkmanList"+row+"_cname").val(d.cname);
+                    $("#workClientLinkmanList"+row+"_uscCode").val(d.uscCode);
                     $("#workClientLinkmanList"+row+"_name").val(d.linkName);
                     $("#workClientLinkmanList"+row+"_linkMobile").val(d.linkMobile);
                     $("#workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone);
@@ -227,6 +234,7 @@
                     $("#workClientLinkmanList"+row+"_name").prop("readonly","readonly");
                     $("#workClientLinkmanList"+row+"_linkMobile").prop("readonly","readonly");
                     $("#workClientLinkmanList"+row+"_linkPhone").prop("readonly","readonly");
+                    $("#workClientLinkmanList"+row+"_uscCode").prop("readonly","readonly");
                 }
             });
         }
@@ -508,7 +516,7 @@
                         $("#"+"workClientLinkmanList"+row+"_uscCode").val(d.uscCode);
                         $("#"+"workClientLinkmanList"+row+"_name").val(d.linkName);
                         $("#"+"workClientLinkmanList"+row+"_linkMobile").val(d.linkMobile);
-                        $("#"+"workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone)
+                        $("#"+"workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone);
                         if(isMasterClient){
                             $("#contractClientName").val(d.clientName);
                             isMasterClient = false;
@@ -581,6 +589,19 @@
                 $($document.getElementById(inputForm)).ajaxSubmit({
                     success:function(data) {
                         var d = data;
+                        //获取已有数据行数 以便于查找已有行数据id
+                        var length = document.getElementById("workClientLinkmanList");
+                        var rows = length.rows.length;
+                        var idList = [];
+                        for (var i=0;i<rows;i++){
+                            idList.push($("#workClientLinkmanList"+i+"_id").val())
+                        }
+                        for (var j=0;j<idList.length;j++){
+                            if(idList[j] == d.id){
+                                top.layer.close(index)
+                                return false;
+                            }
+                        }
                         if(d.msg == "false"){
                             parent.layer.msg("保存客户信息异常!",{icon:2});
                             return false;
@@ -596,11 +617,11 @@
                         $("#"+"workClientLinkmanList"+row+"_uscCode").val(d.uscCode);
                         $("#"+"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)
                     }
@@ -627,7 +648,9 @@
                 content: urls ,
                 btn: ['确定','关闭'],
                 yes: function(index, layero){
-                    var body = top.layer.getChildFrame('body', index);
+                    var body = top.layer.getChildFrame('body', index);//获取子页面的内容
+
+
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
                     var inputForm = body.find('#inputForm');
                     var top_iframe;
@@ -670,14 +693,27 @@
                 $($document.getElementById(inputForm)).ajaxSubmit({
                     success:function(data) {
                         var d = data;
+                        //获取已有数据行数 以便于查找已有行数据id
+                        var length = document.getElementById("workBuildLinkmanList");
+                        var rows = length.rows.length;
+                        var idList = [];
+                        for (var i=0;i<rows;i++){
+                            idList.push($("#workBuildLinkmanList"+i+"_id").val())
+                        }
+                        for (var j=0;j<idList.length;j++){
+                            if(idList[j] == d.id){
+                                top.layer.close(index)
+                                return false;
+                            }
+                        }
                         if(d.msg == "false"){
                             parent.layer.msg("保存客户信息异常!",{icon:2});
                             return false;
                         }
 
                         addRow('#workBuildLinkmanList', workBuildLinkmanRowIdx, workBuildLinkmanTpl);
-                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
-                        var row = workConstructionLinkmanRowIdx - 1 ;
+                        workBuildLinkmanRowIdx = workBuildLinkmanRowIdx + 1;
+                        var row = workBuildLinkmanRowIdx - 1 ;
 
                         $("#"+"workBuildLinkmanList"+row+"_id").val(d.id);
                         $("#"+"workBuildLinkmanList"+row+"_cid").val(d.clientId);
@@ -686,10 +722,10 @@
                         $("#"+"workBuildLinkmanList"+row+"_name").val(d.linkName);
                         $("#"+"workBuildLinkmanList"+row+"_linkMobile").val(d.linkMobile);
                         $("#"+"workBuildLinkmanList"+row+"_linkPhone").val(d.linkPhone);
-                        if(isMasterClient){
+                        /*if(isMasterClient){
                             $("#contractClientName").val(d.clientName);
                             isMasterClient = false;
-                        }
+                        }*/
                         /*parent.layer.msg(d.str,{icon:1});*/
                         top.layer.close(index)
                     }
@@ -727,7 +763,7 @@
                     }
                     inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
                     /*inputForm.attr("action","${ctx}/project/projectRecords/linkManSave");*///表单提交成功后,从服务器返回的url在当前tab中展示
-                    inputForm.attr("action","${ctx}/workclientinfo/workClientInfo/saveType")
+                    inputForm.attr("action","${ctx}/workclientinfo/workClientInfo/saveType");
                     var $document = iframeWin.contentWindow.document;
 
                     formConstruction($document,formId,index);
@@ -737,7 +773,6 @@
                 }
             });
 
-
         }
         function formConstruction($document,inputForm,index){
             var validateForm = $($document.getElementById(inputForm)).validate({
@@ -759,6 +794,19 @@
                 $($document.getElementById(inputForm)).ajaxSubmit({
                     success:function(data) {
                         var d = data;
+                        //获取已有数据行数 以便于查找已有行数据id
+                        var length = document.getElementById("workConstructionLinkmanList");
+                        var rows = length.rows.length;
+                        var idList = [];
+                        for (var i=0;i<rows;i++){
+                            idList.push($("#workConstructionLinkmanList"+i+"_id").val())
+                        }
+                        for (var j=0;j<idList.length;j++){
+                            if(idList[j] == d.id){
+                                top.layer.close(index)
+                                return false;
+                            }
+                        }
                         if(d.msg == "false"){
                             parent.layer.msg("保存客户信息异常!",{icon:2});
                             return false;
@@ -777,10 +825,10 @@
                         $("#"+"workConstructionLinkmanList"+row+"_name").val(d.linkName);
                         $("#"+"workConstructionLinkmanList"+row+"_linkMobile").val(d.linkMobile);
                         $("#"+"workConstructionLinkmanList"+row+"_linkPhone").val(d.linkPhone);
-                        if(isMasterClient){
+                        /*if(isMasterClient){
                             $("#contractClientName").val(d.clientName);
                             isMasterClient = false;
-                        }
+                        }*/
                         /*parent.layer.msg(d.str,{icon:1});*/
                         top.layer.close(index)
                     }
@@ -850,6 +898,19 @@
                 $($document.getElementById(inputForm)).ajaxSubmit({
                     success:function(data) {
                         var d = data;
+                        //获取已有数据行数 以便于查找已有行数据id
+                        var length = document.getElementById("workSuperLinkmanList");
+                        var rows = length.rows.length;
+                        var idList = [];
+                        for (var i=0;i<rows;i++){
+                            idList.push($("#workSuperLinkmanList"+i+"_id").val())
+                        }
+                        for (var j=0;j<idList.length;j++){
+                            if(idList[j] == d.id){
+                                top.layer.close(index)
+                                return false;
+                            }
+                        }
                         if(d.msg == "false"){
                             parent.layer.msg("保存客户信息异常!",{icon:2});
                             return false;
@@ -868,10 +929,10 @@
                         $("#"+"workSuperLinkmanList"+row+"_name").val(d.linkName);
                         $("#"+"workSuperLinkmanList"+row+"_linkMobile").val(d.linkMobile);
                         $("#"+"workSuperLinkmanList"+row+"_linkPhone").val(d.linkPhone);
-                        if(isMasterClient){
+                        /*if(isMasterClient){
                             $("#contractClientName").val(d.clientName);
                             isMasterClient = false;
-                        }
+                        }*/
                         /*parent.layer.msg(d.str,{icon:1});*/
                         top.layer.close(index)
                     }
@@ -941,6 +1002,19 @@
                 $($document.getElementById(inputForm)).ajaxSubmit({
                     success:function(data) {
                         var d = data;
+                        //获取已有数据行数 以便于查找已有行数据id
+                        var length = document.getElementById("workDesignLinkmanList");
+                        var rows = length.rows.length;
+                        var idList = [];
+                        for (var i=0;i<rows;i++){
+                            idList.push($("#workDesignLinkmanList"+i+"_id").val())
+                        }
+                        for (var j=0;j<idList.length;j++){
+                            if(idList[j] == d.id){
+                                top.layer.close(index)
+                                return false;
+                            }
+                        }
                         if(d.msg == "false"){
                             parent.layer.msg("保存客户信息异常!",{icon:2});
                             return false;
@@ -959,10 +1033,10 @@
                         $("#"+"workDesignLinkmanList"+row+"_name").val(d.linkName);
                         $("#"+"workDesignLinkmanList"+row+"_linkMobile").val(d.linkMobile);
                         $("#"+"workDesignLinkmanList"+row+"_linkPhone").val(d.linkPhone);
-                        if(isMasterClient){
+                        /*if(isMasterClient){
                             $("#contractClientName").val(d.clientName);
                             isMasterClient = false;
-                        }
+                        }*/
                         /*parent.layer.msg(d.str,{icon:1});*/
                         top.layer.close(index)
                     }
@@ -1088,13 +1162,13 @@
                         <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人:</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
-                </div>
+                </div>--%>
 
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>

+ 1 - 1
src/main/webapp/webpage/modules/sys/gridselect1.jsp

@@ -77,7 +77,7 @@
 								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
 							</div>
 						</div>
-						<div style="    clear:both;"></div>
+						<div style="clear:both;"></div>
 					</div>
 				</form:form>
 			</div>

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

@@ -195,9 +195,7 @@
             $("#uscCode").on("change",function(){
                     var id = $("#id").val();
                     var name = $("#name").val();
-                    var uscCode=null;
-
-                    uscCode = $("#uscCode").val();
+                    var uscCode= $("#uscCode").val();
 
                 $.ajax({
                     url:"${ctx}/workclientinfo/workClientInfo/checkClientUscCode",
@@ -211,7 +209,7 @@
                              $("#uscPh").html("该客户已存在");
                             console.log(data);
 
-                            layer.confirm('该客户已存在是否进行添加行联系人的类型?', {
+                            layer.confirm('该客户信息已存在是否进行信息修改?', {
                                 btn: ['确定', '取消'] //可以无限个按钮
 
                             }, function(index, layero){
@@ -397,8 +395,6 @@
                                 $("#name").val(data.ENTNAME).change();
                                 $("#uscCode").val(data.TAXNUMBER).change();
                                 $("#registerAddress").val(data.OPLOC);
-
-
                             }
                         );
                         return;
@@ -426,7 +422,7 @@
                             {"id": id},
                             function (data) {
                                 $("#name").val(data.ENTNAME).change();
-                                $("#uscCode").val(data.TAXNUMBER);
+                                $("#uscCode").val(data.TAXNUMBER).change();
                                 $("#registerAddress").val(data.OPLOC);
                             }
                         );
@@ -554,7 +550,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>联系人类型:</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>代表单位:</label>
                     <div class="layui-input-block">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>
@@ -584,8 +580,8 @@
                         <table id="bankinfo" class="table table-bordered table-condensed can-edit">
                             <thead>
                             <tr>
-                                <th class="sort-column companyType"><font color="red">*</font>开户银行</th>
-                                <th width="400px;"><font color="red">*</font>开户账号</th>
+                                <th class="sort-column companyType"><%--<font color="red">*</font>--%>开户银行</th>
+                                <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>
@@ -981,9 +977,10 @@
                             "id":$("#id").val()
                         },
                         success:function(dataListById){
+
                             if(dataListById.success) {
                                 var showDataList = dataListById.body.list;
-
+                                var lists = [];
                                 for (i in newDataList) {
                                     for (j in showDataList) {
                                         if (newDataList[i].value == showDataList[j].value) {
@@ -991,12 +988,15 @@
                                                 "name": newDataList[i].name,
                                                 "value": newDataList[i].value,
                                                 "selected": true
+
                                             }
+                                            lists.push(newDataList[i].value);
                                             showList.push(newData);
                                             data.splice(i,1,newData);
                                         }
                                     }
                                 }
+                                $("#jobTypeStr").val(lists);
                                 xmSelect.render({
                                     el: '#jobType',
                                     language: 'zn',

+ 4 - 4
src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormDetail.jsp

@@ -94,7 +94,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">联系人类型:</label>
+                <label class="layui-form-label">代表单位:</label>
                 <div class="layui-input-block">
                     <div class="input-group">
                         <div >
@@ -117,15 +117,15 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm12 lw7">
-                <label class="layui-form-label"><span class="require-item">*</span>开户行信息:</label>
+                <label class="layui-form-label">开户行信息:</label>
                 <div class="layui-input-block">
 
                     <table id="bankinfo" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
                             <th width="80px">序号</th>
-                            <th ><font color="red">*</font>开户银行</th>
-                            <th width="400px;"><font color="red">*</font>开户账号</th>
+                            <th ><%--<font color="red">*</font>--%>开户银行</th>
+                            <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
 
                         </tr>
                         </thead>

+ 7 - 4
src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormTwo.jsp

@@ -535,7 +535,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>联系人类型:</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>代表单位:</label>
                     <div class="layui-input-block">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>
@@ -565,8 +565,8 @@
                         <table id="bankinfo" class="table table-bordered table-condensed can-edit">
                             <thead>
                             <tr>
-                                <th class="sort-column companyType"><font color="red">*</font>开户银行</th>
-                                <th width="400px;"><font color="red">*</font>开户账号</th>
+                                <th class="sort-column companyType"><%--<font color="red">*</font>--%>开户银行</th>
+                                <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>
@@ -963,8 +963,9 @@
                         },
                         success:function(dataListById){
                             if(dataListById.success) {
-                                var showDataList = dataListById.body.list;
 
+                                var showDataList = dataListById.body.list;
+                                var lists=[];
                                 for (i in newDataList) {
                                     for (j in showDataList) {
                                         if (newDataList[i].value == showDataList[j].value) {
@@ -973,11 +974,13 @@
                                                 "value": newDataList[i].value,
                                                 "selected": true
                                             }
+                                            lists.push(newDataList[i].value);
                                             showList.push(newData);
                                             data.splice(i,1,newData);
                                         }
                                     }
                                 }
+                                $("#jobTypeStr").val(lists);
                                 xmSelect.render({
                                     el: '#jobType',
                                     language: 'zn',

+ 10 - 6
src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormType.jsp

@@ -482,9 +482,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">公司电话:</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>公司电话:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.telephone}"/>
+                        <input htmlEscape="false" readonly="true" class="form-control required layui-input" value="${workClientInfo.telephone}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -494,7 +494,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>联系人类型:</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>代表单位:</label>
                     <div class="layui-input-block">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>
@@ -514,15 +514,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">
-                    <label class="layui-form-label"<%--><span class="require-item">*</span>--%>开户行信息:</label>
+                    <label class="layui-form-label"><%--<span class="require-item">*</span>--%>开户行信息:</label>
                     <div class="layui-input-block">
 
                         <table id="bankinfo" class="table table-bordered table-condensed details">
                             <thead>
                             <tr>
                                 <th width="80px">序号</th>
-                                <th ><font color="red">*</font>开户银行</th>
-                                <th width="400px;"><font color="red">*</font>开户账号</th>
+                                <th ><%--<font color="red">*</font>--%>开户银行</th>
+                                <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
 
                             </tr>
                             </thead>
@@ -693,6 +693,7 @@
                             if(dataListById.success) {
                                 var showDataList = dataListById.body.list;
                                 var linkType = $("#linkType").val();
+                                var li=[];
                                 for (i in newDataList) {
                                     for (j in showDataList) {
                                         if (newDataList[i].value == showDataList[j].value || newDataList[i].value == linkType) {
@@ -701,11 +702,14 @@
                                                 "value": newDataList[i].value,
                                                 "selected": true
                                             }
+                                            li.push(newDataList[i].value);
+
                                             showList.push(newData);
                                             data.splice(i,1,newData);
                                         }
                                     }
                                 }
+                                $("#jobTypeStr").val(li);
                                 for (i in data) {
                                     data[i].disabled="disabled";
                                 }

+ 72 - 21
src/main/webapp/webpage/modules/workclientinfo/workClientTypeForm.jsp

@@ -8,7 +8,9 @@
 <head>
 	<title>客户信息管理</title>
 	<meta name="decorator" content="default"/>
+
     <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+
     <%--<style type="text/css">--%>
         <%--.btn-file{--%>
             <%--margin-top:8px;--%>
@@ -64,6 +66,30 @@
 
 		  return false;
 		}
+        //新添代码(start)
+        function addRow(list, idx, tpl, row){
+            // var idx1 = $("#workClientLinkmanList tr").length;
+            bornTemplete(list, idx, tpl, row, idx);
+        }
+
+        function bornTemplete(list, idx, tpl, row, idx1){
+            $(list).append(Mustache.render(tpl, {
+                idx: idx, delBtn: true, row: row,
+                order:idx1 + 1
+            }));
+            $(list+idx).find("select").each(function(){
+                $(this).val($(this).attr("data-value"));
+            });
+            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+                var ss = $(this).attr("data-value").split(',');
+                for (var i=0; i<ss.length; i++){
+                    if($(this).val() == ss[i]){
+                        $(this).attr("checked","checked");
+                    }
+                }
+            });
+        }
+        //新添代码(end)
 		$(document).ready(function() {
             contentDetailTypeShow();
             checkContentKeyUp('unitIntroduction',500);
@@ -199,6 +225,7 @@
                     $.ajax({
                         url:"${ctx}/workclientinfo/workClientInfo/checkClientUscCode",
                         type:"post",
+                        async:false,
                         data:{"id":id,
                             "name":name,
                             "uscCode":uscCode},
@@ -207,34 +234,55 @@
                             if(data.code=="false"){
                                 exitName=false
                                /* $("#uscPh").html("该客户已存在");*/
-                                console.log(data);
+
                                 var typeId=data.workClientInfo.id;
                                 var linkType=${linkType};
                                 var str=data.workClientInfo.jobTypeStr;
 
-                                console.log("---------"+linkType);
                                 if(str.indexOf(linkType) != -1){
-                                    window.location.href="${ctx}/workclientinfo/workClientInfo/typeAdd?id="+typeId+"&param=1&linkType="+linkType;
-
-                                    $.post("",{
-
-                                    },function(data){
-
-                                    });
+                                    //window.location.href="${ctx}/workclientinfo/workClientInfo/typeAdd?id="+typeId+"&param=1&linkType="+linkType;
+                                    window.location.href="${ctx}/workclientinfo/workClientInfo/fType?id="+typeId+"&param=1&linkType="+linkType;
+                               /* $.ajax({
+                                    url:"${ctx}/workclientinfo/workClientInfo/typeAdd",
+                                    type:"post",
+                                    async:false,
+                                    data:{"id":typeId,
+                                        "param":"1",
+                                        "linkType":linkType},
+                                    success:function(da) {
+                                        var d = da;
+                                        console.log("sssss:"+d);
+
+                                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                        var row = workClientLinkmanRowIdx - 1;
+                                        $("#" + "workClientLinkmanList" + row + "_id").val(d.id);
+                                        $("#" + "workClientLinkmanList" + row + "_cid").val(d.clientId);
+                                        $("#" + "workClientLinkmanList" + row + "_cname").val(d.clientName);
+                                        $("#" + "workClientLinkmanList" + row + "_cuscCode").val(d.uscCode);
+                                        $("#" + "workClientLinkmanList" + row + "_name").val(d.linkName);
+                                        $("#" + "workClientLinkmanList" + row + "_linkMobile").val(d.linkMobile);
+                                        $("#" + "workClientLinkmanList" + row + "_linkPhone").val(d.linkPhone);*!/
+                                        /!*if (isMasterClient) {
+                                            parent.$("#contractClientName").val(d.clientName);
+                                            isMasterClient = false;
+                                        }*!/
+                                    }
+                                    });*/
+                                    /*parent.location.reload(); //刷新父F页面*/
+                                    //关闭layer弹出层
+                                    /*var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+                                    top.layer.close(index);*/
                                 }else{
-                                    layer.confirm('该客户已存在是否进行添加行联系人的类型?', {
+                                    layer.confirm('该客户已存在是否添加代表单位类型?', {
                                         btn: ['确定', '取消'] //可以无限个按钮
 
                                     }, function(index, layero){
-
-                                        window.location.href="${ctx}/workclientinfo/workClientInfo/type?id="+typeId+"&param=1&linkType="+linkType;
-
+                                        window.location.href="${ctx}/workclientinfo/workClientInfo/fType?id="+typeId+"&param=1&linkType="+linkType;
                                     }, function(index){
                                         return "false";
                                     });
                                 }
-
-
                             }else {
                                 exitName=true
                                 $("#uscPh").html('');
@@ -243,7 +291,7 @@
                     });
                 }
             )
-           dismissDiv();
+           /*dismissDiv();*/
 
         });
 
@@ -433,7 +481,7 @@
                             {"id": id},
                             function (data) {
                                 $("#name").val(data.ENTNAME).change();
-                                $("#uscCode").val(data.TAXNUMBER);
+                                $("#uscCode").val(data.TAXNUMBER).change();
                                 $("#registerAddress").val(data.OPLOC);
                             }
                         );
@@ -552,7 +600,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>公司电话:</label>
                     <div class="layui-input-block">
                         <form:input path="telephone" id="telephone" htmlEscape="false"
-                                    class="form-control isTel required layui-input"/>
+                                    class="form-control isTel  required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -562,7 +610,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>联系人类型:</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>代表单位:</label>
                     <div class="layui-input-block">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>
@@ -592,8 +640,8 @@
                         <table id="bankinfo" class="table table-bordered table-condensed can-edit">
                             <thead>
                             <tr>
-                                <th class="sort-column companyType"><font color="red">*</font>开户银行</th>
-                                <th width="400px;"><font color="red">*</font>开户账号</th>
+                                <th class="sort-column companyType"><%--<font color="red">*</font>--%>开户银行</th>
+                                <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>
@@ -756,6 +804,9 @@
                 <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"/>
+                    <input id="workClientLinkmanList{{idx}}_uscCode" name="workClientLinkmanList[{{idx}}].cuscCode" type="hidden" value="{{row.uscCode}}"/>
+                    <input id="workClientLinkmanList{{idx}}_cname" name="workClientLinkmanList[{{idx}}].cname" type="hidden" value="{{row.cname}}"/>
+
                 </td>
 
                 <td>