正在显示
1 个修改的文件
包含
5 行增加
和
5 行删除
| @@ -28,10 +28,10 @@ class WorkOrderController extends BaseController | @@ -28,10 +28,10 @@ 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->filled('status'), function ($query) use ($request) { | 31 | + ->when($request->input('status'), function ($query) use ($request) { |
| 32 | return $query->where('status', $request->input('status')); | 32 | return $query->where('status', $request->input('status')); |
| 33 | }) | 33 | }) |
| 34 | - ->when($request->filled('search'), function ($query) use ($request) { | 34 | + ->when($request->input('search'), function ($query) use ($request) { |
| 35 | return $query->whereHas('workOrder', function ($q) use ($request) { | 35 | return $query->whereHas('workOrder', function ($q) use ($request) { |
| 36 | $q->where('product', 'like', '%' . $request->input('search') . '%') | 36 | $q->where('product', 'like', '%' . $request->input('search') . '%') |
| 37 | ->orWhere('content', 'like', '%' . $request->input('search') . '%'); | 37 | ->orWhere('content', 'like', '%' . $request->input('search') . '%'); |
| @@ -59,10 +59,10 @@ class WorkOrderController extends BaseController | @@ -59,10 +59,10 @@ class WorkOrderController extends BaseController | ||
| 59 | 'logs.manager:id,name', | 59 | 'logs.manager:id,name', |
| 60 | 'project:id,company', | 60 | 'project:id,company', |
| 61 | ]) | 61 | ]) |
| 62 | - ->when($request->filled('status'), function ($query) use ($request) { | 62 | + ->when($request->input('status'), function ($query) use ($request) { |
| 63 | return $query->where('status', $request->input('status')); | 63 | return $query->where('status', $request->input('status')); |
| 64 | }) | 64 | }) |
| 65 | - ->when($request->filled('search'), function ($query) use ($request) { | 65 | + ->when($request->input('search'), function ($query) use ($request) { |
| 66 | return $query->where('product', 'like', '%' . $request->input('search') . '%') | 66 | return $query->where('product', 'like', '%' . $request->input('search') . '%') |
| 67 | ->orWhere('content', 'like', '%' . $request->input('search') . '%'); | 67 | ->orWhere('content', 'like', '%' . $request->input('search') . '%'); |
| 68 | }) | 68 | }) |
| @@ -115,7 +115,7 @@ class WorkOrderController extends BaseController | @@ -115,7 +115,7 @@ class WorkOrderController extends BaseController | ||
| 115 | } | 115 | } |
| 116 | $workOrder = $log->workOrder; | 116 | $workOrder = $log->workOrder; |
| 117 | $result = DB::transaction(function () use ($request, $workOrder, $log) { | 117 | $result = DB::transaction(function () use ($request, $workOrder, $log) { |
| 118 | - if ($request->filled('engineer_ids')) | 118 | + if ($request->input('engineer_ids')) |
| 119 | { | 119 | { |
| 120 | // 有邀请工程师协同处理 | 120 | // 有邀请工程师协同处理 |
| 121 | foreach ($request->input('engineer_ids') as $engineer_id) | 121 | foreach ($request->input('engineer_ids') as $engineer_id) |
-
请 注册 或 登录 后发表评论