LD 6 jaren geleden
bovenliggende
commit
c91e9392f4

+ 2 - 2
app/Http/Controllers/WaybillsController.php

@@ -513,12 +513,12 @@ class WaybillsController extends Controller
             'destination'=>'required|max:255',
             'recipient'=>'required|max:50',
             'recipient_mobile'=>['required','regex:/^([\d]{6,11})|(1[3|4|5|7|8][0-9]\d{4,8})$/'],
-            'charge'=>'required|min:0|numeric',
+            'charge'=>'nullable|numeric|max:999999',
             'collect_fee'=>'nullable|min:0|numeric',
         ],[
             'required'=>':attribute 为必填项',
             'alpha_num'=>':attribute 应为字母或数字',
-            'max'=>':attribute 字符过多',
+            'max'=>':attribute 超过最大位数',
             'regex'=>':attribute 输入有误',
             'integer'=>':attribute 应为整数',
             'min'=>':attribute 不得为负',

+ 41 - 1
database/migrations/2019_12_03_174626_add_data_authorities_waybill.php

@@ -64,6 +64,46 @@ class AddDataAuthoritiesWaybill extends Migration
      */
     public function down()
     {
-        //
+        Authority::where('name','计费模型')->delete();
+        Authority::where('name','计费模型-查询')->delete();
+        Authority::where('name','计费模型-录入')->delete();
+        Authority::where('name','计费模型-编辑')->delete();
+        Authority::where('name','计费模型-删除')->delete();
+        Authority::where('name','承运商')->delete();
+        Authority::where('name','承运商-查询')->delete();
+        Authority::where('name','承运商-录入')->delete();
+        Authority::where('name','承运商-编辑')->delete();
+        Authority::where('name','承运商-删除')->delete();
+        Authority::where('name','车型')->delete();
+        Authority::where('name','车型-查询')->delete();
+        Authority::where('name','车型-录入')->delete();
+        Authority::where('name','车型-编辑')->delete();
+        Authority::where('name','车型-删除')->delete();
+        Authority::where('name','城市')->delete();
+        Authority::where('name','城市-查询')->delete();
+        Authority::where('name','城市-录入')->delete();
+        Authority::where('name','城市-编辑')->delete();
+        Authority::where('name','城市-删除')->delete();
+        Authority::where('name','省份')->delete();
+        Authority::where('name','省份-查询')->delete();
+        Authority::where('name','省份-录入')->delete();
+        Authority::where('name','省份-编辑')->delete();
+        Authority::where('name','省份-删除')->delete();
+        Authority::where('name','财务报表')->delete();
+        Authority::where('name','财务报表-查询')->delete();
+        Authority::where('name','运输管理')->delete();
+        Authority::where('name','运输管理-查询')->delete();
+        Authority::where('name','运输管理-录入')->delete();
+        Authority::where('name','运输管理-编辑')->delete();
+        Authority::where('name','运输管理-调度')->delete();
+        Authority::where('name','运输管理-删除')->delete();
+        Authority::where('name','运输管理-运单审核')->delete();
+        Authority::where('name','运输管理-调度审核')->delete();
+        Authority::where('name','运输管理-可见费用项')->delete();
+        Authority::where('name','计量单位')->delete();
+        Authority::where('name','计量单位-查询')->delete();
+        Authority::where('name','计量单位-录入')->delete();
+        Authority::where('name','计量单位-编辑')->delete();
+        Authority::where('name','计量单位-删除')->delete();
     }
 }

+ 11 - 0
resources/sass/layout.scss

@@ -11,3 +11,14 @@
         //border: 1px solid #3490dc;
     }
 }
+//.nav-item{
+//    a:hover{
+//        color:#fff;
+//    }
+//    a:visited{
+//        color:#fff;
+//    }
+//    a.nav-link.text-dark.active:hover{
+//        color:#fff;
+//    }
+//}

+ 44 - 44
resources/views/maintenance/menu.blade.php

