暂时提交，此为动态菜单测试合并分支

app/Http/Controllers/AuthorityController.php

@@ -5,6 +5,8 @@ namespace App\Http\Controllers;
 use App\Authority;
 use App\Components\AsyncResponse;
 use App\Services\common\BatchUpdateService;
+use App\User;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
 class AuthorityController extends Controller

app/Http/Controllers/OrderCommodityAssignController.php

@@ -12,7 +12,7 @@ class OrderCommodityAssignController extends Controller
 {
     public function index()
     {
-        if(!Gate::allows('订单管理-指定分配-查询')){ return redirect(url('denied'));  }
+        if(!Gate::allows('订单管理-指定分配')){ return redirect(url('denied'));  }
         $assigns = app("OrderCommodityAssignService")->paginate();
         return view("order.index.index",compact("assigns"));
     }

app/Http/Controllers/TestController.php

@@ -128,52 +128,10 @@ class TestController extends Controller
     {
         return call_user_func([$this, $method], $request);
     }
-    public function test2(){
-        StationTask::query()->update([
-            "status" => "完成",
-        ]);
-        StationTaskMaterialBox::query()->update([
-            "status" => "完成",
-        ]);
-    }
-    public function test1()
-    {
-        $stations = Station::query()->select("id")->where("parent_id",6);
-        \App\Storage::query()->whereIn("station_id",$stations)->delete();
-        StationTask::query()->whereIn("station_id",$stations)->delete();
-        StationTaskMaterialBox::query()->whereIn("station_id",$stations)->delete();
-    }
+
     public function test()
     {
-        ini_set('max_execution_time', 2500);
-        $model = MaterialBoxModel::query()->create([
-            "code" => "common"
-        ]);
-        $sql = <<<sql
-    select * from INV_LOT_LOC_ID where traceid = '*' and locationid like 'IDE%'
-sql;
-        foreach (DB::connection("oracle")->select(DB::raw($sql)) as $inv){
-            $materialBox = MaterialBox::query()->firstOrCreate(["code"=>$inv->locationid],[
-                "code" => $inv->locationid,
-                "material_box_model_id"=>$model
-            ]);
-            $owner = Owner::query()->firstOrCreate([
-                "code" => $inv->customerid
-            ],[
-                "code" => $inv->customerid,
-                "name" => $inv->customerid,
-            ]);
-            $commodity = Commodity::query()->where("owner_id",$owner->id)->where("sku",$inv->sku)->first();
-            if (!$commodity){
-                dump($inv->customerid." | ".$inv->sku);
-                continue;
-            }
-            \App\Storage::query()->create([
-                "material_box_id" => $materialBox->id,
-                "commodity_id" => $commodity->id,
-                "amount" => $inv->qty,
-            ]);
-        }
+      Cache::flush();
     }
     public function orderCreateBill()
     {

app/Providers/AppServiceProvider.php

@@ -7,8 +7,6 @@ use App\Jobs\LogisticSFSync;
 use App\Jobs\LogisticYDSync;
 use App\Jobs\LogisticYTOSync;
 use App\Jobs\LogisticZopSync;
-use App\LaborCompany;
-use App\Observers\LaborCompanyObserver;
 use App\Observers\OwnerObserver;
 use App\Observers\UserWorkGroupObserver;
 use App\Owner;
@@ -143,7 +141,6 @@ use App\Services\LogisticAliJiSuApiService;
 use App\Services\CommodityMaterialBoxModelService;
 use App\Services\OwnerLogisticFeeDetailService;
 use App\Services\OwnerLogisticFeeReportService;
-use App\Services\LaborCompanyService;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -236,7 +233,6 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('LogisticZopService', LogisticZopService::class);
         app()->singleton('InventoryCompareService', InventoryCompareService::class);
         app()->singleton('InventoryDailyLogService', InventoryDailyLogService::class);
-        app()->singleton('LaborCompanyService',LaborCompanyService::class);
         app()->singleton('LaborReportsCountingRecordService', LaborReportsCountingRecordService::class);
         app()->singleton('LogService', LogService::class);
         app()->singleton('LogisticAliJiSuApiService',LogisticAliJiSuApiService::class);
@@ -331,20 +327,20 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('HengLiWeightService',HengLiWeightService::class);
         app()->singleton('InventoryAccountMissionService',InventoryAccountMissionService::class);
         app()->singleton('MenuService',MenuService::class);
+        app()->singleton('RoleService',RoleService::class);
     }
 
-    /**
-     * 快递同步接口 同步情况统计
-     */
-    private function logisticSyncRecord($displayName, $column_name): void
-    {
-
     private function registerObserver()
     {
         Owner::observe(OwnerObserver::class);
         UserWorkgroup::observe(UserWorkGroupObserver::class);
     }
 
+    /**
+     * 快递同步接口 同步情况统计
+     */
+    private function logisticSyncRecord($displayName, $column_name): void
+    {
         /**
          * @var OrderPackageReceivedSyncRecordService $orderPackageReceivedSyncRecordService
          */

database/migrations/2020_03_09_132100_add_store_transfer_authority.php

@@ -15,11 +15,6 @@ class AddStoreTransferAuthority extends Migration
         '入库管理-快速入库-录入',
         '入库管理-快速入库-编辑',
         '入库管理-快速入库-删除',
-        '仓库管理',
-        '仓库管理-查询',
-        '仓库管理-录入',
-        '仓库管理-编辑',
-        '仓库管理-删除',
     ];
 
     /**

database/migrations/2020_12_02_150054_create_order_commodity_assigns_table.php

@@ -9,7 +9,6 @@ class CreateOrderCommodityAssignsTable extends Migration
 
     protected $authorities = [
         "订单管理-指定分配",
-        "订单管理-指定分配-查询",
         "订单管理-指定分配-编辑",
     ];
     /**

database/migrations/2020_12_12_093011_change_authorities_order_assign.php

@@ -11,10 +11,8 @@ class ChangeAuthoritiesOrderAssign extends Migration
     protected $changeNames=[
 
         ["指定分配","订单管理-指定分配"],
-        ["指定分配-查询","订单管理-指定分配-查询"],
         ["指定分配-编辑","订单管理-指定分配-编辑"],
         ["商品配置","订单管理-指定分配"],
-        ["商品配置-查询","订单管理-指定分配-查询"],
         ["商品配置-编辑","订单管理-指定分配-编辑"],
     ];
     /**

package-lock.json

@@ -1801,7 +1801,7 @@
     },
     "babel-runtime": {
       "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
         "core-js": "^2.4.0",
@@ -3161,13 +3161,13 @@
     },
     "cyclist": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
       "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
       "dev": true
     },
     "davidshimjs-qrcodejs": {
       "version": "0.0.2",
-      "resolved": "https://registry.npm.taobao.org/davidshimjs-qrcodejs/download/davidshimjs-qrcodejs-0.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/davidshimjs-qrcodejs/-/davidshimjs-qrcodejs-0.0.2.tgz",
       "integrity": "sha1-LrRCpElWcQed9/eCDM/nT0Wp3sA="
     },
     "de-indent": {
@@ -5441,7 +5441,7 @@
     },
     "jquery.cookie": {
       "version": "1.4.1",
-      "resolved": "https://registry.npm.taobao.org/jquery.cookie/download/jquery.cookie-1.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/jquery.cookie/-/jquery.cookie-1.4.1.tgz",
       "integrity": "sha1-1j3OIJ6raR/mMxbbCMqeR+D5OFs="
     },
     "js-cookie": {
@@ -6258,7 +6258,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "npm-run-path": {

resources/views/order/index.blade.php

@@ -2,7 +2,6 @@
 @section('title')订单管理@endsection
 
 @section('content')
-    @component('order.menu')@endcomponent
     <div class="container-fluid">
 
     </div>

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

@@ -2,7 +2,6 @@
 @section('title')查询-订单管理@endsection
 
 @section('content')
-    {{--@component('order.index.menu')@endcomponent--}}
     <div class="container-fluid">
         <div style="min-width: 4120px;">{{--4070--}}
             <div id="list" class="d-none">

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

@@ -2,7 +2,6 @@
 @section('title')自动冻结-订单管理@endsection
 
 @section('content')
-    @component('order.index.menu')@endcomponent
     <div class="card d-none" id="container">
         <div class="card-body">
             <div class="container-fluid">

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

@@ -2,7 +2,6 @@
 @section('title')指定分配-订单管理@endsection
 
 @section('content')
-    @component('order.index.menu')@endcomponent
 <div class="container-fluid d-none" id="container">
     @include("order.index._importModal")
     <div class="card">

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

@@ -1,23 +0,0 @@
-<div id="nav2">
-    @component('order.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                @can('订单管理-查询')
-                    <li class="nav-item">
-                        <a target="order/index/delivering" class="nav-link" href="{{url('order/index/delivering')}}" :class="{active:isActive('delivering',3)}">查询</a>
-                    </li> @endcan
-                @can('订单管理-指定分配')
-                    <li class="nav-item">
-                        <a target="order/index/commodityAssign" class="nav-link" href="{{url('order/index/commodityAssign')}}" :class="{active:isActive('commodityAssign',3)}">指定分配</a>
-                    </li> @endcan
-                @can('订单管理-自动冻结')
-                    <li class="nav-item">
-                        <a target="order/index/freeze" class="nav-link" href="{{url('order/index/freeze')}}" :class="{active:isActive('freeze',3)}">自动冻结</a>
-                    </li> @endcan
-            </ul>
-        </div>
-    </div>
-</div>
-

resources/views/order/issue/create.blade.php

@@ -2,7 +2,6 @@
 @section('title')录入-问题件@endsection
 
 @section('content')
-    @component("order.issue.menu")@endcomponent
     <div id="issue_create_div" class="d-none">
         <div class="container-fluid">
             <div class="card col-md-8 offset-md-2">

resources/views/order/issue/edit.blade.php

@@ -2,8 +2,6 @@
 @section('title')编辑-问题件@endsection
 
 @section('content')
-    @component("order.issue.menu")
-    @endcomponent
     <div class="container-fluid d-none" id="editOrderIssue">
         <div class="card col-md-8 offset-md-2 ">
             <div class="card-header">问题件修改</div>

resources/views/order/issue/import.blade.php

@@ -1,9 +1,6 @@
 @extends('layouts.app')
 @section('title')导入-问题件@endsection
 @section('content')
-    <div id="nav2">
-        @component('order.issue.menu')@endcomponent
-    </div>
     <div class="container-fluid" id="issue_import_div">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">

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

@@ -2,7 +2,6 @@
 @section('title')查询-问题件@endsection
 
 @section('content')
-    @component("order.issue.menu")@endcomponent
     <div class="container-fluid" id="issue_div">
         <div style="@cannot('订单管理-问题件-客户不可见')min-width: 3000px;@else min-width: 1990px; @endcannot">
             <div id="list" class="d-none container-fluid">

resources/views/order/issue/menu.blade.php

@@ -1,45 +0,0 @@
-<div id="nav2">
-    @component('order.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third">
-            <ul class="nav nav-pills">
-                @can('订单管理-问题件-查询')
-                    <li class="nav-item">
-                        <a target="order/issue/index/" class="nav-link" href="{{url('order/issue/index/')}}" :class="{active:isActive('index',3)}">查询</a>
-                    </li>
-                @endcan
-                @can('订单管理-订单问题件生成')
-                    <li class="nav-item">
-                        <a target="order/issue/create" class="nav-link" href="{{url('order/issue/create')}}" :class="{active:isActive('create',3)}">录入</a>
-                    </li>
-                @endcan
-                @can('订单管理-问题件-导入')
-                    <li class="nav-item">
-                        <a target="order/issue/excelImport" class="nav-link" href="{{url('order/issue/excelImport')}}" :class="{active:isActive('excelImport',3)}">导入</a>
-                    </li>
-                @endcan
-                @can('订单管理-问题件-工作量')
-                    <li class="nav-item" >
-                        <a target="order/issue/workLoad/index" class="nav-link" href="{{url('order/issue/workLoad/index')}}" :class="{active:isActive('workLoad',3)}">工作量</a>
-                    </li>
-                @endcan
-                @can('订单管理-问题件-绩效统计')
-                    <li class="nav-item" >
-                        <a target="order/issue/orderIssuePerformance/index" class="nav-link" href="{{url('order/issue/orderIssuePerformance/index')}}" :class="{active:isActive('orderIssuePerformance',3)}">绩效统计</a>
-                    </li>
-                @endcan
-                @can('订单管理-问题件-编辑')
-                    <li class="nav-item" :class=" isActive('edit',3) ? '' : 'd-none' ">
-                        <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('edit',3)}">修改</a>
-                    </li>
-                @endcan
-                @can('订单管理-问题件-删除')
-                    <li class="nav-item" >
-                        <a target="order/issue/recycle" class="nav-link" href="{{url('order/issue/recycle')}}" :class="{active:isActive('recycle',3)}">回收站</a>
-                    </li>
-                @endcan
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/order/issue/performance.blade.php

@@ -2,7 +2,6 @@
 @section('title')绩效统计-问题件-订单管理@endsection
 
 @section('content')
-    @component("order.issue.menu")@endcomponent
     <div class="container-fluid none" id="performance_div">
         <div style="min-width: 2000px;">
             <div id="form_div" style="min-width: 1950px;" class="bg-white"></div>

resources/views/order/issue/recycle.blade.php

@@ -1,9 +1,6 @@
 @extends('layouts.app')
 @section('title')回收站-问题件-订单管理@endsection
 @section('content')
-    <div id="nav2">
-        @component('order.issue.menu')@endcomponent
-    </div>
     <div class="container-fluid d-none" id="recycle_div">
         <div style="min-width: 1990px" class="card">
             <div class="card">

resources/views/order/issue/search.blade.php

@@ -2,8 +2,6 @@
 @section('title')问题件@endsection
 
 @section('content')
-    @component("order.menu")@endcomponent
-    @component("order.issue.menu")@endcomponent
 
 @endsection
 @section('lastScript')

resources/views/order/issue/workload.blade.php

@@ -2,7 +2,6 @@
 @section('title')工作量-问题件@endsection
 
 @section('content')
-    @component("order.issue.menu")@endcomponent
     <div class="container-fluid d-none" id="workLoad_div">
         <div style="min-width: 2000px;">
             <div id="form_div" style="min-width: 1950px;" class="bg-white"></div>

resources/views/order/menu.blade.php

@@ -1,27 +0,0 @@
-
-<div class="container-fluid nav2" id="nav2">
-    <div class="card">
-        <ul class="nav nav-pills">
-            @can('订单管理-查询')
-            <li class="nav-item">
-                <a target="order/index/delivering" class="nav-link" href="{{url('order/index/delivering')}}" :class="{active:isActive('index',2)}">订单</a>
-            </li>
-            @endcan
-            @can('订单管理-波次-查询')
-            <li class="nav-item">
-                    <a target="order/wave/index/" class="nav-link" href="{{url('order/wave/index/')}}" :class="{active:isActive('wave',2)}">波次</a>
-            </li>
-            @endcan
-            @can('订单管理-问题件-查询')
-            <li class="nav-item">
-                <a target="order/issue/index?addtime=15" class="nav-link" href="{{url('order/issue/index?addtime=15')}}" :class="{active:isActive('issue',2)}">问题件</a>
-            </li>
-            @endcan
-            @can('订单管理-跟踪')
-            <li class="nav-item">
-                <a target="order/tracking/index" class="nav-link" href="{{url('order/tracking/index')}}" :class="{active:isActive('tracking',2)}">跟踪</a>
-            </li>
-            @endcan
-        </ul>
-    </div>
-</div>

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

@@ -1,7 +1,6 @@
 @extends('layouts.app')
 @section('title')跟踪件-订单管理@endsection
 @section('content')
-    @component('order.tracking.menu')@endcomponent
     <div class="container-fluid" id="tracking_div">
         <div style="min-width: 3550px">
             <div class="d-none container-fluid" id="list">

resources/views/order/tracking/menu.blade.php

@@ -1,14 +0,0 @@
-<div id="nav2">
-    @component('order.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                @can('订单管理-跟踪')
-                    <li class="nav-item">
-                        <a target="order/tracking/index" class="nav-link" href="{{url('order/tracking/index')}}" :class="{active:isActive('tracking',2)}">查询</a>
-                    </li> @endcan
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/order/wave/menu.blade.php

@@ -1,14 +0,0 @@
-<div id="nav2">
-    @component('order.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                @can('订单管理-波次-查询')
-                    <li class="nav-item">
-                        <a target="order/wave/index/" class="nav-link" href="{{url('order/wave/index/')}}" :class="{active:isActive('wave',2)}">查询</a>
-                    </li> @endcan
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/order/wave/search.blade.php

@@ -2,7 +2,6 @@
 @section('title')波次-订单管理@endsection
 
 @section("content")
-    @component("order.wave.menu")@endcomponent
     <div class="container-fluid d-none" id="wave_div">
         <div style="min-width: 2000px;">
             <div class="modal fade" tabindex="-1" role="dialog" id="myModal">

resources/views/rejected/create.blade.php

@@ -1,10 +1,6 @@
 @extends('layouts.app')
 @section('title')录入-退货管理@endsection
 @section('content')
-
-    <div id="nav2">
-        @component('rejected.menu')@endcomponent
-    </div>
     <div class="container-fluid d-none" id="editPanel">
         <div class="card mb-2">
             <div style="position: relative" v-if="status.lockingBillPanel">

resources/views/rejected/import.blade.php

@@ -2,10 +2,6 @@
 @section('title')导入-退货管理@endsection
 
 @section('content')
-    <div id="nav2">
-        @component('rejected.menu')@endcomponent
-        @component('rejected.search.menu')@endcomponent
-    </div>
     <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">

resources/views/rejected/menu.blade.php

@@ -1,23 +0,0 @@
-
-<div class="container-fluid nav2">
-    <div class="card">
-        <ul class="nav nav-pills">
-            @can('退货管理-查询')
-                <li class="nav-item">
-                    <a target="rejected/index/general" class="nav-link" href="{{url('rejected/index/general')}}" :class="{active:isActive('index',2)}">查询</a>
-                </li> @endcan
-            @can('退货管理-录入')
-                <li class="nav-item">
-                    <a target="rejected/create" class="nav-link" href="{{url('rejected/create')}}" :class="{active:isActive('create',2)}">录入</a>
-                </li> @endcan
-            @can('退货管理-相关设置')
-                <li class="nav-item">
-                    <a target="rejected/relating" class="nav-link text-dark" href="{{url('rejected/relating')}}" :class="{active:isActive('relating',2)}">相关设置</a>
-                </li> @endcan
-            @can('退货管理-删除')
-                <li class="nav-item">
-                    <a target="rejected/relating" class="nav-link" href="{{url('rejected/recycle')}}" :class="{active:isActive('recycle',2)}">回收站</a>
-                </li> @endcan
-        </ul>
-    </div>
-</div>

resources/views/rejected/menuRelating.blade.php

@@ -1,18 +1,15 @@
 <div class="container-fluid nav3">
     <div class="card" >
         <ul class="nav">
-            @canany(['货主','基础设置-货主'])
-                <li class="nav-item">
-                    <a target="maintenance/owner" class="nav-link text-dark" href="{{url('maintenance/owner')}}" :class="{active:isActive('',2)}">货主</a>
-                </li> @endcanany
-            @canany(['物流公司','基础设置-承运商'])
-                <li class="nav-item">
-                    <a target="maintenance/logistic" class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">物流公司</a>
-                </li> @endcanany
-            @canany(['品质标签','基础设置-品质标签'])
-                <li class="nav-item">
-                    <a target="maintenance/qualityLabel" class="nav-link text-dark" href="{{url('maintenance/qualityLabel')}}" :class="{active:isActive('qualityLabel',2)}">品质标签</a>
-                </li> @endcanany
+            <li class="nav-item">
+                <a target="maintenance/owner" class="nav-link text-dark" href="{{url('maintenance/owner')}}" :class="{active:isActive('',2)}">货主</a>
+            </li>
+            <li class="nav-item">
+                <a target="maintenance/logistic" class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">物流公司</a>
+            </li>
+            <li class="nav-item">
+                <a target="maintenance/qualityLabel" class="nav-link text-dark" href="{{url('maintenance/qualityLabel')}}" :class="{active:isActive('qualityLabel',2)}">品质标签</a>
+            </li>
         </ul>
     </div>
 </div>

resources/views/rejected/recycle.blade.php

@@ -2,9 +2,6 @@
 @section('title')回收站-退货管理@endsection
 
 @section('content')
-    <div id="nav2">
-        @component('rejected.menu')@endcomponent
-    </div>
     <div class="container-fluid">
         <div class="card" style="min-width: 2000px;">
             <div class="card-body d-none" id="list">

resources/views/rejected/relating.blade.php

@@ -3,7 +3,6 @@
 
 @section('content')
     <div id="nav2">
-    @component('rejected.menu')@endcomponent
     @component('rejected.menuRelating')@endcomponent
     </div>
 @endsection

resources/views/rejected/search/analyze.blade.php

@@ -2,10 +2,6 @@
 @section('title')统计-退货管理@endsection
 
 @section('content')
-    <div id="nav2">
-        @component('rejected.menu')@endcomponent
-        @component('rejected.search.menu')@endcomponent
-    </div>
     <div class="container-fluid" id="list">
         <div id="form_div"></div>
         <span class="dropdown m-1">

resources/views/rejected/search/general.blade.php

@@ -2,10 +2,6 @@
 @section('title')查询-退货管理@endsection
 
 @section('content')
-    <div id="nav2">
-        @component('rejected.menu')@endcomponent
-        @component('rejected.search.menu')@endcomponent
-    </div>
     <div class="container-fluid">
         <div>
             <div class="d-none" id="list">

resources/views/rejected/search/menu.blade.php

@@ -1,20 +0,0 @@
-<div class="container-fluid nav3">
-    <div class="card menu-third">
-        <ul class="nav nav-pills">
-            @can('退货管理-查询')
-                <li class="nav-item">
-                    <a target="rejected/index/general" class="nav-link" href="{{url('rejected/index/general')}}" :class="{active:isActive('general',3)}">一般</a>
-                </li> @endcan
-            @can('退货管理-查询')
-                @cannot('退货管理-客户不可见')
-                    <li class="nav-item">
-                        <a target="rejected/index/analyze" class="nav-link" href="{{url('rejected/index/analyze')}}" :class="{active:isActive('analyze',3)}">统计</a>
-                    </li>@endcannot
-            @endcan
-            @can('退货管理-录入')
-                <li class="nav-item">
-                    <a target="rejected/import" class="nav-link" href="{{url('rejected/index/import')}}" :class="{active:isActive('import',3)}">导入</a>
-                </li> @endcan
-        </ul>
-    </div>
-</div>

resources/views/store/blindReceive/excel/index.blade.php

@@ -1,10 +1,6 @@
 @extends('layouts.app')
 
 @section('content')
-    <div id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.blindReceive.menu')@endcomponent
-    </div>
     <div class="container">
         <div class="row mt-2">
             <div class="col-12">

resources/views/store/blindReceive/index.blade.php

@@ -1,10 +1,6 @@
 @extends('layouts.app')
 
 @section('content')
-    <div id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.blindReceive.menu')@endcomponent
-    </div>
     <div class="container">
         <audio src="{{asset('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
         </audio>

resources/views/store/blindReceive/menu.blade.php

@@ -1,17 +0,0 @@
-
-<div id="nav2">
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                @can('入库管理-Excel下载')
-                    <li class="nav-item">
-                        <a target="store/blindReceive/excels" class="nav-link" href="{{url('store/blindReceive/excels')}}" :class="{active:isActive('excels',3)}">Excel下载</a>
-                    </li>@endcan
-                @can('入库管理-手持入口')
-                    <li class="nav-item">
-                        <a target="store/blindReceive" class="nav-link" href="{{url('store/blindReceive')}}" :class="{active:isActive('',3)}">手持入口</a>
-                    </li>@endcan
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/store/checkingReceive/menu.blade.php

@@ -1,13 +0,0 @@
-<div id="nav2">
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                @can('入库管理-盘收一体-任务')
-                    <li class="nav-item">
-                        <a target="store/checkingReceive/mission" class="nav-link" href="{{url('store/checkingReceive/mission')}}" :class="{active:isActive('',4)}">任务</a>
-                    </li> @endcan
-                {{$slot}}
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/store/checkingReceive/mission.blade.php

@@ -2,10 +2,6 @@
 @section('title')任务-盘收一体@endsection
 
 @section('content')
-<span id="nav2">
-    @component('store.menu')@endcomponent
-    @component('store.checkingReceive.menu')@endcomponent
-</span>
 <div id="container" class="d-none container-fluid">
     @include('store.checkingReceive._modal')
 

resources/views/store/checkingReceive/show.blade.php

@@ -2,15 +2,6 @@
 @section('title')任务-盘收一体@endsection
 
 @section('content')
-<span id="nav2">
-    @component('store.menu')@endcomponent
-    @component('store.checkingReceive.menu')
-        @can('入库管理-盘收一体-盘收')
-        <li class="nav-item">
-            <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('mission',3)}">盘收</a>
-        </li>@endcan
-    @endcomponent
-</span>
     <div id="container" class="d-none container-fluid">
         @include('store.checkingReceive._modal')
 

resources/views/store/deliveryAppointment/appointment.blade.php

@@ -2,10 +2,6 @@
 @section('title')入库预约@endsection
 
 @section('content')
-    <span id="nav2">
-    @component('store.menu')@endcomponent
-    @component('store.deliveryAppointment.menu')@endcomponent
-    </span>
     <div class="container-fluid" id="container">
         <div class="card">
             <div class="card-body row">

resources/views/store/deliveryAppointment/capacityMaintenance.blade.php

@@ -2,10 +2,6 @@
 @section('title')预约管理-入库预约@endsection
 
 @section('content')
-    <span id="nav2">
-    @component('store.menu')@endcomponent
-    @component('store.deliveryAppointment.menu')@endcomponent
-    </span>
     <div class="card container" id="container">
         <div class="card-body">
             <div class="row">

resources/views/store/deliveryAppointment/index.blade.php

@@ -2,10 +2,6 @@
 @section('title')入库预约@endsection
 
 @section('content')
-    <span id="nav2">
-    @component('store.menu')@endcomponent
-    @component('store.deliveryAppointment.menu')@endcomponent
-    </span>
     <div class="container-fluid" id="container">
 
     </div>

resources/views/store/deliveryAppointment/list.blade.php

@@ -2,10 +2,6 @@
 @section('title')预约管理-入库预约@endsection
 
 @section('content')
-    <span id="nav2">
-    @component('store.menu')@endcomponent
-    @component('store.deliveryAppointment.menu')@endcomponent
-    </span>
     <div class="container-fluid d-none" id="container">
         <div id="form"></div>
         <div class="mt-1">

resources/views/store/deliveryAppointment/menu.blade.php

@@ -1,28 +0,0 @@
-<div id="nav2">
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                @can('入库管理-入库预约-预约')
-                <li class="nav-item">
-                    <a target="store/deliveryAppointment/appointment" class="nav-link" href="{{url('store/deliveryAppointment/appointment')}}" :class="{active:isActive('appointment',3)}">入库预约</a>
-                </li> @endcan
-                @can('入库管理-入库预约-预约管理')
-                <li class="nav-item">
-                    <a target="store/deliveryAppointment/list" class="nav-link" href="{{url('store/deliveryAppointment/list')}}" :class="{active:isActive('list',3)}">预约管理</a>
-                </li> @endcan
-                @can('入库管理-入库预约-入库区终端')
-                <li class="nav-item">
-                    <a target="_blank" class="nav-link" href="{{url('store/deliveryAppointment/exhibition')}}" :class="{active:isActive('exhibition',3)}">入库区终端</a>
-                </li>@endcan
-                @can('入库管理-入库预约-二维码')
-                <li class="nav-item">
-                    <a target="_blank" class="nav-link" href="{{url('store/deliveryAppointment/qrcode')}}" :class="{active:isActive('qrcode',3)}">二维码</a>
-                </li>@endcan
-                @can('入库管理-入库预约-产能维护')
-                <li class="nav-item">
-                    <a target="_blank" class="nav-link" href="{{url('store/deliveryAppointment/capacityMaintenance')}}" :class="{active:isActive('capacityMaintenance',3)}">产能维护</a>
-                </li>@endcan
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/store/fast/create.blade.php

@@ -2,10 +2,6 @@
 @section('title')快速入库-入库管理@endsection
 
 @section('content')
-    <div id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.fast.menu')@endcomponent
-    </div>
     <div class="container-fluid" id="fast">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">

resources/views/store/fast/index.blade.php

@@ -2,10 +2,6 @@
 @section('title')查询-入库管理@endsection
 
 @section('content')
-    <span id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.fast.menu')@endcomponent
-    </span>
     <div class="d-none" id="fast">
         <div class="container-fluid">
             <table class="table table-striped table-sm text-nowrap table-hover td-min-width-80" id="table">

resources/views/store/fast/menu.blade.php

@@ -1,20 +0,0 @@
-<div id="nav2">
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                @can('入库管理-快速入库-录入')
-                    <li class="nav-item">
-                        <a target="store/fast/create" class="nav-link text-dark" href="{{url('store/fast/create')}}" :class="{active:isActive('create',3)}">录入</a>
-                    </li> @endcan
-                @can('入库管理-快速入库')
-                    <li class="nav-item">
-                        <a target="store/fast" class="nav-link" href="{{url('store/fast')}}" :class="{active:isActive('',3)}">记录</a>
-                    </li> @endcan
-                @can('入库管理-快速入库')
-                    <li class="nav-item">
-                        <a target="store/fast/storeItem" class="nav-link" href="{{url('store/fast/storeItem')}}" :class="{active:isActive('storeItem',3)}">明细</a>
-                    </li> @endcan
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/store/fast/storeItem.blade.php

@@ -2,10 +2,6 @@
 @section('title')入库子项-入库管理@endsection
 
 @section('content')
-    <span id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.fast.menu')@endcomponent
-    </span>
     <div class="d-none" id="item">
         <div class="container-fluid">
             <table class="table table-striped table-sm text-nowrap table-hover td-min-width-80" id="table">

resources/views/store/inStorage/cacheRackStorage.blade.php

@@ -2,10 +2,6 @@
 @section('title')缓存架入库-入库管理@endsection
 
 @section('content')
-    <span id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.inStorage.menu')@endcomponent
-    </span>
     <div class="container-fluid" id="container">
         <div class="row">
             <div class="card offset-md-1 col-md-5 col-sm-12">

resources/views/store/inStorage/halfChestStorage.blade.php

@@ -2,10 +2,6 @@
 @section('title')缓存架入库-入库管理@endsection
 
 @section('content')
-    <span id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.inStorage.menu')@endcomponent
-    </span>
     <div class="container-fluid" id="container">
         <div class="row">
             <div class="card offset-md-3 col-md-6 col-sm-12">

resources/views/store/inStorage/index.blade.php

@@ -2,10 +2,6 @@
 @section('title')入库管理@endsection
 
 @section('content')
-    <span id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.inStorage.menu')@endcomponent
-    </span>
     <div class="d-none container-fluid" id="list">
         <div id="form_div"></div>
         <table class="table table-striped table-sm text-nowrap table-hover td-min-width-80" id="table">

resources/views/store/inStorage/menu.blade.php

@@ -1,19 +0,0 @@
-<div id="nav2">
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                @can('入库管理-入库-查询')
-                    <li class="nav-item">
-                        <a target="store/inStorage/index" class="nav-link" href="{{url('store/inStorage/index')}}" :class="{active:isActive('index',3)}">查询</a>
-                    </li> @endcan
-                @can('入库管理-入库-缓存架入库')
-                <li class="nav-item">
-                    <a target="store/inStorage/cacheRackStorage" class="nav-link" href="{{url('store/inStorage/cacheRackStorage')}}" :class="{active:isActive('cacheRackStorage',3)}">缓存架入库</a>
-                </li>
-                <li class="nav-item">
-                    <a target="store/inStorage/halfChestStorage" class="nav-link" href="{{url('store/inStorage/halfChestStorage')}}" :class="{active:isActive('halfChestStorage',3)}">半箱补货入库</a>
-                </li>@endcan
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/store/inStorage/storeItem.blade.php

@@ -2,10 +2,6 @@
 @section('title')入库管理@endsection
 
 @section('content')
-    <span id="nav2">
-        @component('store.menu')@endcomponent
-        @component('store.fast.menu')@endcomponent
-    </span>
     <div class="d-none" id="item">
         <div class="container-fluid">
             <table class="table table-striped table-sm text-nowrap table-hover td-min-width-80" id="table">

resources/views/store/menu.blade.php

@@ -1,27 +0,0 @@
-
-<div class="container-fluid nav2" id="nav2">
-    <div class="card">
-        <ul class="nav nav-pills">
-            @can('入库管理-入库')
-                <li class="nav-item">
-                    <a target="store/inStorage/index" class="nav-link"  href="{{url('store/inStorage/index')}}" :class="{active:isActive('inStorage',2)}">入库</a>
-                </li> @endcan
-            @can('入库管理-盘收一体')
-            <li class="nav-item">
-                <a target="store/checkingReceive/mission" class="nav-link"  href="{{url('store/checkingReceive/mission')}}" :class="{active:isActive('checkingReceive',2)}">盘收一体</a>
-            </li> @endcan
-            @can('入库管理-入库预约')
-                <li class="nav-item">
-                    <a target="store/deliveryAppointment/appointment" class="nav-link"  href="{{url('store/deliveryAppointment/appointment')}}" :class="{active:isActive('deliveryAppointment',2)}">入库预约</a>
-                </li> @endcan
-            @can('入库管理-快速入库')
-                <li class="nav-item">
-                    <a target="store/fast/create" class="nav-link"  href="{{url('store/fast/create')}}" :class="{active:isActive('fast',2)}">快速入库</a>
-                </li> @endcan
-            @can('入库管理-盲收')
-                <li class="nav-item">
-                    <a target="store/blindReceive/excels" class="nav-link"  href="{{url('store/blindReceive/excels')}}" :class="{active:isActive('blindReceive',2)}">盲收</a>
-                </li> @endcan
-        </ul>
-    </div>
-</div>