|
...
|
...
|
@@ -38,7 +38,7 @@ class AdminOrderController extends AdminBaseController{ |
|
|
|
$where['a.order_no']=['like','%'.$param['order_no'].'%'];
|
|
|
|
}
|
|
|
|
if (!empty($param['mobile'])){
|
|
|
|
$where['u.mobile']=['like','%'.$param['mobile'].'%'];
|
|
|
|
$where['u.phone']=['like','%'.$param['mobile'].'%'];
|
|
|
|
}
|
|
|
|
if (!empty($param['users_id'])){
|
|
|
|
$where['u.id']=$param['users_id'];
|
|
...
|
...
|
@@ -51,9 +51,9 @@ class AdminOrderController extends AdminBaseController{ |
|
|
|
->join('users u','a.users_id=u.id')
|
|
|
|
// ->field('a.*,b.serial_number,b.hospital')
|
|
|
|
// ->join('equipment b','a.eq_name=b.name')
|
|
|
|
->field('a.*')
|
|
|
|
->field('a.*')
|
|
|
|
->where($where)
|
|
|
|
->order('a.end_time','desc')
|
|
|
|
->order('a.end_time','desc')
|
|
|
|
->paginate(10);
|
|
|
|
$this->assign('data',$data->appends($param));
|
|
|
|
$this->assign('hospital', isset($param['hospital']) ? $param['hospital'] : '');
|
...
|
...
|
|
