|
|
@@ -7,7 +7,6 @@ use App\Order;
|
|
|
use App\OrderIssue;
|
|
|
use App\OrderIssueType;
|
|
|
use App\OrderPackage;
|
|
|
-use App\Services\OwnerService;
|
|
|
use App\Traits\ModelSearchWay;
|
|
|
use App\User;
|
|
|
use App\WorkOrder;
|
|
|
@@ -20,6 +19,7 @@ class WorkOrderFilters
|
|
|
{
|
|
|
use ModelSearchWay;
|
|
|
|
|
|
+ /** @var Builder $queryBuilder */
|
|
|
protected $request;
|
|
|
protected $queryBuilder;
|
|
|
protected $filters = [
|
|
|
@@ -39,6 +39,7 @@ class WorkOrderFilters
|
|
|
'grad',
|
|
|
'owner',
|
|
|
'client_code',
|
|
|
+ 'is_end'
|
|
|
];
|
|
|
protected $array_filter;
|
|
|
protected $params = [];
|
|
|
@@ -98,9 +99,17 @@ class WorkOrderFilters
|
|
|
$this->afterFilterOwner($owner_ids);
|
|
|
|
|
|
$this->afterFileIssueType();
|
|
|
+
|
|
|
+ $this->filterWorkOrderStatus();
|
|
|
+ }
|
|
|
+
|
|
|
+ private function filterWorkOrderStatus()
|
|
|
+ {
|
|
|
+ if(!isset($this->params['is_end'])){
|
|
|
+ $this->queryBuilder->where('status','!=',4);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- // 可见货主过滤
|
|
|
private function afterFilterOwner($owner_ids)
|
|
|
{
|
|
|
if(Gate::allows('订单管理-工单处理-客服编辑') || Gate::allows('订单管理-工单处理-承运商编辑')){
|
|
|
@@ -110,7 +119,6 @@ class WorkOrderFilters
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 可见承运商过滤
|
|
|
private function afterFilterLogistic($owner_ids,$logistic_ids)
|
|
|
{
|
|
|
if(Gate::allows('订单管理-工单处理-客服编辑') || Gate::allows('订单管理-工单处理-货主编辑')){
|