|
|
@@ -109,12 +109,12 @@ class WaybillsController extends Controller
|
|
|
$waybills = $this->getWaybills();
|
|
|
$waybills=$this->conditionQuery($request,$waybills);
|
|
|
$carries = Carrier::get();
|
|
|
- $owners = Owner::get();
|
|
|
+ $owners = Owner::filterAuthorities()->get();
|
|
|
return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'']);
|
|
|
} else {
|
|
|
$waybills = $this->getWaybills()->paginate(50);
|
|
|
$carries = Carrier::get();
|
|
|
- $owners = Owner::get();
|
|
|
+ $owners = Owner::filterAuthorities()->get();
|
|
|
return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'']);
|
|
|
}
|
|
|
}
|
|
|
@@ -128,12 +128,12 @@ class WaybillsController extends Controller
|
|
|
|
|
|
$waybills=$this->conditionQuery($request,$waybills);
|
|
|
$carries = Carrier::get();
|
|
|
- $owners = Owner::get();
|
|
|
+ $owners = Owner::filterAuthorities()->get();
|
|
|
return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'ZF']);
|
|
|
} else {
|
|
|
$waybills = $this->getWaybills()->where('type','直发车')->paginate(50);
|
|
|
$carries = Carrier::get();
|
|
|
- $owners = Owner::get();
|
|
|
+ $owners = Owner::filterAuthorities()->get();
|
|
|
return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'ZF']);
|
|
|
|
|
|
}
|
|
|
@@ -147,12 +147,12 @@ class WaybillsController extends Controller
|
|
|
|
|
|
$waybills=$this->conditionQuery($request,$waybills);
|
|
|
$carries = Carrier::get();
|
|
|
- $owners = Owner::get();
|
|
|
+ $owners = Owner::filterAuthorities()->get();
|
|
|
return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'ZX']);
|
|
|
} else {
|
|
|
$waybills = $this->getWaybills()->where('type','专线')->paginate(50);
|
|
|
$carries = Carrier::get();
|
|
|
- $owners = Owner::get();
|
|
|
+ $owners = Owner::filterAuthorities()->get();
|
|
|
return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'ZX']);
|
|
|
|
|
|
}
|