|
...
|
...
|
@@ -28,6 +28,9 @@ class WorkOrderController extends BaseController |
|
|
|
'workOrder.project:id,company',
|
|
|
|
])
|
|
|
|
->where('manage_id', $this->manage['id'])
|
|
|
|
->when($request->input('project_id'), function ($query) use ($request) {
|
|
|
|
return $query->where('project_id', $request->input('project_id'));
|
|
|
|
})
|
|
|
|
->when($request->input('status'), function ($query) use ($request) {
|
|
|
|
return $query->where('status', $request->input('status'));
|
|
|
|
})
|
|
...
|
...
|
@@ -59,6 +62,9 @@ class WorkOrderController extends BaseController |
|
|
|
'logs.manager:id,name',
|
|
|
|
'project:id,company',
|
|
|
|
])
|
|
|
|
->when($request->input('project_id'), function ($query) use ($request) {
|
|
|
|
return $query->where('project_id', $request->input('project_id'));
|
|
|
|
})
|
|
|
|
->when($request->input('status'), function ($query) use ($request) {
|
|
|
|
return $query->where('status', $request->input('status'));
|
|
|
|
})
|
...
|
...
|
|