xiugai

application/index/view/remark/remark_follow_index.html

@@ -347,9 +347,9 @@
 									<tr>
 										<td colspan="9">
 											<form id="form_search">
-												<select class="form-control btn2 ld-Marheight" id="user_area_choose">
+												<!--<select class="form-control btn2 ld-Marheight" id="user_area_choose">
                                                   <option value="" selected="selected">区域筛选</option>
-                                                </select>
+                                                </select>-->
 												<span class="fore-span ld-Marheight">跟进时间:</span>
 												<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>
@@ -359,11 +359,11 @@
 
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_name" placeholder="跟进人姓名" type="text" value="">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_phone" placeholder="跟进人手机号" type="text" value="">
-												<select class="form-control btn4 ld-Marheight input" name="" id="district_id">
+												<!--<select class="form-control btn4 ld-Marheight input" name="" id="district_id">
 													<option value="">跟进人所在部门</option>
 												</select>
 												<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores" value="">
-												</select>
+												</select>-->
 											    <div class="clear "></div>
 												<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
 												<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
@@ -486,7 +486,8 @@
 									</td>
 									<td>
 										<span class="fore-span">客户所属城市:</span>
-										<span class="user_details_city fore-span"></span>
+										<span class="shangpu_tags_area_detail fore-span">
+										
 									</td>
 									<td>
 										<span class="fore-span">昵称:</span>
@@ -852,14 +853,16 @@
 						<tr>
 							<td colspan="3">
 								<span class="fore-span ld-Marheight">客户所属城市:</span>
-								<select class="form-control btn4 ld-Marheight" id="user_city_edit">
+								<div class="col-sm-9 shangpu_tags_area_edit ld-Marheight">
+                                </div>
+								<!--<select class="form-control btn4 ld-Marheight" id="user_city_edit">
 		                          <option value="">请选择城市</option>
 		                          <option value="310100">上海市</option>
 		                          <option value="330100">杭州市</option>
 	                        	</select>
 		                    	<select class="form-control btn4 ld-Marheight" id="user_area_edit">
 		                          <option value="">请选择区域</option>
-		                        </select>
+		                        </select>-->
 							</td>
 						</tr>
 						<tr>

public/resource/js/RemarkFollowIndex.js

@@ -1330,13 +1330,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 							~data.data.user_info['site_ids'].indexOf(item.getAttribute('data-id')) && (item.checked = 'checked');
 									});
 							//获取 站点城市(详情)
-							var site_detail= '';
-							data.data.user_info['site_ids'] && $.each($('.roomTagDetail'), function(i, item) {
-								if(~data.data.user_info['site_ids'].indexOf(item.getAttribute('data-id'))){
-							       site_detail=item.value+','+site_detail  ;
-								}
-							});
-							$('.shangpu_tags_area_detail').show();
+						    $('.shangpu_tags_area_detail').show();
+							var site_detail= data.data.user_info.site_name.join(',');
 							$('.shangpu_tags_area_detail').html(site_detail);
 							var sw=function(s){
 								switch(Number(s))
@@ -1514,7 +1509,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 			        };
 			    },
 			    error: function() {
-			        alert('error 客户跟进列表');
+			        alert('error');
 			    },
 			    complete: function(){
 					user.isAjaxSaving = false;//请求结束，再改为初始状态