工单处理-过滤工单处理日志

app/Filters/WorkOrderFilters.php

@@ -12,6 +12,7 @@ use App\Shop;
 use App\Traits\ModelSearchWay;
 use App\User;
 use App\WorkOrder;
+use App\WorkOrderProcessLog;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
@@ -48,6 +49,7 @@ class WorkOrderFilters
         'log_content',
         'tags',
         'shop_name',
+        'work_order_process_log',
     ];
     protected $array_filter;
     protected $params = [];
@@ -59,8 +61,7 @@ class WorkOrderFilters
     protected $orderIssueLogQuery;
     protected $orderIssueQuery;
     protected $shopQuery;
-
-
+    protected $workOrderProcessLogQuery;
 
     public function __construct(Request $request)
     {
@@ -181,6 +182,11 @@ class WorkOrderFilters
         if ($this->orderIssueQuery){
             $this->queryBuilder->whereIn('work_orders.order_id', $this->orderIssueQuery);
         }
+
+        if($this->workOrderProcessLogQuery){
+            $this->queryBuilder->whereIn('work_orders.id', $this->workOrderProcessLogQuery);
+        }
+
         $this->orderByTag();
     }
 
@@ -246,6 +252,14 @@ class WorkOrderFilters
         return $this->shopQuery;
     }
 
+    public function getWorkOrderProcessLogQuery(): Builder
+    {
+        if (!$this->workOrderProcessLogQuery){
+            $this->workOrderProcessLogQuery = WorkOrderProcessLog::query()->select('work_order_id');
+        }
+        return $this->workOrderProcessLogQuery;
+    }
+
     public function id($id)
     {
         if (is_array($id)) $this->queryBuilder->whereIn('work_orders.id', $id);
@@ -404,4 +418,9 @@ class WorkOrderFilters
     {
         $this->searchWay($this->getShopQuery(),$shop_name,'shops.name');
     }
+
+    public function work_order_process_log($work_order_process_log)
+    {
+        $this->searchWay($this->getWorkOrderProcessLogQuery(),$work_order_process_log,'work_order_process_logs.content');
+    }
 }

resources/views/order/workOrder/index.blade.php

@@ -600,6 +600,7 @@
                         ],
                     },
                     {name: 'shop_name', type: 'input', placeholder: '商铺名'},
+                    {name: 'work_order_process_log', type: 'input', placeholder: '工单处理日志'},
                 ]];
                 this.form = new query({
                     el: '#form_div',