...
|
...
|
@@ -32,8 +32,9 @@ class AdminOrderController extends AdminBaseController{ |
|
|
public function index(){
|
|
|
$param=$this->request->param();
|
|
|
$where=array();
|
|
|
$where['a.state']=['in',[2,3]];
|
|
|
if (!empty($param['order_no'])){
|
|
|
$where['order_no']=['like','%'.$param['order_no'].'%'];
|
|
|
$where['a.order_no']=['like','%'.$param['order_no'].'%'];
|
|
|
}
|
|
|
if (!empty($param['mobile'])){
|
|
|
$where['u.mobile']=['like','%'.$param['mobile'].'%'];
|
...
|
...
|
@@ -41,20 +42,23 @@ class AdminOrderController extends AdminBaseController{ |
|
|
if (!empty($param['users_id'])){
|
|
|
$where['u.id']=$param['users_id'];
|
|
|
}
|
|
|
$where['state']=['in',[2,3]];
|
|
|
if (!empty($param['state'])){
|
|
|
$where['a.state']=$param['state'];
|
|
|
}
|
|
|
$Order=new OrderModel();
|
|
|
$data=$Order->alias('a')
|
|
|
->join('users u','a.users_id=u.id')
|
|
|
// ->field('a.*,b.serial_number,b.hospital')
|
|
|
// ->join('equipment b','a.eq_name=b.name')
|
|
|
->where($where)
|
|
|
->order('end_time','desc')
|
|
|
->order('a.end_time','desc')
|
|
|
->paginate(10);
|
|
|
$this->assign('data',$data);
|
|
|
$this->assign('hospital', isset($param['hospital']) ? $param['hospital'] : '');
|
|
|
$this->assign('order_no', isset($param['order_no']) ? $param['order_no'] : '');
|
|
|
$this->assign('mobile', isset($param['mobile']) ? $param['mobile'] : '');
|
|
|
$this->assign('users_id', isset($param['users_id']) ? $param['users_id'] : '');
|
|
|
$this->assign('state', isset($param['state']) ? $param['state'] : '');
|
|
|
$this->assign('start_number', isset($param['start_number']) ? $param['start_number'] : '');
|
|
|
$this->assign('end_number', isset($param['end_number']) ? $param['end_number'] : '');
|
|
|
return $this->fetch();
|
...
|
...
|
|