|
|
@@ -26,8 +26,9 @@ class BillHeader extends Controller
|
|
|
$were[] = ['i.is_deleted','=',0];
|
|
|
if($this->request->request('user_name')) $where[]= ['m.name','like','%'.$this->request->request('user_name').'%'];
|
|
|
if($this->request->request('title')) $where[]= ['i.title','like','%'.$this->request->request('title').'%'];
|
|
|
- $query->alias('i')->field('i.* ,m.headimg,m.name as user_name,m.phone')
|
|
|
- ->join('store_member m',' m.id = i.user_id ','LEFT');
|
|
|
+ $query->alias('i')->field('i.* ,t.title type_name,m.headimg,m.name as user_name,m.phone')
|
|
|
+ ->join('store_member m',' m.id = i.user_id ','LEFT')
|
|
|
+ ->join('bill_type b',' b.id = i.type ','LEFT');
|
|
|
if(!empty($where)) $query->where($where);
|
|
|
$query ->order('i.id desc')->page();
|
|
|
}
|
