修改

application/index/view/remark/remark_follow_index.html

@@ -310,8 +310,8 @@
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
 												<span class="fore-span ld-Marheight">-</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_name" placeholder="客户姓名" type="text" value="">
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_phone" placeholder="客户手机号" type="tel" value="">
+												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_name_id" placeholder="客户编号" type="text" value="">
+												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_phone" placeholder="客户手机号" type="tel" value="">-->
 												
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="follow_content" placeholder="跟进内容" type="text" value="">
 

public/resource/js/RemarkFollowIndex.js

@@ -827,18 +827,36 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
 			params.remark_phone = $.trim($("#remark_phone").val());
 			params.remark_store_id = $.trim($("#guest_stores").val());
 			params.remark_district_id = $.trim($("#district_id").val());
+			if(params.remark_name.length == 1){
+				alert('跟进人姓名的搜索必须2字及2字以上');
+				return;
+			}
 			if($('#user_city_choose').val() == 310100){//城市
 			   params.city = '上海市';
 			}
 			if($('#user_city_choose').val() == 330100){
 			   params.city = '杭州市';	
 			}
+			params.user_id = $.trim($("#customer_name_id").val());//区域
 			params.disc = $.trim($("#user_area_choose").val());//区域
 			_startDateObj.val() != '' && (params.start_date = _startDateObj.val());
 			_endDateObj.val() != '' && (params.end_date = _endDateObj.val());
 			$.trim(_customerNameObj.val()) != '' && (params.customer = $.trim(_customerNameObj.val()));
 			$.trim(_customerPhoneObj.val()) != '' && (params.phone = $.trim(_customerPhoneObj.val()));
 			$.trim(_followContentObj.val()) != '' && (params.content = $.trim(_followContentObj.val()));
+//			
+            var start_ = params.start_date+" 00:00:00";
+			date_start =new Date(Date.parse(start_.replace(/-/g, "/")));
+			var start_time =date_start.getTime();
+			var end_ = params.end_date+" 00:00:00";
+			
+			date_end =new Date(Date.parse(end_.replace(/-/g, "/")));
+			var end_time =date_end.getTime();
+			var cha_time=end_time-start_time;
+			if(cha_time > 2678400000){
+				alert("跟进时间搜索控制在30天以内");
+				return;
+			}
 			
 			$.ajax({
 			    type: 'GET',

public/resource/js/houseFollowUp.js

@@ -207,6 +207,12 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
 				return;
 				
 			}
+			
+			var cha_time=params.end_time*1000-params.start_time*1000;
+			if(cha_time > 2764800000){
+				alert("跟进时间搜索控制在30天以内");
+				return;
+			}
 			$.ajax({
 				type: 'POST',
 				url: '/broker/houseFollowUpList', //商铺跟进 对接接口