修改来电弹屏，客户信息增加来电弹屏

CallCenterWeb.UI/Script/Common/huayi.http.js

@@ -356,6 +356,16 @@ helper.filter = {
 		}
 		return content;
 	},
+	//电话号码截取前三位和后四位
+	cutTel: function(val){
+		var str = '';
+		if(val){
+			var val1 = val.substring(0, 3);
+			var val2 = val.substr(-4);
+			str = val1 + '****' + val2;
+		}
+		return str;
+	}
 
 };
 

CallCenterWeb.UI/callScreen/call.js

@@ -12,16 +12,16 @@ var timestamp = Date.parse(new Date());
 var timer, n = 0;
 
 //测试数据
-//var phoneNumber = "15235457489";
-//var CallID = "148";
+var phoneNumber = "15235457489";
+var CallID = "148";
 
 $(function() {
 	//初始化一些数据
 	$(".hidCallID").val(CallID);
 
-	$(".tel").text(phoneNumber); //左侧来电号码
-	$("#head_form_tel").val(phoneNumber); //左侧电话
-	$("#order_tel").val(phoneNumber); //右侧工单电话
+	$(".tel").text(helper.filter.cutTel(phoneNumber)); //左侧来电号码
+	// $("#head_form_tel").val(phoneNumber); //左侧电话
+	// $("#order_tel").val(phoneNumber); //右侧工单电话
 
 	$(".ldtime").text(top.getNowFormatDate()); //左侧来电时间
 	$(".thsc").text("00:00"); //通话时间
@@ -56,34 +56,35 @@ $(function() {
 	if(phoneNumber) {
 		getPhoneLocation(); //获取来电归属地
 		// 区域 项目 期号三级联动
-		helper.getDropList.getProLocations($('#head_form_rengin'), $('#head_form_pro'), $('#head_form_floor'));
-		helper.getDropList.getProLocations($('#order_rengin'), $('#order_pro'), $('#order_floor'));
-
-		$('#head_form_rengin').on('change', function() {
-			//清空房间号
-			if($('#head_form_room_select')) {
-				$('#head_form_room_select').empty();
-				$('#head_form_room_input').show().siblings('.bootstrap-select').hide();
-			}
-		});
-		$('#head_form_pro').on('change', function() {
-			//清空房间号
-			if($('#head_form_room_select')) {
-				$('#head_form_room_select').empty();
-				$('#head_form_room_input').show().siblings('.bootstrap-select').hide();
-			}
-		});
+		// helper.getDropList.getProLocations($('#head_form_rengin'), $('#head_form_pro'), $('#head_form_floor'));
+		// helper.getDropList.getProLocations($('#order_rengin'), $('#order_pro'), $('#order_floor'));
+// 		$('#head_form_rengin').on('change', function() {
+// 			//清空房间号
+// 			if($('#head_form_room_select')) {
+// 				$('#head_form_room_select').empty();
+// 				$('#head_form_room_input').show().siblings('.bootstrap-select').hide();
+// 			}
+// 		});
+// 		$('#head_form_pro').on('change', function() {
+// 			//清空房间号
+// 			if($('#head_form_room_select')) {
+// 				$('#head_form_room_select').empty();
+// 				$('#head_form_room_input').show().siblings('.bootstrap-select').hide();
+// 			}
+// 		});
 
 		//监听期号的改变 获取房间号 下拉或输入框
-		$('#head_form_floor').on('change', getRoomNumber);
-
-		getCustomerLists(1); //获取来电客户信息
+		// $('#head_form_floor').on('change', getRoomNumber);
+		getCustomer(); //获取来电客户信息
 	}
+	//根据关键词搜索公司 
+	$('#companySearch').on('click', getSearchCustomer);
 
 	//保存来电客户信息
 	$('#head_form_btn_save').on('click', headFormSave);
+	
 	//清空来电客户信息
-	$('#head_form_btn_reset').on('click', headFormReset);
+	// $('#head_form_btn_reset').on('click', headFormReset);
 
 	//点击IVR
 	$('#head_black_ivr').click(function() {
@@ -251,22 +252,80 @@ function getPhoneLocation() {
 	});
 }
 
+//根据关键词搜索公司 
+function getSearchCustomer() {
+	$.ajax({
+		url: huayi.config.callcenter_url + 'CustomerNew/GetListByKey',
+		type: 'get',
+		data: {
+			keywords: $('#head_form_search').val(),// 关键词
+			token: $.cookie("token")
+		},
+		dataType: "json",
+		async: true,
+		success: function(data) {
+			if(data.state.toLowerCase() === 'success') {
+				var customerBase = data.data;
+				if(customerBase){
+					$('#head_form_cmpname').val(customerBase.F_CompanyName);//公司名称
+					$('#head_form_cmpaddress').val(customerBase.F_CompanyAddress);//公司地址
+					$('#head_form_legname').val(customerBase.F_LegalName);//法人姓名
+					$('#head_form_legtel').val(helper.filter.cutTel(customerBase.F_LegalTel));//法人电话
+					$('#head_form_subtrade').val(customerBase.F_SubTrade);//所属行业
+					//获取对应的联系人信息
+					getCustomerLists(1, customerBase.F_CustomerId);
+				}
+			}
+		},
+	});
+}
+
 /**
  * 根据电话获取 客户信息
+ * */
+ function getCustomer(){
+	$.ajax({
+		url: huayi.config.callcenter_url + 'CustomerNew/GetCustomerByTel',
+		type: 'get',
+		data: {
+			tel: phoneNumber, //否	string	来电电话 例如:13663801989
+			token: $.cookie("token")
+		},
+		dataType: "json",
+		async: true,
+		success: function(data) {
+			if(data.state.toLowerCase() === 'success') {
+				var customerBase = data.data.CustomerBase;
+				if(customerBase){
+					$('#head_form_customer_id').val(customerBase.F_CustomerId); //客户id
+					$('#head_form_cmpname').val(customerBase.F_CompanyName);//公司名称
+					$('#head_form_cmpaddress').val(customerBase.F_CompanyAddress);//公司地址
+					$('#head_form_legname').val(customerBase.F_LegalName);//法人姓名
+					$('#head_form_legtel').val(helper.filter.cutTel(customerBase.F_LegalTel));//法人电话
+					$('#head_form_subtrade').val(customerBase.F_SubTrade);//所属行业
+					//获取对应的联系人信息
+					getCustomerLists(1, customerBase.F_CustomerId);
+				}
+			}
+		},
+	}); 
+ }
+ 
+/**
+ * 根据电话获取 客户联系人列表
  * paramPage： 页数请求的是第几页
+ * cid： 客户的id
  * */
-function getCustomerLists(paramPage) {
+function getCustomerLists(paramPage, cid) {
 	$('#head_customer_info').html('');
 	$.ajax({
-		url: huayi.config.callcenter_url + 'Customer/GetCustomerListByTel',
+		url: huayi.config.callcenter_url + 'CustomerNew/GetConList',
 		type: 'get',
 		data: {
-			page: paramPage, //第几页
+			cusid: cid, //客户id
+			pageindex: paramPage, //第几页
 			pagesize: 2,
 			tel: phoneNumber, //否	string	来电电话 例如:13663801989
-			//areaid: ,	//否	int	区域id
-			//categoryid	,//否	int	所购项目id
-			//buldingid	,//否	int	期号
 			token: $.cookie("token")
 		},
 		dataType: "json",
@@ -282,39 +341,38 @@ function getCustomerLists(paramPage) {
 						'<div class="head_customer_info_item_l pull-left">' +
 						'<p class="clearfix">' +
 						'<span>姓名</span>' +
-						'<span>' + tableDatas[i].F_CustomerName + '</span>' +
-						'<span class="pull-right">' + tableDatas[i].F_Mobile + '</span>' +
+						'<span>' + tableDatas[i].F_Name + '</span>' +
 						'</p>' +
 						'<p>' +
-						'<span>项目</span>' +
-						//tableDatas[i].areaname 区域
-						'<span>' + tableDatas[i].regionname + ' ' + tableDatas[i].buldingname + '</span>' +
+						'<span>电话</span>' +
+						'<span>' + helper.filter.cutTel(tableDatas[i].F_Telephone) + '</span>' +
 						'</p>' +
 						'<p>' +
-						'<span>房间</span>' +
-						'<span>' + tableDatas[i].F_BusinessLicenseID + '</span>' +
+						'<span>是否主要联系人</span>' +
+						'<span>' + (tableDatas[i].F_IsMain === true ? '是' : '否') + '</span>' +
 						'</p>' +
 						'</div>' +
-						'<div class="head_customer_info_item_r pull-left" id="customerBtn_' + i + '">选择' +
+						'<div class="head_customer_info_item_r pull-left" id="customerBtn_' + i + '">'+
+						// '选择' +
 						'</div>' +
 						'</div>'
 					$('#head_customer_info').append(itmeHtml);
-					$('#customerBtn_' + i).on('click', function() {
-						if($(this).parent().hasClass('head_customer_info_item_active')) {
-							//点击取消
-							$(this).parent().removeClass('head_customer_info_item_active');
-							$(this).text('选择');
-							//清空 head_form
-							headFormClean();
-						} else {
-							//点击选择
-							$(this).parent().addClass('head_customer_info_item_active').siblings().removeClass('head_customer_info_item_active');
-							$(this).text('取消');
-							$(this).parent().siblings().find('.head_customer_info_item_r').text('选择');
-							//给 head_form 赋值
-							setHeadForm(tableDatas, $(this).attr('id').split('customerBtn_')[1]);
-						}
-					});
+// 					$('#customerBtn_' + i).on('click', function() {
+// 						if($(this).parent().hasClass('head_customer_info_item_active')) {
+// 							//点击取消
+// 							$(this).parent().removeClass('head_customer_info_item_active');
+// 							$(this).text('选择');
+// 							//清空 head_form
+// 							headFormClean();
+// 						} else {
+// 							//点击选择
+// 							$(this).parent().addClass('head_customer_info_item_active').siblings().removeClass('head_customer_info_item_active');
+// 							$(this).text('取消');
+// 							$(this).parent().siblings().find('.head_customer_info_item_r').text('选择');
+// 							//给 head_form 赋值
+// 							setHeadForm(tableDatas, $(this).attr('id').split('customerBtn_')[1]);
+// 						}
+// 					});
 				}
 				if(tableDatasLength > 0) {
 					$.jqPaginator('#pagination', {
@@ -333,7 +391,7 @@ function getCustomerLists(paramPage) {
 							}
 						}
 					});
-					$('#customerBtn_0').trigger('click');
+					// $('#customerBtn_0').trigger('click');
 				} else {
 					$('.head_customer_info_title').hide();
 				}
@@ -401,7 +459,6 @@ function headFormClean() {
 
 //保存来电客户信息
 function headFormSave() {
-	var roomNum;
 	if(!$.trim($('#head_form_name').val())) {
 		layer.confirm('请输入姓名！', {
 			icon: 2,
@@ -409,61 +466,22 @@ function headFormSave() {
 		});
 		return;
 	}
-	if(!regexs.phone.test($.trim($('#head_form_tel').val()))) {
-		layer.confirm('请输入正确的电话！', {
-			icon: 2,
-			btn: ['确定']
-		});
-		return;
-	}
-	
-	if($('#head_form_pro').val() === '0') {
-		layer.confirm('请选择项目！', {
-			icon: 2,
-			btn: ['确定']
-		});
-		return;
-	}
+// 	if(!regexs.phone.test($.trim($('#head_form_tel').val()))) {
+// 		layer.confirm('请输入正确的电话！', {
+// 			icon: 2,
+// 			btn: ['确定']
+// 		});
+// 		return;
+// 	}
 	
-	if($('#head_form_room_input').is(':visible')) {
-		roomNum = $('#head_form_room_input').val();
-	} else {
-		roomNum = $('#head_form_room_select').val();
-	}
-	$.post(huayi.config.callcenter_url + 'Customer/AddCustomer', {
-		F_CustomerId: $('#head_form_customer_id').val(), //是	string	id
-		F_CustomerName: $('#head_form_name').val(), //	是	string	姓名/联系人
-		F_Mobile: $('#head_form_tel').val(), //否	string	手机号码
-		F_Layer: $('#head_form_rengin').val(), //否	string 区域id
-		F_CategoryId: $('#head_form_pro').val(), //否	string	所购项目id
-		F_CustomerType: $('#head_form_floor').val(), //否	string	期号id
-		F_CustomerNature: $('#head_form_buildingnum').val(),    //楼号
-		F_CustomerClass: $('#head_form_unitnum').val(),    //单元号
-		F_BusinessLicenseID: roomNum, //否	string	所购楼层信息 （房间号）
+	$.post(huayi.config.callcenter_url + 'CustomerNew/AddContact', {
+		F_CustomerId: $('#head_form_customer_id').val(),// int客户id
+		F_Name: $('#head_form_name').val(),//string 联系人姓名
+		F_Telephone: phoneNumber,// string电话
 		token: $.cookie("token")
 	}, function(result) {
 		result = $.parseJSON(result);
-		if(result.state.toLowerCase() == "success") {
-			$('#head_form_customer_id').val(result.data.F_CustomerId); //客户id
-			//进入历史工单 新增工单页面
-			//$('.ld-service').find('li.KF').trigger('click');
-			//赋值
-			$('#order_name').val($('#head_form_name').val()); //客户姓名
-			$('#order_tel').val($('#head_form_tel').val()); //电话
-			$('#order_rengin').selectpicker('val', $('#head_form_rengin').val()).trigger('change'); //区域
-			$('#order_pro').selectpicker('val', $('#head_form_pro').val()).trigger('change'); //项目
-			$('#order_floor').selectpicker('val', $('#head_form_floor').val()).trigger('change'); //期号
-			$('#order_buildingnum').val($('#head_form_buildingnum').val());    //楼号
-			$('#order_unitnum').val($('#head_form_unitnum').val());   //单元号
-			
-			if($("#head_form_room_select").is(":hidden")) {
-				$('#order_room').val($('#head_form_room_input').val()); //房间号
-			} else {
-				$('#order_room').val($('#head_form_room_select').val()); //房间号
-			}
-			//获取业主信息
-			getOwnerInformation();
-
+		if(result.state.toLowerCase() === "success") {
 			layer.msg("保存成功");
 		}
 	})

CallCenterWeb.UI/callScreen/callScreen.html

@@ -84,18 +84,49 @@
 						<div class="head_form form-horizontal">
 							<div class="form-group">
 								<input type="hidden" id="head_form_customer_id" value="" />
+								<label for="head_form_search" class="col-sm-4 control-label">搜索</label>
+								<div class="col-sm-8">
+									<input type="text" class="form-control" id="head_form_search" placeholder="请输入公司名称">
+									<span id="companySearch" class="glyphicon glyphicon-search company_search" aria-hidden="true"></span>
+								</div>
+							</div>
+							<div class="form-group">
 								<label for="head_form_name" class="col-sm-4 control-label">姓名</label>
 								<div class="col-sm-8">
 									<input type="text" class="form-control" id="head_form_name" placeholder="请输入姓名">
 								</div>
 							</div>
 							<div class="form-group">
-								<label for="head_form_tel" class="col-sm-4 control-label">电话</label>
+								<label for="head_form_cmpname" class="col-sm-4 control-label">公司名称</label>
+								<div class="col-sm-8">
+									<input readonly type="text" class="form-control" id="head_form_cmpname" placeholder="">
+								</div>
+							</div>
+							<div class="form-group">
+								<label for="head_form_cmpaddress" class="col-sm-4 control-label">公司地址</label>
+								<div class="col-sm-8">
+									<input readonly type="text" class="form-control" id="head_form_cmpaddress" placeholder="">
+								</div>
+							</div>
+							<div class="form-group">
+								<label for="head_form_legname" class="col-sm-4 control-label">法人姓名</label>
+								<div class="col-sm-8">
+									<input readonly type="text" class="form-control" id="head_form_legname" placeholder="">
+								</div>
+							</div>
+							<div class="form-group">
+								<label for="head_form_legtel" class="col-sm-4 control-label">法人电话</label>
 								<div class="col-sm-8">
-									<input type="text" class="form-control" id="head_form_tel" placeholder="请输入电话">
+									<input readonly type="text" class="form-control" id="head_form_legtel" placeholder="">
 								</div>
 							</div>
 							<div class="form-group">
+								<label for="head_form_subtrade" class="col-sm-4 control-label">所属行业</label>
+								<div class="col-sm-8">
+									<input readonly type="text" class="form-control" id="head_form_subtrade" placeholder="">
+								</div>
+							</div>
+							<!-- <div class="form-group">
 								<label for="head_form_rengin" class="col-sm-4 control-label">区域</label>
 								<div class="col-sm-8">
 									<select class="form-control selectpicker" id="head_form_rengin" data-live-search="true">
@@ -140,7 +171,7 @@
 
 									</select>
 								</div>
-							</div>
+							</div> -->
 							<div class="form-group">
 								<label for="" class="col-sm-4 control-label">来电时间</label>
 								<div class="col-sm-8">
@@ -148,18 +179,18 @@
 								</div>
 							</div>
 							<div class="form-group text-center head_form_btn_save">
-								<span id="head_form_btn_reset">清空</span>
-								<span id="head_form_btn_save">保存</span>
+								<!-- <span id="head_form_btn_reset">清空</span> -->
+								<span id="head_form_btn_save">保存联系人</span>
 							</div>
 						</div>
 
 						<div class="head_customer_info clearfix">
 							<div class="head_customer_info_title clearfix">
-								<span class="info_title pull-left">相关客户信息</span>
+								<span class="info_title pull-left">相关联系人信息</span>
 								<ul class="pagination pull-right" id="pagination"></ul>
 							</div>
 							<div class="head_customer_info_lists" id="head_customer_info">
-								<!--<div class="head_customer_info_item clearfix">
+								<!-- <div class="head_customer_info_item clearfix">
 									<div class="head_customer_info_item_l pull-left">
 										<p class="clearfix">
 											<span>姓名</span>
@@ -199,8 +230,8 @@
 									<div class="head_customer_info_item_r pull-left">
 										<span>添加</span>
 									</div>
-								</div>
-							-->
+								</div> -->
+							
 							</div>
 							<div class="pull-right" id="page_number"></div>
 						</div>

CallCenterWeb.UI/callScreen/css/call.css

@@ -21,7 +21,7 @@ a {
 }
 
 .form-control:-ms-input-placeholder {
-	color: #999!important;
+	color: #999 !important;
 }
 
 .ldtp-con {
@@ -259,7 +259,7 @@ a {
 }
 
 .head_form .form-group .form-control:focus {
-	border-color: transparent!important;
+	border-color: transparent !important;
 }
 
 .head_form .btn-default {
@@ -277,18 +277,18 @@ a {
 }
 
 .head_form .bootstrap-select .dropdown-toggle:focus {
-	outline: none!important;
+	outline: none !important;
 	outline-offset: 0;
 }
 
 .head_form .dropdown-menu .bs-searchbox .form-control {
-	background-color: #fff!important;
-	border-color: #ccc!important;
+	background-color: #fff !important;
+	border-color: #ccc !important;
 	color: #555;
 }
 
 .head_form .dropdown-menu .bs-searchbox .form-control:focus {
-	border-color: #1ab394!important;
+	border-color: #1ab394 !important;
 }
 
 .head_form .bootstrap-select.btn-group .dropdown-menu li a {
@@ -297,7 +297,7 @@ a {
 }
 
 .head_form .dropdown-menu>.active>a {
-	color: #fff!important;
+	color: #fff !important;
 }
 
 .ldtime {
@@ -707,7 +707,7 @@ a {
 }
 
 .hides {
-	display: none!important;
+	display: none !important;
 }
 
 .hei-list .bacha:hover {
@@ -715,7 +715,7 @@ a {
 }
 
 .ke-container {
-	width: 70%!important;
+	width: 70% !important;
 }
 
 body,
@@ -1155,7 +1155,7 @@ html,
 }
 
 .baseInfo .form-control[readonly]:focus {
-	border-color: #e5e6e7!important;
+	border-color: #e5e6e7 !important;
 }
 
 .audit_wait {
@@ -1170,7 +1170,16 @@ html,
 	color: #5ccb91;
 }
 
+.company_search {
+	position: absolute;
+	right: 8px;
+	top: 8px;
+	cursor: pointer;
+}
+
+
 @media (max-width: 1680px) {
+
 	.head_time,
 	.head_black,
 	.head_tel,
@@ -1183,6 +1192,7 @@ html,
 	.head_customer_info_item_l {
 		height: 110px;
 	}
+
 	.head_customer_info_item_r {
 		height: 110px;
 		line-height: 110px;
@@ -1193,6 +1203,7 @@ html,
 	.head_customer_info_item_l {
 		height: 128px;
 	}
+
 	.head_customer_info_item_r {
 		height: 128px;
 		line-height: 128px;
@@ -1203,6 +1214,7 @@ html,
 	.head_customer_info_item_l {
 		height: 128px;
 	}
+
 	.head_customer_info_item_r {
 		height: 128px;
 		line-height: normal;
@@ -1214,4 +1226,4 @@ html,
 	.order_form .form-inline .form-control {
 		width: 50%;
 	}
-}
+}

CallCenterWeb.UI/commonTpl/addOrEditCusInfo.html

@@ -10,7 +10,6 @@
 		<script src="../Script/Common/huayi.load.js"></script>
 		<script src="../Script/Common/huayi.config.js"></script>
 		<link rel="stylesheet" href="../css/customer.css" />
-
 	</head>
 
 	<body>
@@ -18,12 +17,12 @@
 			<div class="tab_contents" id="tab_user_contents">
 				<ul class="project_items form-horizontal showtabs">
 					<h3 class="col-md-12 project_items_title">基本信息</h3>
-					<li class="form-group">
+	<!-- 				<li class="form-group">
 						<label for="customer_key" class="col-md-2"><b class="text_require">*</b>关键词</label>
 						<div class="col-md-9">
 							<input id="customer_key" class="form-control" type="text" autocomplete="off" placeholder="请输入关键词" />
 						</div>
-					</li>
+					</li> -->
 					<li class="form-group">
 						<label for="customer_code" class="col-md-2"><b class="text_require">*</b>客户编号</label>
 						<div class="col-md-9">
@@ -79,20 +78,20 @@
 						</div>
 					</li>
 					<li class="form-group">
-						<label for="customer_layer" class="col-md-2">客户信誉等</label>
+						<label for="customer_layer" class="col-md-2">客户信誉等级</label>
 						<div class="col-md-9">
 							<input id="customer_layer" class="form-control" type="text" autocomplete="off" placeholder="请输入客户信誉等级" />
 						</div>
 					</li>
-					
-					<li class="form-group">
+					<li class="form-group drop_down">
 						<label for="customer_bedept" class="col-md-2">客户归属部门</label>
 						<div class="col-md-9">
-							<input id="customer_bedept" class="form-control" type="text" autocomplete="off" placeholder="请输入客户归属部门" />
+							<input type="text" class="form-control input-sm" id="customer_bedept" data-id="0" placeholder="请选择客户归属部门" autocomplete="off" />
+							<span class="caret"></span>
+							<div id="customerTreeView" class="hidden"></div>
 						</div>
 					</li>
 					
-					
 					<li class="form-group">
 						<label for="customer_berelatedAcc" class="col-md-2">客户归属涉税会计</label>
 						<div class="col-md-9">

CallCenterWeb.UI/commonTpl/importCustomers.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 
 	<head>
@@ -113,8 +113,6 @@
 		<script>
 			var percents = 0; //长传文件进度值
 			$(document).ready(function() {
-				//获取 区域 项目 期号下拉
-//				helper.getDropList.getProLocations($('#head_form_rengin'), $('#head_form_pro'), $('#head_form_floor'));
 				//上传EXCEL文件
 				$("#upFileExcel").click(function() {
 					$("#upFile").trigger("click");
@@ -130,33 +128,12 @@
 			});
 			//下载模板
 			function ExcelMod() {
-			    window.location.href = huayi.config.callcenter_url + "ExcelMod/CustomerList_Excel.xls";
+			    window.location.href = "CustomerList_Excel.xls";
 			}
 
 			//上传Excel文件 模拟实时进度
 			function uploads() {
 				var txtName = $('.excelName').text();
-//				if($('#head_form_rengin').val() === "0" || $('#head_form_rengin').val() === undefined) {
-//					layer.confirm('请选择区域', {
-//						icon: 2,
-//						btn: ['确定']
-//					});
-//					return;
-//				}
-//				if($('#head_form_pro').val() === "0" || $('#head_form_pro').val() === undefined) {
-//					layer.confirm('请选择项目', {
-//						icon: 2,
-//						btn: ['确定']
-//					});
-//					return;
-//				}
-//				if($('#head_form_floor').val() === "0" || $('#head_form_floor').val() === undefined) {
-//					layer.confirm('请选择期号', {
-//						icon: 2,
-//						btn: ['确定']
-//					});
-//					return;
-//				}
 				if(txtName == '') {
 					layer.confirm('你还没有上传文件', {
 						icon: 2,
@@ -173,12 +150,9 @@
 					var formData = new FormData();
 					var Files = document.getElementById("upFile").files;
 					formData.append("upFile", Files[0]); //是	HttpPostedFile	Excel文件
-//					formData.append("areaid", $('#head_form_rengin').val()); //是	int	区域id （下拉）
-//					formData.append("regionid", $('#head_form_pro').val()); //是	int	项目id （下拉）
-//					formData.append("buldingid", $('#head_form_floor').val()); //是	int	期号 （下拉）
 					formData.append("token", $.cookie("token"));
 					$.ajax({
-						url: huayi.config.callcenter_url + "Customer/ImportExcel",
+						url: huayi.config.callcenter_url + "CustomerNew/ImportExcel",
 						type: "POST",
 						data: formData,
 						/**
@@ -215,7 +189,7 @@
 							if(r.state.toLowerCase() == "success") {
 								var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
 								parent.layer.close(index); //再执行关闭
-								parent.getTableDataList();
+								parent.$('#cusList').bootstrapTable('refresh');
 								parent.layer.alert(r.message, {
 									icon: 1,
 									btn: ['确定']

CallCenterWeb.UI/css/customer.css

@@ -288,3 +288,14 @@ img.upload-img {
   border-left: 1px solid #E5E6E7;
   padding-left: 10px;
 }
+
+#customerTreeView{
+	position: absolute;
+	left: 15px;
+	width: 97%;
+	top: 32px;
+	background-color: #fff;
+	z-index: 4;
+	max-height: 256px;
+	overflow-y: auto;
+}

CallCenterWeb.UI/keHuManager/customerInfo.html

@@ -90,6 +90,7 @@
 				<div class="pull-right tool_bars">
 					<button class="btns" id="sc_btns">搜索</button>
 					<button class="btns" id="btn_add">添加</button>
+					<input type="button" class="btns" onclick="btn_export()" value="导入" />
 					<button class="btns" onclick="btn_deletes()">批量删除</button>
 				</div>
 			</div>

CallCenterWeb.UI/keHuManager/js/addOrEditCusInfo.js

@@ -3,18 +3,16 @@
  * */
 var indexNum = 0;
 $(function() {
-	//获取所属行业//获取税务类别//获取客户信誉等级
-	// 	$.when(helper.getDropList.getlistDropByDic($('#customer_subtrade'), 'KHSSHY'),
-	// 			helper.getDropList.getlistDropByDic($('#customer_taxCategory'), 'SWLB'),
-	// 			helper.getDropList.getlistDropByDic($('#customer_layer'), 'KHLayer'))
-	// 		.done(function() {
-	var edit_id = helper.request.queryString("edit_id");
-	if (edit_id) {
-		getCustomer(edit_id);
-	}
-	//绑定验证(所有 input.form-control)
-	$('#tab_user_contents').find("input[class='form-control']").on('blur keyup', valideInput);
-	// });
+	//获取所属部门 
+	getDepts('customerTreeView', 'customer_bedept')
+	.then(function(){
+		var edit_id = helper.request.queryString("edit_id");
+		if (edit_id) {
+			getCustomer(edit_id);
+		}
+		//绑定验证(所有 input.form-control)
+		$('#tab_user_contents').find("input[class='form-control']").on('blur keyup', valideInput);
+	});
 
 });
 
@@ -123,7 +121,7 @@ function getCustomer(ids) {
 						'<button class="form-control btn btn-default" style="width:60px;margin-left:15px" onclick="btn_delete($(this))">删除</button>' +
 						'</div>';
 					$('#contactList').prepend(tplstr);
-					$('F_IsMain_' + i).find('input[type="radio"][value="' + cusLists[i].F_Remark +'"]').prop('checked', true);
+					$('#F_IsMain_' + i).find('input[type="radio"][value="' + cusLists[i].F_IsMain +'"]').prop('checked', true);
 					
 				}
 				indexNum = cusLists.length;
@@ -134,8 +132,7 @@ function getCustomer(ids) {
 
 //保存
 function saveCustomer() {
-	if (!$.trim($('#customer_key').val()) ||
-		!$.trim($('#customer_code').val()) ||
+	if (!$.trim($('#customer_code').val()) ||
 		!$.trim($('#customer_companyname').val())
 	) {
 		layer.msg('带红色星号的是必填项，请填写或选择后再保存！');
@@ -170,22 +167,22 @@ function saveCustomer() {
 			});
 			return;
 		}
-		if (!regexs.phone.test($.trim(F_Duties))) {
-			layer.confirm('您添加的联系人电话号码格式不正确！', {
+		if (F_Duties && !regexs.chOrenOrnum.test($.trim(F_Duties))) {
+			layer.confirm('您添加的联系人职务格式不正确！', {
 				icon: 2,
 				btn: ['确定']
 			});
 			return;
 		}
-		if (!regexs.phone.test($.trim(F_Telephone))) {
-			layer.confirm('您添加的联系人电话号码格式不正确！', {
+		if (F_QQ && !regexs.QQreg.test($.trim(F_QQ))) {
+			layer.confirm('您添加的联系人QQ格式不正确！', {
 				icon: 2,
 				btn: ['确定']
 			});
 			return;
 		}
-		if (!regexs.phone.test($.trim(F_Telephone))) {
-			layer.confirm('您添加的联系人电话号码格式不正确！', {
+		if (F_MSN && !regexs.chOrenOrnum.test($.trim(F_MSN))) {
+			layer.confirm('您添加的联系人MSN格式不正确！', {
 				icon: 2,
 				btn: ['确定']
 			});
@@ -211,7 +208,7 @@ function saveCustomer() {
 		},
 		data: {
 			F_CustomerId: edit_id, //	否	string	id
-			F_KeyWords: $('#customer_key').val(), //string 关键词	
+			// F_KeyWords: $('#customer_key').val(), //string 关键词	
 			F_CustomerCode: $('#customer_code').val(), //string 客户编号
 			F_CompanyName: $('#customer_companyname').val(), //string 公司名称
 			F_CompanyAddress: $('#customer_comaddress').val(), //string 公司地址
@@ -222,7 +219,7 @@ function saveCustomer() {
 			F_TaxPointDes: $('#customer_taxPointDes').val(), //string 税点描述
 			F_InvoiceRange: $('#customer_invoiceRange').val(), //string 开票范围
 			F_Layer: $('#customer_layer').val(), // int 客户信誉等级
-			F_BeDept: $('#customer_bedept').val(), // int 客户归属部门
+			F_BeDept: $('#customer_bedept').attr('data-id'), // int 客户归属部门
 			F_BeRelatedAcc: $('#customer_berelatedAcc').val(), //string 客户归属涉税会计
 			F_BeAuditAcc: $('#customer_beauditAcc').val(), //string 客户归属审核会计
 			F_BeMakeAcc: $('#customer_bemakeAcc').val(), //string 客户归属做账会计
@@ -374,14 +371,96 @@ function getFields() {
 }
 
 
+/**
+ * 获取客户归属部门
+ * el1, 树形结构元素id名 customerTreeView
+ * el2, 搜索框元素id名 customer_bedept
+ * */
+function getDepts(el1, el2) {
+	var dtd = $.Deferred(); //在函数内部，新建一个Deferred对象
+	//初始化 样式
+	$('#' + el2).on('focus click', function() {
+		$('#' + el1).removeClass('hidden').addClass('show');
+	});
+	$('#' + el2).on('keyup', function() {
+		if($(this).val() == '') {
+			$('#' + el1).treeview('uncheckAll', {
+				silent: true
+			});
+			$(this).attr('data-id', '0');
+		}
+	});
+	$('#' + el2 + ' .caret').on('click', function() {
+		$('#' + el1).removeClass('hidden').addClass('show');
+	});
+	$('#' + el1).mouseleave(function() {
+		$(this).removeClass('show').addClass('hidden');
+	});
+	
+	$.getJSON(huayi.config.callcenter_url + 'Department/GetDeptList', {
+		token: $.cookie("token")
+	}, function(result) {
+		if(result.state.toLowerCase() == "success") {
+			var defaultDatas = helper.methods.buildTree(result.data);
+			var sortChildrenArr = helper.methods.objToArray(defaultDatas[0].children);
+			sortChildrenArr.sort(helper.methods.compare('sort'));
+			var sortChildrenObj = helper.methods.arrayToObj(sortChildrenArr);
+			defaultDatas[0].children = sortChildrenObj;
+			if(defaultDatas) {
+				var $sTree = $('#' + el1).treeview({
+					color: "#1ab394",
+					selectedBackColor: '#1ab394',
+					expandIcon: 'glyphicon glyphicon-chevron-right',
+					collapseIcon: 'glyphicon glyphicon-chevron-down',
+					nodeIcon: 'fa fa-folder-o',
+					//selectedIcon: "glyphicon glyphicon-stop",
+					//icon: "glyphicon glyphicon-stop",
+					//emptyIcon: 'glyphicon',
+					//showCheckbox: true,
+					selectable: true,
+					state: {
+						selected: true
+					},
+					data: defaultDatas,
+					onNodeSelected: function(event, node) {
+						$sTree.treeview('clearSearch');
+						$('#' + el2).val(node.text);
+						$('#' + el2).attr('data-id', node.id);
+						$('#' + el1).removeClass('show').addClass('hidden');
+					},
+					onNodeUnselected: function(event, node) {
+						$('#' + el2).attr('data-id', 0);
+						$('#' + el2).attr('placeholder', '请选择客户归属部门');
+					}
+				});
+//				$('#' + el1).treeview('collapseAll', {
+//					silent: true
+//				});
+				$('#' + el1).treeview('expandAll', { levels: 2, silent: true });
+				var findSNodes = function() {
+					return $sTree.treeview('search', [$('#' + el2).val(), {
+						ignoreCase: false,
+						exactMatch: false
+					}]);
+				};
+				$('#' + el2).on('keyup focus', function(e) {
+					var selectableNodes = findSNodes();
+					//var m = $('#' + el1).treeview('getParent', selectableNodes);
+					//$('#' + el1).treeview('selectNode', [ m, { silent: true } ]);
+				});
+			}
+			dtd.resolve(); // 改变Deferred对象的执行状态
+		}
+	})
+	return dtd.promise(); // 返回promise对象
+}
+
+
 //验证(所有 input.form-control)的方法
 function valideInput() {
 	var _that = $(this);
 	//console.log($(this).attr('id'));
 	switch ($(this).attr('id')) {
-		case 'customer_key': //验证关键词
-			valideMethods(_that, regexs.chOrenOrnum, '格式不正确（只能输入中文、英文、数字）！', false);
-			break;
 		case 'customer_code': //验证客户编号
 			valideMethods(_that, regexs.chOrenOrnum, '格式不正确（只能输入中文、英文、数字）！', false);
 			break;
@@ -406,9 +485,6 @@ function valideInput() {
 		case 'customer_layer': //验证 客户信誉等级
 			valideMethods(_that, regexs.chOrenOrnum, '格式不正确（只能输入中文、英文、数字）！', true);
 			break;
-		case 'customer_bedept': //验证 客户归属部门
-			valideMethods(_that, regexs.chOrenOrnum, '格式不正确（只能输入中文、英文、数字）！', true);
-			break;
 		case 'customer_berelatedAcc': //客户归属涉税会计
 			valideMethods(_that, regexs.chOrenOrnum, '格式不正确（只能输入中文、英文、数字）！', true);
 			break;

CallCenterWeb.UI/keHuManager/js/cusDetails.js

@@ -23,7 +23,7 @@ function getCustomer(ids) {
 				$('#customer_companyname').text(cusBase.F_CompanyName); //string 公司名称
 				$('#customer_comaddress').text(cusBase.F_CompanyAddress); //string 公司地址
 				$('#customer_legalName').text(cusBase.F_LegalName); //string 法人姓名
-				$('#customer_lehalTel').text(cusBase.F_LegalTel); //string 法人电话
+				$('#customer_lehalTel').text(helper.filter.cutTel(cusBase.F_LegalTel)); //string 法人电话
 				$('#customer_subtrade').text(cusBase.F_SubTrade); // int 所属行业
 				$('#customer_taxCategory').text(cusBase.F_TaxCategory); // int 税务类别
 				$('#customer_taxPointDes').text(cusBase.F_TaxPointDes); //string 税点描述
@@ -49,7 +49,7 @@ function getCustomer(ids) {
 										'</li>'+
 										'<li class="col-md-3 col-sm-4">' +
 											'<label>电话：</label>' +
-											'<span>'+ cusLists[i].F_Telephone +'</span>' +
+											'<span>'+ helper.filter.cutTel(cusLists[i].F_Telephone) +'</span>' +
 										'</li>'+
 										'<li class="col-md-3 col-sm-4">' +
 											'<label>邮箱：</label>' +

CallCenterWeb.UI/keHuManager/js/customerInfo.js

@@ -141,6 +141,18 @@ function btn_addCus(editId) {
 	});
 }
 
+//导入客户信息
+function btn_export() {
+	layer.open({
+		maxmin: true, //开启最大化最小化按钮
+		type: 2,
+		content: "../commonTpl/importCustomers.html", //iframe的url，no代表不显示滚动条
+		title: '导入客户信息',
+		area: ['50%', '55%'], //宽高
+	});
+}
+
+
 //批量删除
 function btn_deletes() {
 	var ids = $.map($('#cusList').bootstrapTable('getSelections'),