称重管理--包裹管理 菜单调整

resources/views/layouts/menu.blade.php

@@ -25,8 +25,8 @@
         @can('称重管理')
             <li class="nav-item"><a href="{{url("package")}}" class="nav-link"
                                     :class="{active:isActive('package',1)}">
-                    <span class="fa fa-balance-scale" style="color: #1b7234"></span>
-                    称重管理</a></li> @endcan
+                    <span class="fa fa-suitcase" style="color: #1b7234"></span>
+                    包裹管理</a></li> @endcan
         @can('库存管理')
             <li class="nav-item"><a href="{{url('inventory/statement/allInventory')}}" class="nav-link"
                                     :class="{active:isActive('inventory',1)}">

resources/views/weight/menu.blade.php

@@ -2,30 +2,18 @@
 <div class="container-fluid nav2" id="nav2">
     <div class="card">
         <ul class="nav nav-pills">
-                @can('称重管理-查询')
+            @can('称重管理-查询')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('package/')}}" :class="{active:isActive('',2)}">记录</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{{url('package/measureMonitor')}}" :class="{active:isActive('measureMonitor',2)}">设备</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{{url('package/statistics')}}" :class="{active:isActive('statistics',2)}">统计</a>
-                </li>@endcan
-                @can('称重管理-录入')
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('package/create')}}" :class="{active:isActive('create',2)}">手动录入</a>
+                    <a class="nav-link" href="{{url('package/')}}" :class="{active:isActive('',2)}">称重管理</a>
                 </li>@endcan
-                @can('称重管理-查询')
+                {{--TODO 权限修改--}}
                 <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('package/weightExcepted/indexCreate')}}" :class="{active:isActive('weightExcepted',2)}">异常记录</a>
-                </li>@endcan
-                @can('称重管理-查看异常')
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('package/relating')}}" :class="{active:isActive('relating',2)}">相关设置</a>
-                </li>@endcan
-
-
+                    <a class="nav-link" href="{{url('logistic/')}}" :class="{active:isActive('logistic',2)}">快递</a>
+                </li>
+            @can('称重管理-查看异常')
+            <li class="nav-item">
+                <a class="nav-link text-dark" href="{{url('package/relating')}}" :class="{active:isActive('relating',2)}">相关设置</a>
+            </li>@endcan
         </ul>
     </div>
 </div>

resources/views/weight/package/index.blade.php

@@ -6,6 +6,7 @@
     <span id="nav2">
         @component('weight.menu')@endcomponent
         @component('weight.package.menu')@endcomponent
+        @component('weight.package.weigh.menu')@endcomponent
     </span>
     <div class="d-none" id="list">
         <div class="container-fluid">

resources/views/weight/package/menu.blade.php

@@ -1,10 +1,20 @@
 <div class="container-fluid nav3">
     <div class="card menu-third" >
         <ul class="nav nav-pills">
-            @can('称重管理-查询')
-                <li class="nav-item">
-                    <a class="nav-link" href="{{url('package/')}}" :class="{active:isActive('',2)}">查询</a>
-                </li> @endcan
+                @can('称重管理-查询')
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{url('package')}}" :class="{active:isActive('',2)}">记录</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{url('package/measureMonitor')}}" :class="{active:isActive('measureMonitor',3)}">设备</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{url('package/statistics')}}" :class="{active:isActive('statistics',3)}">统计</a>
+                    </li>@endcan
+                @can('称重管理-录入')
+                    <li class="nav-item">
+                        <a class="nav-link text-dark" href="{{url('package/create')}}" :class="{active:isActive('create',3)}">手动录入</a>
+                    </li>@endcan
         </ul>
     </div>
 </div>

resources/views/weight/package/weigh/menu.blade.php

@@ -0,0 +1,10 @@
+<div class="container-fluid nav3">
+    <div class="card menu-third" >
+        <ul class="nav nav-pills">
+            @can('称重管理-查询')
+                <li class="nav-item">
+                    <a class="nav-link" href="{{url('package/')}}" :class="{active:isActive('',2)}">查询</a>
+                </li> @endcan
+        </ul>
+    </div>
+</div>