|
...
|
...
|
@@ -25,7 +25,7 @@ class WorkOrderController extends BaseController |
|
|
|
# manage_id 或 engineer_id 是我
|
|
|
|
$lists = WorkOrderLog::with([
|
|
|
|
'workOrder.logs.manager:id,name',
|
|
|
|
'workOrder.project:id,company',
|
|
|
|
'workOrder.project:id,company,title',
|
|
|
|
])
|
|
|
|
->where('manage_id', $this->manage['id'])
|
|
|
|
->when($request->input('project_id') !== null, function ($query) use ($request) {
|
|
...
|
...
|
@@ -65,7 +65,7 @@ class WorkOrderController extends BaseController |
|
|
|
'manager:id,name',
|
|
|
|
'engineer:id,name',
|
|
|
|
'logs.manager:id,name',
|
|
|
|
'project:id,company',
|
|
|
|
'project:id,company:title',
|
|
|
|
])
|
|
|
|
->when($request->input('project_id') !== null, function ($query) use ($request) {
|
|
|
|
return $query->where('project_id', $request->input('project_id'));
|
|
...
|
...
|
@@ -95,7 +95,7 @@ class WorkOrderController extends BaseController |
|
|
|
'user:id,name',
|
|
|
|
'manager:id,name',
|
|
|
|
'engineer:id,name',
|
|
|
|
'project:id,company',
|
|
|
|
'project:id,company:title',
|
|
|
|
])->find($id);
|
|
|
|
|
|
|
|
if (!$workOrder)
|
...
|
...
|
|
