Merge branch 'test'

application/index/view/member/users_list.html

@@ -440,7 +440,7 @@
 												<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">
-												<select class="form-control btn2 ld-Marheight" name="public_status">
+												<select class="form-control btn2 ld-Marheight" name="public_status" id='publicStatus'>
 													<option value="2">客户状态</option>
 													<option value="0">求租</option>
 													<option value="1">已租</option>
@@ -469,8 +469,8 @@
 													<option value="3">60㎡-100㎡</option>
 													<option value="4">100㎡以上</option>
 												</select>
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" name="userID" placeholder="客户ID" type="text" value="">
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" name="phone" placeholder="客户手机号" type="text" value="">
+												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" name="userID" placeholder="客户ID" type="text" value="" id='userId'>
+												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" name="phone" placeholder="客户手机号" type="text" value="" id='userPhone'>
 												
 												<br/>
 												<div class="col-xs-12 main-select" style="padding:0px">										

public/resource/js/user.js

@@ -201,6 +201,15 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 				user.agent_id_phone='';
 				
 			});
+			//输入客户id 客户手机号  置空客户状态
+			_doc.on('input', '#userId,#userPhone', function() {
+				if($('#userId').val() || $('#userPhone').val()){
+				  $('#publicStatus').val(2);
+				}else{
+				  $('#publicStatus').val(0);
+				}
+
+             });
 		   //客户列表 客户绑定记录
 			_doc.on('click', '.relationalRecord ', function(e) {
 				e.preventDefault();