合并承运商表

app/Imports/StoreCheckingReceiveImport.php

@@ -5,9 +5,7 @@ namespace App\Imports;
 use App\Http\Controllers\CommodityController;
 use App\Services\CommodityBarcodeService;
 use App\Services\CommodityService;
-use App\Services\LogService;
 use Carbon\Carbon;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Maatwebsite\Excel\Concerns\ToCollection;

app/Logistic.php

@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
 class Logistic extends Model
 {
     use ModelTimeFormat;
-    protected $fillable = ['name','code'];
+    protected $fillable = ['name','code',"type","mobile","remark","delivery_fee"];
 
 
     static function nameById($id){

resources/views/maintenance/logistic/create.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')创建物流公司@endsection
+@section('title')创建承运商@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/logistic/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')编辑物流公司@endsection
+@section('title')编辑承运商@endsection
 
 @section('content')
     <div id="nav2">

resources/views/maintenance/logistic/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')物流公司@endsection
+@section('title')承运商@endsection
 
 @section('content')
     <span id="nav2">
@@ -15,8 +15,12 @@
                 <table class="table table-striped table-sm" id="list">
                     <tr>
                         <th>ID</th>
-                        <th>物流公司名</th>
-                        <th>物流公司代码</th>
+                        <th>承运商名称</th>
+                        <th>承运商代码</th>
+                        <th>承运商联系方式</th>
+                        <th>承运商类型</th>
+                        <th>承运商送货费</th>
+                        <th>备注</th>
                         <th>创建时间</th>
                         <th>操作</th>
                     </tr>
@@ -24,6 +28,10 @@
                         <td class="text-muted">@{{logistic.id}}</td>
                         <td>@{{logistic.name}}</td>
                         <td>@{{logistic.code}}</td>
+                        <td>@{{logistic.mobile}}</td>
+                        <td>@{{logistic.type}}</td>
+                        <td>@{{logistic.delivery_fee}}</td>
+                        <td>@{{logistic.remark}}</td>
                         <td class="text-muted">@{{logistic.created_at}}</td>
                         <td>
                             @can('物流公司-编辑')
@@ -46,7 +54,9 @@
             data:{
                 logistics:[
                     @foreach( $logistics as $logistic )
-                    {id:'{{$logistic->id}}',name:'{{$logistic->name}}',code:'{{$logistic->code}}',created_at:'{{$logistic->created_at}}'},
+                    {id:'{{$logistic->id}}',name:'{{$logistic->name}}',code:'{{$logistic->code}}',
+                        mobile:"{{$logistic->mobile}}",type:"{{$logistic->type}}",delivery_fee:"{{$logistic->delivery_fee}}",
+                        remark:"{{$logistic->remark}}",created_at:'{{$logistic->created_at}}'},
                     @endforeach
                 ],
             },

resources/views/maintenance/menu.blade.php

@@ -58,14 +58,14 @@
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('maintenance/city')}}" :class="{active:isActive('city',2)}">城市</a>
                 </li> @endcan
-            @can('物流公司')
+            @can('承运商')
                 <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">物流公司</a>
+                    <a class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">承运商</a>
                 </li> @endcan
-            @can('承运商')
+            {{--@can('承运商')
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('maintenance/carrier')}}" :class="{active:isActive('carrier',2)}">承运商</a>
-                </li> @endcan
+                </li> @endcan--}}
             @can('车型')
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('maintenance/carType')}}" :class="{active:isActive('carType',2)}">车型</a>