Commit ac0a79c3 by 赵增煜

bug修复

parent 790ca82a
...@@ -31,8 +31,9 @@ protected function grid() ...@@ -31,8 +31,9 @@ protected function grid()
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->panel(); // 更改为 panel 布局 $filter->panel(); // 更改为 panel 布局
$filter->expand(); // 默认展开搜索框 $filter->expand(); // 默认展开搜索框
$filter->like('pharmacy_name')->width(3); $filter->like('pharmacy_name')->width(3);
$filter->between('created_at', '创建时间')->date()->width(3);
}); });
// 行按钮控制 // 行按钮控制
......
...@@ -24,15 +24,15 @@ public function patientList(Request $request) ...@@ -24,15 +24,15 @@ public function patientList(Request $request)
$authInfo = auth('api')->user(); $authInfo = auth('api')->user();
$query = PatientModel::query(); $query = PatientModel::query();
if ($authInfo->last_login_type == User::LOGIN_TYPE_USER) { // 用户 if ($authInfo->last_login_type == User::LOGIN_TYPE_USER) { // 用户
$query = $query->where('user_id', $authInfo->id); $query->where('user_id', $authInfo->id);
} elseif ($authInfo->last_login_type == User::LOGIN_TYPE_PHARMACY) { // 药店 } elseif ($authInfo->last_login_type == User::LOGIN_TYPE_PHARMACY) { // 药店
$pharmacy = PharmacyModel::query()->where('user_id', $authInfo->id)->first(); $pharmacy = PharmacyModel::query()->where('user_id', $authInfo->id)->first();
$query = $query->where('pharmacy_id', $pharmacy->id); $query->where('pharmacy_id', $pharmacy->id);
} }
$search_input = $request->input('search_input'); $search_input = $request->input('search_input');
if ($search_input) { if ($search_input) {
$query->where('id_card', 'like', "%{$search_input}%") $query->where('id_card', 'like', "%{$search_input}%");
->orWhere('name', 'like', "%{$search_input}%"); $query->orWhere('name', 'like', "%{$search_input}%");
// ->orWhere('mobile', 'like', "%{$search_input}%"); // ->orWhere('mobile', 'like', "%{$search_input}%");
} }
// 分页 // 分页
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment