正在显示
2 个修改的文件
包含
26 行增加
和
25 行删除
@@ -15,33 +15,28 @@ class SalesmanController extends AdminBaseController{ | @@ -15,33 +15,28 @@ class SalesmanController extends AdminBaseController{ | ||
15 | $where = [ | 15 | $where = [ |
16 | 'a.status' => 2 | 16 | 'a.status' => 2 |
17 | ]; | 17 | ]; |
18 | - if(!empty($param['start_time']) && !empty($param['end_time'])){ | ||
19 | - $start_time = strtotime($param['start_time']); | ||
20 | - $end_time = strtotime($param['end_time']); | ||
21 | - $where['audit_time'] = [['>=',$start_time],['<=',$end_time]]; | ||
22 | - } | 18 | +// if(!empty($param['start_time']) && !empty($param['end_time'])){ |
19 | +// $start_time = strtotime($param['start_time']); | ||
20 | +// $end_time = strtotime($param['end_time']); | ||
21 | +// $where['audit_time'] = [['>=',$start_time],['<=',$end_time]]; | ||
22 | +// } | ||
23 | if(!empty($param['keyword'])){ | 23 | if(!empty($param['keyword'])){ |
24 | $keyword = $param['keyword']; | 24 | $keyword = $param['keyword']; |
25 | - $where['b.phone'] = $keyword; | 25 | + $where['b.phone|u.user_nickname'] = ['like','%'.$keyword.'%']; |
26 | + } | ||
27 | + if(!empty($param['id'])){ | ||
28 | + $where['a.id'] = ['eq',$param['id']]; | ||
26 | } | 29 | } |
27 | $data = Db::name('my_user')->alias('a') | 30 | $data = Db::name('my_user')->alias('a') |
28 | - ->field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone") | 31 | + ->field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone,u.user_nickname") |
32 | + ->join('user u','a.uid = u.id','LEFT') | ||
29 | ->join('sale_audit b','a.uid = b.uid','LEFT') | 33 | ->join('sale_audit b','a.uid = b.uid','LEFT') |
30 | - ->where('a.status',2) | 34 | + ->where($where) |
31 | ->group('a.id') | 35 | ->group('a.id') |
32 | ->order(['a.balance'=>'DESC','a.create_time'=>'DESC']) | 36 | ->order(['a.balance'=>'DESC','a.create_time'=>'DESC']) |
33 | ->paginate(12); | 37 | ->paginate(12); |
34 | 38 | ||
35 | $data_arr = $data -> toArray(); | 39 | $data_arr = $data -> toArray(); |
36 | - /* array(1) { | ||
37 | - [0] => array(5) { | ||
38 | - ["uid"] => int(1) | ||
39 | - ["balance"] => string(6) "100.00" | ||
40 | - ["audit_time"] => int(1558509018) | ||
41 | - ["is_pro"] => int(1) | ||
42 | - ["phone"] => string(11) "18602699971" | ||
43 | - } | ||
44 | -}*/ | ||
45 | $data_money = Db::name('money_ratio') -> find(); | 40 | $data_money = Db::name('money_ratio') -> find(); |
46 | foreach ($data_arr['data'] as $key => $val){ | 41 | foreach ($data_arr['data'] as $key => $val){ |
47 | $data_user = Db::name('user') -> where('id',$val['uid']) -> find(); | 42 | $data_user = Db::name('user') -> where('id',$val['uid']) -> find(); |
@@ -55,6 +50,9 @@ class SalesmanController extends AdminBaseController{ | @@ -55,6 +50,9 @@ class SalesmanController extends AdminBaseController{ | ||
55 | } | 50 | } |
56 | $this -> assign('data_arr',$data_arr['data']); | 51 | $this -> assign('data_arr',$data_arr['data']); |
57 | $this -> assign('data',$data); | 52 | $this -> assign('data',$data); |
53 | + $this->assign('user_nickname',!empty($param['user_nickname']) ? $param['user_nickname'] : ''); | ||
54 | + $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : ''); | ||
55 | + $this->assign('id',!empty($param['id']) ? $param['id'] : ''); | ||
58 | return $this -> fetch(); | 56 | return $this -> fetch(); |
59 | 57 | ||
60 | } | 58 | } |
@@ -12,16 +12,19 @@ | @@ -12,16 +12,19 @@ | ||
12 | <li class="active"><a href="#">业务员列表</a></li> | 12 | <li class="active"><a href="#">业务员列表</a></li> |
13 | </ul> | 13 | </ul> |
14 | <form class="well form-inline margin-top-20" method="post" action="{:url('Salesman/salesman_list')}"> | 14 | <form class="well form-inline margin-top-20" method="post" action="{:url('Salesman/salesman_list')}"> |
15 | - 时间: | ||
16 | - <input type="text" class="form-control js-bootstrap-datetime" name="start_time" | ||
17 | - value="{$start_time|default=''}" | ||
18 | - style="width: 140px;" autocomplete="off">- | ||
19 | - <input type="text" class="form-control js-bootstrap-datetime" name="end_time" | ||
20 | - value="{$end_time|default=''}" | ||
21 | - style="width: 140px;" autocomplete="off"> | 15 | +<!-- 时间:--> |
16 | +<!-- <input type="text" class="form-control js-bootstrap-datetime" name="start_time"--> | ||
17 | +<!-- value="{$start_time|default=''}"--> | ||
18 | +<!-- style="width: 140px;" autocomplete="off">- --> | ||
19 | +<!-- <input type="text" class="form-control js-bootstrap-datetime" name="end_time"--> | ||
20 | +<!-- value="{$end_time|default=''}"--> | ||
21 | +<!-- style="width: 140px;" autocomplete="off"> --> | ||
22 | + 序号: | ||
23 | + <input type="text" class="form-control" name="id" style="width: 200px;" | ||
24 | + value="{$id|default=''}" placeholder="请输入序号"> | ||
22 | 关键字: | 25 | 关键字: |
23 | <input type="text" class="form-control" name="keyword" style="width: 200px;" | 26 | <input type="text" class="form-control" name="keyword" style="width: 200px;" |
24 | - value="{$keyword|default=''}" placeholder="请输入手机号..."> | 27 | + value="{$keyword|default=''}" placeholder="请输入手机号/微信昵称"> |
25 | <input type="submit" class="btn btn-primary" value="搜索"/> | 28 | <input type="submit" class="btn btn-primary" value="搜索"/> |
26 | <a class="btn btn-danger" href="{:url('Salesman/salesman_list')}">清空</a> | 29 | <a class="btn btn-danger" href="{:url('Salesman/salesman_list')}">清空</a> |
27 | </form> | 30 | </form> |
-
请 注册 或 登录 后发表评论