equipment

@@ -54,8 +54,15 @@ class AdminEquipmentController extends AdminBaseController{
             $where['create_time']=['between',[strtotime($param['start_time']),strtotime($param['end_time'])]];
             $where['create_time']=['between',[strtotime($param['start_time']),strtotime($param['end_time'])]];
         }
         }
         $Equipment=new EquipmentModel();
         $Equipment=new EquipmentModel();
-        $data=$Equipment->paginate(10);
+        $data=$Equipment->where($where)->paginate(10,false,['query'=>$param]);
         $this->assign('data',$data);
         $this->assign('data',$data);
+        $this->assign('name', isset($param['name']) ? $param['name'] : '');
+        $this->assign('hospital', isset($param['hospital']) ? $param['hospital'] : '');
+        $this->assign('note', isset($param['note']) ? $param['note'] : '');
+        $this->assign('start_number', isset($param['start_number']) ? $param['start_number'] : '');
+        $this->assign('end_number', isset($param['end_number']) ? $param['end_number'] : '');
+        $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
+        $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
         return $this->fetch();
         return $this->fetch();
     }
     }