合并分支 'workorder' 到 'master'

company



查看合并请求 !2081

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