@@ -3,57 +3,57 @@
     <div class="card">
         <ul class="nav nav-pills">
             @can('用户')
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/user')}}" :class="{active:isActive('user',2)}">用户</a>
-            </li> @endcan
+                <li class="nav-item">
+                    <a class="nav-link" href="{{url('maintenance/user')}}" :class="{active:isActive('user',2)}">用户</a>
+                </li> @endcan
             @can('角色')
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/role')}}" :class="{active:isActive('role',2)}">角色</a>
-            </li> @endcan
+                <li class="nav-item">
+                    <a class="nav-link" href="{{url('maintenance/role')}}" :class="{active:isActive('role',2)}">角色</a>
+                </li> @endcan
             @can('权限')
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/authority')}}" :class="{active:isActive('authority',2)}">权限</a>
-            </li> @endcan
+                <li class="nav-item">
+                    <a class="nav-link" href="{{url('maintenance/authority')}}" :class="{active:isActive('authority',2)}">权限</a>
+                </li> @endcan
             @can('货主')
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/owner')}}" :class="{active:isActive('owner',2)}">货主</a>
-            </li> @endcan
-            @can('物流公司')
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">物流公司</a>
-            </li> @endcan
-            @can('承运商')
-            <li class="nav-item">
-                 <a class="nav-link text-dark" href="{{url('maintenance/carrier')}}" :class="{active:isActive('carrier',2)}">承运商</a>
-            </li> @endcan
-            @can('车型')
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/carType')}}" :class="{active:isActive('carType',2)}">车型</a>
-            </li> @endcan
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('maintenance/owner')}}" :class="{active:isActive('owner',2)}">货主</a>
+                </li> @endcan
+            @can('品质标签')
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('maintenance/qualityLabel')}}" :class="{active:isActive('qualityLabel',2)}">品质标签</a>
+                </li> @endcan
+            @can('商品信息')
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('maintenance/commodity')}}" :class="{active:isActive('commodity',2)}">商品信息</a>
+                </li> @endcan
             @can('计量单位')
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/unit')}}" :class="{active:isActive('unit',2)}">计量单位</a>
-            </li> @endcan
+                <li class="nav-item">
+                    <a class="nav-link text-info" href="{{url('maintenance/unit')}}" :class="{active:isActive('unit',2)}">计量单位</a>
+                </li> @endcan
             @can('省份')
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/province')}}" :class="{active:isActive('province',2)}">省份</a>
-            </li> @endcan
+                <li class="nav-item">
+                    <a class="nav-link text-info" href="{{url('maintenance/province')}}" :class="{active:isActive('province',2)}">省份</a>
+                </li> @endcan
             @can('城市')
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/city')}}" :class="{active:isActive('city',2)}">城市</a>
-            </li> @endcan
-            @can('品质标签')
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/qualityLabel')}}" :class="{active:isActive('qualityLabel',2)}">品质标签</a>
-            </li> @endcan
-            @can('商品信息')
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/commodity')}}" :class="{active:isActive('commodity',2)}">商品信息</a>
-            </li> @endcan
+                <li class="nav-item">
+                    <a class="nav-link text-info" href="{{url('maintenance/city')}}" :class="{active:isActive('city',2)}">城市</a>
+                </li> @endcan
+            @can('物流公司')
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">物流公司</a>
+                </li> @endcan
+            @can('承运商')
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('maintenance/carrier')}}" :class="{active:isActive('carrier',2)}">承运商</a>
+                </li> @endcan
+            @can('车型')
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('maintenance/carType')}}" :class="{active:isActive('carType',2)}">车型</a>
+                </li> @endcan
             @can('日志')
-            <li class="nav-item">
-                <a class="nav-link text-muted" href="{{url('maintenance/log')}}" :class="{active:isActive('log',2)}">日志</a>
-            </li> @endcan
+                <li class="nav-item">
+                    <a class="nav-link text-muted" href="{{url('maintenance/log')}}" :class="{active:isActive('log',2)}">日志</a>
+                </li> @endcan
         </ul>
     </div>
 </div>

+ 1 - 1
resources/views/waybill/create.blade.php

@@ -27,7 +27,7 @@
                     <div class="form-group row">
                         <label for="owner_id" class="col-2 col-form-label text-right text-primary">货主 *</label>
                         <div class="col-8 form-inline">
-                            <select name="owner_id" class="form-control" v-model="owner_name"  style="width: 30%">
+                            <select name="owner_id" class="form-control @error('owner_id') is-invalid @enderror" v-model="owner_name"  style="width: 30%">
                                    <option value=""></option>
                                    <option v-for="owner in owners" :value="owner.id">@{{owner.name}}</option>
                             </select>