合并

app/Http/Controllers/PackageLogisticController.php

@@ -51,7 +51,7 @@ class PackageLogisticController extends Controller
             ->orderByDesc('id')
             ->simplePaginate($request->paginate ?? 50);
         $logistics = Logistic::all();
-        $owners = Owner::find($owner_ids);
+        $owners = app("OwnerService")->getIntersectPermitting();
         return view('package.logistic.index', compact('orderPackages', 'logistics', 'owners', 'paginateParams'));
     }
 

routes/web.php

@@ -495,22 +495,22 @@ Route::group(['prefix'=>'package'],function(){
         Route::any('export/{type}','WeighExceptedController@export');
     });
 
-        Route::any('export','WeighController@export');
+    Route::any('export','WeighController@export');
+    Route::get('statistics','WeighController@statistics');
+    Route::get('relating', function () {return view('package.measureMonitor.menu');});
+    Route::group(['prefix' => 'weigh'], function () {
         Route::get('statistics','WeighController@statistics');
-        Route::get('relating', function () {return view('package.measureMonitor.menu');});
-        Route::group(['prefix' => 'weigh'], function () {
-            Route::get('statistics','WeighController@statistics');
-            /** 统计 */
-            Route::group(['prefix'=>'statistics'],function(){
-                Route::any('export','WeighController@statisticsExport');
-            });
+        /** 统计 */
+        Route::group(['prefix'=>'statistics'],function(){
+            Route::any('export','WeighController@statisticsExport');
         });
-        Route::get('weigh/index','WeighController@index');
-        Route::resource('weigh','WeighController');
-        Route::put('logistic/batchUpdate','PackageLogisticController@batchUpdate');
-        Route::any('logistic/export','PackageLogisticController@export');
-        Route::resource('logistic','PackageLogisticController');
     });
+    Route::get('weigh/index','WeighController@index');
+    Route::resource('weigh','WeighController');
+    Route::put('logistic/batchUpdate','PackageLogisticController@batchUpdate');
+    Route::any('logistic/export','PackageLogisticController@export');
+    Route::resource('logistic','PackageLogisticController');
+});
     $route->resource('package','WeighController');
     /** 入库 */
     $route->group(['prefix'=>'store'],function(){