正在显示
1 个修改的文件
包含
6 行增加
和
0 行删除
| @@ -28,6 +28,9 @@ class WorkOrderController extends BaseController | @@ -28,6 +28,9 @@ class WorkOrderController extends BaseController | ||
| 28 | 'workOrder.project:id,company', | 28 | 'workOrder.project:id,company', |
| 29 | ]) | 29 | ]) |
| 30 | ->where('manage_id', $this->manage['id']) | 30 | ->where('manage_id', $this->manage['id']) |
| 31 | + ->when($request->input('project_id'), function ($query) use ($request) { | ||
| 32 | + return $query->where('project_id', $request->input('project_id')); | ||
| 33 | + }) | ||
| 31 | ->when($request->input('status'), function ($query) use ($request) { | 34 | ->when($request->input('status'), function ($query) use ($request) { |
| 32 | return $query->where('status', $request->input('status')); | 35 | return $query->where('status', $request->input('status')); |
| 33 | }) | 36 | }) |
| @@ -59,6 +62,9 @@ class WorkOrderController extends BaseController | @@ -59,6 +62,9 @@ class WorkOrderController extends BaseController | ||
| 59 | 'logs.manager:id,name', | 62 | 'logs.manager:id,name', |
| 60 | 'project:id,company', | 63 | 'project:id,company', |
| 61 | ]) | 64 | ]) |
| 65 | + ->when($request->input('project_id'), function ($query) use ($request) { | ||
| 66 | + return $query->where('project_id', $request->input('project_id')); | ||
| 67 | + }) | ||
| 62 | ->when($request->input('status'), function ($query) use ($request) { | 68 | ->when($request->input('status'), function ($query) use ($request) { |
| 63 | return $query->where('status', $request->input('status')); | 69 | return $query->where('status', $request->input('status')); |
| 64 | }) | 70 | }) |
-
请 注册 或 登录 后发表评论