ajun 4 лет назад
Родитель
Сommit
635c2bafa2
2 измененных файлов с 11 добавлено и 9 удалено
  1. 9 0
      app/Filters/WorkOrderFilters.php
  2. 2 9
      resources/views/order/workOrder/index.blade.php

+ 9 - 0
app/Filters/WorkOrderFilters.php

@@ -6,11 +6,13 @@ namespace App\Filters;
 use App\Order;
 use App\OrderIssue;
 use App\OrderPackage;
+use App\Services\OwnerService;
 use App\Traits\ModelSearchWay;
 use App\User;
 use App\WorkOrder;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class WorkOrderFilters
 {
@@ -66,6 +68,13 @@ class WorkOrderFilters
     {
         if(isset($this->params['data']))
             $this->id(explode(',',$this->params['data']));
+
+        if (!isset($this->params['owner'])){
+            $owners = app(OwnerService::class)->getAuthorizedOwners();
+            $this->getOrderQuery()->whereIn('owner_id',$owners->map(function($item){
+                return $item->id;
+            }));
+        }
     }
 
     public function beforeApply()

+ 2 - 9
resources/views/order/workOrder/index.blade.php

@@ -265,6 +265,7 @@
                         tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的承运商'],
                         placeholder: ['承运商', '定位或多选承运商']
                     },
+                    @can('订单管理-订单问题件生成')
                     {
                         name: 'owner',
                         type: 'select_multiple_select',
@@ -272,16 +273,8 @@
                         tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的货主'],
                         placeholder: ['货主', '定位或多选货主']
                     },
+                    @endcan
                     {name: 'logistic_number', type: 'input', placeholder: '快递单号'},
-                    {
-                        name: 'grad',
-                        type: 'select',
-                        placeholder: '工单等级',
-                        data: [{name: 1, value: '一般'}, {name: 2, value: '重要'}, {name: 3, value: '紧急'}, {
-                            name: 4,
-                            value: '重要且紧急'
-                        },]
-                    },
                     {
                         name: 'is_issue_order',
                         type: 'select',