|
...
|
...
|
@@ -28,10 +28,10 @@ class WorkOrderController extends BaseController |
|
|
|
'workOrder.project:id,company',
|
|
|
|
])
|
|
|
|
->where('manage_id', $this->manage['id'])
|
|
|
|
->when($request->filled('status'), function ($query) use ($request) {
|
|
|
|
->when($request->input('status'), function ($query) use ($request) {
|
|
|
|
return $query->where('status', $request->input('status'));
|
|
|
|
})
|
|
|
|
->when($request->filled('search'), function ($query) use ($request) {
|
|
|
|
->when($request->input('search'), function ($query) use ($request) {
|
|
|
|
return $query->whereHas('workOrder', function ($q) use ($request) {
|
|
|
|
$q->where('product', 'like', '%' . $request->input('search') . '%')
|
|
|
|
->orWhere('content', 'like', '%' . $request->input('search') . '%');
|
|
...
|
...
|
@@ -59,10 +59,10 @@ class WorkOrderController extends BaseController |
|
|
|
'logs.manager:id,name',
|
|
|
|
'project:id,company',
|
|
|
|
])
|
|
|
|
->when($request->filled('status'), function ($query) use ($request) {
|
|
|
|
->when($request->input('status'), function ($query) use ($request) {
|
|
|
|
return $query->where('status', $request->input('status'));
|
|
|
|
})
|
|
|
|
->when($request->filled('search'), function ($query) use ($request) {
|
|
|
|
->when($request->input('search'), function ($query) use ($request) {
|
|
|
|
return $query->where('product', 'like', '%' . $request->input('search') . '%')
|
|
|
|
->orWhere('content', 'like', '%' . $request->input('search') . '%');
|
|
|
|
})
|
|
...
|
...
|
@@ -115,7 +115,7 @@ class WorkOrderController extends BaseController |
|
|
|
}
|
|
|
|
$workOrder = $log->workOrder;
|
|
|
|
$result = DB::transaction(function () use ($request, $workOrder, $log) {
|
|
|
|
if ($request->filled('engineer_ids'))
|
|
|
|
if ($request->input('engineer_ids'))
|
|
|
|
{
|
|
|
|
// 有邀请工程师协同处理
|
|
|
|
foreach ($request->input('engineer_ids') as $engineer_id)
|
...
|
...
|
|
