1

public/resource/js/RemarkFollowIndex.js

@@ -1571,8 +1571,32 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 			}
 			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());
+			if(user.isTaday){
+            	var myDate = new Date();
+				var y = myDate.getFullYear();
+				var m = myDate.getMonth() + 1;
+				var d = myDate.getDate();
+				var day_end = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
+            	params.start_date = day_end;
+			    params.end_date = day_end;
+            	
+            }else{
+            	params.start_date = _startDateObj.val();
+			    params.end_date = _endDateObj.val();
+            	var time_=getTimeStamp(getBeforeDate(1));
+            	if(getTimeStamp(params.end_date) > time_){
+            		alert('选择的时间不能大于等于今天！！！');
+            		return;
+            	}
+            };
+			params.customer = $.trim(_customerNameObj.val());
+			params.phone = $.trim(_customerPhoneObj.val());
+			params.content = $.trim(_followContentObj.val());
+			
+			if(!params.start_date || !params.end_date){
+				alert('请您选择跟进时间！');
+				return;
+			};
 			$.trim(_customerNameObj.val()) != '' && (params.customer = $.trim(_customerNameObj.val()));
 			$.trim(_customerPhoneObj.val()) != '' && (params.phone = $.trim(_customerPhoneObj.val()));
 			$.trim(_followContentObj.val()) != '' && (params.content = $.trim(_followContentObj.val()));
@@ -1580,12 +1604,15 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 				alert('请您选择跟进时间！');
 				return;
 			};
+			//开始时间
             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天以内");

public/resource/js/user.js

@@ -1918,6 +1918,15 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 						var doTtmpl = doT.template(temp);
 						$("#users_list").html(doTtmpl(data.data.list));
 
+                    //显示优化
+					var _tempObj = $('.btn-default-show-caozuo');
+					$.each(_tempObj, function(i, v) {
+						var _$this = $(v);
+						_$this.nextAll().hide();//默认按钮只显示两个
+						if(_$this.index() == 0){
+							_$this.click();
+						}
+					});
 						/*分页代码*/
 						add_page(data.data.total, pageNo, user.pageSize, user.getList);
 						$("#total_page").html(data.data.total);