客户 客户收藏 办公楼 商铺区分

application/app_broker/view/index/daily_achieve_dz.html

@@ -59,7 +59,7 @@
 								<tr>
 									<td>跟进</td>
 									<td><input type="number" placeholder="填写"  /></td>
-									<td>{{daikan}}</td>
+									<td>{{genjing_day}}</td>
 									<td><input type="number" placeholder="填写"  /></td>
 									<td><input type="number" placeholder="填写"  /></td>
 								</tr>

application/app_broker/view/index/daily_achieve_ywy.html

@@ -60,7 +60,7 @@
 								<tr>
 									<td>跟进</td>
 									<td><input type="number" placeholder="填写"  /></td>
-									<td>{{daikan}}</td>
+									<td>{{genjing_day}}</td>
 									<td><input type="number" placeholder="填写"  /></td>
 									<td><input type="number" placeholder="填写"  /></td>
 								</tr>

public/app/js/daily_achieve_dz.js

@@ -17,6 +17,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 			keyuan: 0,
 			daikan: 0,
 			yeji_day: 0,
+			genjing_day:0,
 			dateNow: backNowDate(),
 			yeji_yue_mubiao: '',
 			yeji_yue_wancheng: 0,
@@ -114,6 +115,10 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 								_this.fangyuan = _data.data.house_num;
 								_this.keyuan = _data.data.add_user_num_day;
 								_this.daikan = _data.data.follow_up_num;
+								_this.genjing_day = _data.data.phone_follow_up_num;//店长 日报跟进 日数据
+								//团队日数据
+								
+								
 								_this.yeji_day = _data.data.performance_day;
 								if(_data.data.agent_total>0){
 									_this.peopleNum = Number(_data.data.agent_total);

public/app/js/daily_achieve_ywy.js

@@ -17,6 +17,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 			daikan: 0,
 			keyuan_day: 0,
 			yeji_day: 0,
+			genjing_day:0,
 			dateNow: backNowDate(),
 			yeji_yue_mubiao: '',
 			yeji_yue_wancheng: 0,
@@ -108,6 +109,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 								_this.daikan = _data.data.follow_up_num;
 								_this.keyuan_day = _data.data.add_user_num_day;
 								_this.yeji_day = _data.data.performance_day;
+								_this.genjing_day = _data.data.phone_follow_up_num;//业务员 日报跟进
 								_this.yeji_yue_wancheng = _data.data.performance_month;
 								_this.chengjiao_yue_wancheng = _data.data.bargain_sum;
 								_this.fangyuan_yue_wancheng = _data.data.house_num_month;

public/resource/js/myCollectionUserList.js

@@ -39,6 +39,7 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home
 		user_id_edit_introduce:'',
 		isAjaxSaving: false,
 		customerInfo: {},
+		entrust_type_list:0,//商铺 办公楼
 		init: function() {
 			//初始化dot
 			$("body").append(template);
@@ -83,6 +84,11 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home
 				e.stopPropagation();
 				var _this = $(this);
 				_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
+				if($(this).index() == 0){
+					user.entrust_type_list=0;
+				}else if($(this).index() == 1){
+					user.entrust_type_list=1;
+				}
 				user.getList(1);
 			});
 			//约带看列表 点击新增商铺
@@ -1459,6 +1465,9 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home
             user.pageNo   = pageNo;
             console.log(user_info_obj);
             var params    = {};
+            //商铺 办公楼
+            
+            params.entrust_type = user.entrust_type_list;
             params.agents_id   = user_info_obj.id;
             params.pageNo   = user.pageNo;
             params.pageSize = user.pageSize;

public/resource/js/user.js

@@ -57,6 +57,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
         pageNoUser:1,//客户详情 客户动态初始化分页
 		moreUser:0,//标识点击加载更多 还有没有数据
         agent_id_phone:'',
+        entrust_type_list:0,
 		init: function() {
 			//初始化dot
 			$("body").append(template);
@@ -168,6 +169,13 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 				e.stopPropagation();
 				var _this = $(this);
 				_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
+				if($(this).index() == 0){
+					user.entrust_type_list=0;
+				}else if($(this).index() == 1){
+					user.entrust_type_list=1;
+				}else{
+					user.entrust_type_list='';
+				}
 				user.getList(1);
 			});
 			
@@ -1897,6 +1905,8 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 			var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 			user.pageNo = pageNo;
 			var params = {};
+			//区分全部 商铺 办公楼
+			params.entrust_type=user.entrust_type_list;
 			params.agent_id_for_bind=user_info_obj.id;
 			params.agent_id = user.all_custom ? '' : user_info_obj.id ;
 			params.user_name = $.trim($("input[name='user']").val());