工单->添加退回状态筛选

app/Filters/WorkOrderFilters.php

@@ -4,6 +4,7 @@
 namespace App\Filters;
 
 use App\Order;
+use App\OrderDetail;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use App\OrderIssueType;
@@ -50,6 +51,7 @@ class WorkOrderFilters
         'tags',
         'shop_name',
         'work_order_process_log',
+        'rejectingStatus'
     ];
     protected $array_filter;
     protected $params = [];
@@ -62,6 +64,7 @@ class WorkOrderFilters
     protected $orderIssueQuery;
     protected $shopQuery;
     protected $workOrderProcessLogQuery;
+    protected $orderDetailQuery;
 
     public function __construct(Request $request)
     {
@@ -171,6 +174,10 @@ class WorkOrderFilters
             $this->queryBuilder->whereIn('order_id', $this->orderPackageQuery);
         }
 
+        if($this->orderDetailQuery){
+            $this->queryBuilder->whereIn('order_id',$this->orderDetailQuery);
+        }
+
         if ($this->orderQuery) {
             $this->queryBuilder->whereIn('order_id', $this->orderQuery);
         }
@@ -259,6 +266,13 @@ class WorkOrderFilters
         }
         return $this->workOrderProcessLogQuery;
     }
+    public function getOrderDetailQuery(): Builder
+    {
+        if (!$this->orderDetailQuery){
+            $this->orderDetailQuery = OrderDetail::query()->select('order_id');
+        }
+        return $this->orderDetailQuery;
+    }
 
     public function id($id)
     {
@@ -423,4 +437,9 @@ class WorkOrderFilters
     {
         $this->searchWay($this->getWorkOrderProcessLogQuery(),$work_order_process_log,'work_order_process_logs.content');
     }
+
+    public function rejectingStatus($rejectingStatus)
+    {
+        $this->getOrderDetailQuery()->where('rejecting_status',$rejectingStatus);
+    }
 }

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

@@ -641,6 +641,16 @@
                     },
                     {name: 'shop_name', type: 'input', placeholder: '商铺名'},
                     {name: 'work_order_process_log', type: 'input', placeholder: '工单处理日志'},
+                    {name:"rejectingStatus",type:'select', placeholder: '退单状态',
+                        data:[
+                            {name: '无', value: '无'},
+                            {name: '未退回', value: '未退回'},
+                            {name: '全部退回', value: '全部退回'},
+                            {name: '部分退回', value: '部分退回'},
+                            {name: '差异退回', value: '差异退回'},
+                            {name: '超量退回', value: '超量退回'},
+                        ]
+                    }
                 ]];
                 this.form = new query({
                     el: '#form_div',