问题件添加仓库筛选和查询

app/Filters/WorkOrderFilters.php

@@ -61,6 +61,7 @@ class WorkOrderFilters
         'user_work_group_id',
         'rejecting_status',
         'custom_rejected_status',
+        'warehouse'
     ];
     protected $array_filter;
     protected $params = [];
@@ -503,4 +504,8 @@ class WorkOrderFilters
     {
         $this->queryBuilder->where('custom_rejected_status',$custom_rejected_status);
     }
+
+    public function warehouse($warehouseIds){
+        $this->searchWay($this->getOrderQuery(),$warehouseIds,'orders.warehouse_id');
+    }
 }

app/Http/Controllers/WorkOrderController.php

@@ -14,6 +14,7 @@ use App\Services\WorkOrderLogService;
 use App\Services\WorkOrderService;
 use App\UserOwnerGroup;
 use App\UserWorkgroup;
+use App\Warehouse;
 use App\WorkOrder;
 use App\WorkOrderDetail;
 use Illuminate\Http\Request;
@@ -79,9 +80,10 @@ class WorkOrderController extends Controller
 
         $userWorkgroup = UserWorkgroup::query()->select('id', 'name')->get();
         $userOwnerGroup = UserOwnerGroup::query()->select('id', 'name')->get();
+        $warehouses = Warehouse::all();
 
         $this->service->tags($workOrders);
-        return view('order.workOrder.index', compact('workOrders', 'logistics', 'orderIssueTypes', 'owners', 'userWorkgroup', 'userOwnerGroup'));
+        return view('order.workOrder.index', compact('workOrders', 'logistics', 'orderIssueTypes', 'owners', 'userWorkgroup', 'userOwnerGroup','warehouses'));
     }
 
     /**

app/WorkOrder.php

@@ -296,7 +296,7 @@ class WorkOrder extends Model
         },
             'reviewer',
             'order'=> function($query){
-                return $query->with('packages.commodities.commodity','shop');
+                return $query->with('packages.commodities.commodity','shop','warehouse');
             },
             'orderIssue' => function ($query) {
                 /** @var Builder $query */

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

@@ -123,6 +123,7 @@
                             @can('订单管理-工单处理-宝时编辑')
                                 <th style="min-width: 120px">问题件处理结果</th>
                             @endcan
+                            <th style="min-width: 120px">仓库</th>
                             @can('订单管理-工单处理-宝时编辑')
                                 <th style="min-width: 120px">承运商赔偿金额</th>
                                 <th style="min-width: 120px">承运商快递减免</th>
@@ -433,6 +434,9 @@
                                         @include('order.workOrder._issue_logs')
                                     </td>
                                 @endcan
+                                <td>
+                                    <span v-text="item.order.warehouse ? item.order.warehouse.name : ''"></span>
+                                </td>
                                 @can('订单管理-工单处理-宝时编辑')
                                     <td>
                                         <input type="number" class="form-control form-control-sm"
@@ -680,6 +684,10 @@
                     },
                     @endforeach
                 ],
+                warehouses:[@foreach($warehouses as $warehouse)
+                {
+                    name: '{{$warehouse->id}}', value: '{{$warehouse->name}}'
+                },@endforeach],
                 userWorkgroup: [
                         @foreach($userWorkgroup as $item)
                     {
@@ -980,6 +988,13 @@
                         },
                         // 项目责任方
                         {name: 'user_owner_group_id', type: 'select', placeholder: '项目责任方', data: this.userOwnerGroup},
+                        {
+                            name: 'warehouse',
+                            type: 'select_multiple_select',
+                            tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的仓库'],
+                            placeholder: ['仓库', '定位或多选仓库'],
+                            data: this.warehouses
+                        },
                     ],
                     [
                         // 退回标记