整体样式调整和一些BUG修复

app/Http/Controllers/PackageController.php

@@ -96,7 +96,7 @@ class PackageController extends Controller
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function store(Request $request)
     {
@@ -106,16 +106,24 @@ class PackageController extends Controller
         $weight=$request->input('weight');
         $batch_number=$request->input('batch_number');
         $paper_box_id=$request->input('paper_box_id');
+        if($logistic_number&&$batch_number)return redirect('package/create')->with('successError','录入失败！波次号和快递单号只能填一项！');
         $package=null;
-        if($batch_number)$package=Package::where('batch_number',$batch_number)->first();
-        if($logistic_number)$package=Package::where('logistic_number',$logistic_number)->first();
+        if($batch_number){
+            $package=Package::where('batch_number',$batch_number)->first();
+        }elseif($logistic_number){
+            $package=Package::where('logistic_number',$logistic_number)->first();
+        }
         if (!$package && !$logistic_number)return redirect('package/create')->with('successError','录入失败！系统内没有对应波次的包裹！');
+        $successTip = '操作成功';
         if ($package){
             $accomplishToWMS=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
             if ($package->batch_rule&&strstr($package->batch_rule,'组合')){
                 $this->log(__METHOD__,'活动波次开始同步_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
                 $this->syncBatch($package->batch_number,$weight,null,null,null,Carbon::now(),$paper_box_id);
             }else{
+                if($batch_number){
+                    return redirect('package/create')->with('successError','录入失败！该波次不是组合提总！');
+                }
                 $package->weight=$weight;
                 $package->paper_box_id=$paper_box_id;
                 $package->batch_number=$batch_number;
@@ -134,11 +142,12 @@ class PackageController extends Controller
                 'paper_box_id'=>$paper_box_id,
                 'batch_number'=>$batch_number
             ]);
+            $successTip = "新建称重记录成功！单号：$logistic_number";
         }
         $package->save();
         $this->log(__METHOD__,'create_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
         event(new WeighedEvent($package));
-        return redirect('package/create')->with('successTip','操作成功');
+        return redirect('package/create')->with('successTip', $successTip);
     }
 
 
@@ -310,7 +319,7 @@ class PackageController extends Controller
             'logistic_number'=>['nullable','max:50'],
             'weight'=>'required|min:0|max:999999|numeric',
             'paper_box_id'=>'nullable|integer',
-            'batch_number'=>'required_without:logistic_number'
+            'batch_number'=>['required_without:logistic_number']
         ],[
             'required'=>':attribute 为必填项',
             'max'=>':attribute 字符过多或输入值过大',
@@ -330,26 +339,28 @@ class PackageController extends Controller
 
     public function syncBatch($batch_number,$weight,$max,$centre,$min,$date,$paperBox_id){
         $accomplishToWMS=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
-        $packagesBatch=Package::where('batch_number',$batch_number)->get();
-        foreach ($packagesBatch as $packageBatch){
-            $packageBatch->weight=$weight;
-            if($max)$packageBatch->length=$max;
-            if($centre)$packageBatch->width=$centre;
-            if($min)$packageBatch->height=$min;
-            $packageBatch->bulk=$max*$centre*$min;
-            $packageBatch->weighed_at=$date;
-            if ($paperBox_id)$packageBatch->paper_box_id=$paperBox_id;
-            $packageBatch->status="未上传";
-            $result=$accomplishToWMS->accomplishToWMS($packageBatch);
-            if ($result['result']=='success'){
-                if ($packageBatch->status=="记录异常")$packageBatch->status="已上传异常";
-                else $packageBatch->status="已上传";
-            }else{
-                $packageBatch->status="上传异常";
-            }
-            $packageBatch->save();
-            $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($packageBatch));
+        $packageBatch=Package::where('batch_number',$batch_number)->first();
+        if(!$packageBatch)return;
+        $newValues = ['weight' => $weight];
+        if($max)$newValues['length']=$max;
+        if($centre)$newValues['width']=$centre;
+        if($min)$newValues['height']=$min;
+        if($date)$newValues['weighed_at']=$date;
+        if($paperBox_id)$newValues['paper_box_id']=$paperBox_id;
+        if($max&&$centre&&$min){
+            $newValues['bulk']=$max*$centre*$min;
+        }
+        $packageBatch->update($newValues);
+        $result=$accomplishToWMS->accomplishToWMS($packageBatch);
+        if ($result['result']=='success'){
+            $newValues['status']='已上传';
+            Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'批量更改波次上传成功'.json_encode($packageBatch));
+        }else{
+            $newValues['status']='上传异常';
+            Controller::logS(__METHOD__,'error_'.__FUNCTION__,'批量更改波次上传异常:'.json_encode($packageBatch));
         }
+        Package::where('batch_number',$batch_number)->update($newValues);
+
     }
 
     public function statisticExport($packages,$owners,$logistics){

app/Http/Controllers/RejectedBillController.php

@@ -176,6 +176,7 @@ class RejectedBillController extends Controller
             case '0':$is_loaded=0;break;
             case '1':$is_loaded=1;break;
             case '2':$is_loaded=2;break;
+            case '3':$is_loaded=3;break;
             case 'null':$is_loaded=null;break;
         }
         $rejecteds->each(function($rejected)use($is_loaded,$request){
@@ -189,6 +190,7 @@ class RejectedBillController extends Controller
                 case '1':$is_loadedItem='已入库';break;
                 case '2':$is_loadedItem='待推单';break;
                 case '0':$is_loadedItem='未入库';break;
+                case '3':$is_loadedItem='未入库';break;
                 case 'null':$is_loadedItem='无需入库';break;
             }
             $rejected->items()->each(function($item)use($is_loadedItem){

app/Http/Controllers/RoleController.php

@@ -90,7 +90,7 @@ class RoleController extends Controller
     public function edit(Role $role)
     {
         if(!Gate::allows('角色-编辑')){ return redirect(url('/'));  }
-        $authoritiesAll=Authority::all();
+        $authoritiesAll=Authority::orderBy('alias_name','desc')->get();
         $authorities=$role->authorities()->get();
         return view('maintenance.role.edit',compact('role','authorities','authoritiesAll'));
     }

app/Http/Controllers/TestController.php

@@ -34,11 +34,13 @@ class TestController extends Controller
     {
         return call_user_func([$this, $method],$request);
     }
-    function t1(Request $request){ //x
-        $waybill = Waybill::orderBy('id','desc')->first();
-        $waybill['wms_bill_number'] = 'SO20050600007';
-        $waybill['waybill_number'] = 'WBZFx1234914';
-        dd((new WaybillController())->accomplishToWMS($waybill));
+    function t1(Request $request){ //x        $packagesBatch=Package::where('batch_number',$batch_number)->first();
+
+        $newValues = ['weight' => 1313,'logistic_number'=> 333];
+        $packagesBatch=Package::where('logistic_number',123)->first();
+        $packagesBatch->update($newValues);
+
+
     }
     function tj(Request $request){
         $bills=RejectedBill::where('is_loaded',2)->where('created_at','<',Carbon::now()->subHours(10)->toDateTimeString());

app/Http/Controllers/WaybillsController.php

@@ -226,7 +226,7 @@ class WaybillsController extends Controller
                 if ($waybill->charge)$total_receivable=($waybill->charge);
                 elseif ($waybill->collect_fee)$total_receivable=($waybill->collect_fee);
                 $total_expense=($waybill->fee)+($waybill->other_fee)-($waybill->collect_fee);
-            }else if ($waybill->type=="专线"){
+            }else {
                 $waybillPriceModel_id=$request->input('waybillPriceModel');
                 if ($waybillPriceModel_id){
                     $carrier_weight=$request->input('carrier_weight');
@@ -245,10 +245,12 @@ class WaybillsController extends Controller
                 }
                 $waybill->save();
                 if ($waybill->charge)$total_receivable=($waybill->charge);
-                elseif ($waybill->collect_fee)$total_receivable=($waybill->collect_fee);
+                elseif($waybill->collect_fee) {
+                    $total_receivable=($waybill->collect_fee);
+                }
                 $total_expense=($waybill->pick_up_fee)+($waybill->other_fee)+($waybill->fee);
             }
-            if ($total_receivable&&$total_receivable>0){
+            if (isset($total_receivable)&&$total_receivable>0){
                 $waybillPayoff=WaybillPayoff::where('waybill_id','=',$id)->first();
                 if ($waybillPayoff){
                     $waybillPayoff->waybill_id=$id;

app/Http/Controllers/api/thirdPart/flux/WaybillController.php

@@ -49,16 +49,16 @@ class WaybillController extends Controller
             $owner=Owner::where('code',$receiveInputting['CustomerID'])->first();
             if (!$owner){$owner=new Owner(['name'=>$receiveInputting['CustomerID'],'code'=>$receiveInputting['CustomerID']]);$owner->save();}
             $city=City::where('name',$receiveInputting['C_City'])->first();
-            $zfCar=config('bszf.ZFList');
+            $zfList=config('merchantsInfo.waybill.ZFList');
             $waybill=new Waybill([
-                'type'=>isset($zfCar[$receiveInputting['CarrierID']])&&$zfCar[$receiveInputting['CarrierID']]?"直发车":"专线",
+                'type'=>isset($zfList[$receiveInputting['CarrierID']])&&$zfList[$receiveInputting['CarrierID']]?"直发车":"专线",
                 'waybill_number'=>Uuid::uuid1(),
                 'owner_id'=>$owner->id,
-                'wms_bill_number'=>$receiveInputting['OrderNo'],
-                'origination'=>"上海市松江区泗砖路351号宝时松江仓",
-                'destination'=>$receiveInputting['C_Address1'],
-                'recipient'=>$receiveInputting['ConsigneeName'],
-                'recipient_mobile'=>$receiveInputting['C_Tel'],
+                'wms_bill_number'=>$receiveInputting['OrderNo']??'',
+                'origination'=>"",
+                'destination'=>$receiveInputting['C_Address1']??'',
+                'recipient'=>$receiveInputting['ConsigneeName']??'',
+                'recipient_mobile'=>$receiveInputting['C_Tel']??'',
                 'destination_city_id'=>$city['id'],
             ]);
             $waybill->save();

app/WMSWaybill.php

@@ -10,6 +10,6 @@ class WMSWaybill extends Model
     use ModelTimeFormat;
     //
     protected $fillable=['OrderNo','CustomerID','CarrierID','ConsigneeName',
-        'C_Tel','C_Address','C_Province','C_City','C_District'];
+        'C_Tel','C_Address1','C_Province','C_City','C_District'];
 
 }

config/bszf.php

@@ -1,10 +0,0 @@
-<?php
-
-return [
-    "ZFList"=>[
-        "BSZFCDF"=>true,
-        "BSZXDF"=>true,
-        "BSZFC"=>true,
-        "BSZX"=>true,
-    ]
-];

config/merchantsInfo.php

@@ -0,0 +1,14 @@
+<?php
+
+return [
+    "waybill"=>[
+        "ZFList"=>[
+            "BSZFCDF"=>true,
+            "BSZFC"=>true,
+        ],
+        "ZXList"=>[
+            "BSZXDF"=>true,
+            "BSZX"=>true,
+        ],
+    ]
+];

config/users.php

@@ -3,7 +3,7 @@
 return [
 
 
-    'superAdmin' => ['ldaaww','baoshi56','zhouyaping','shiyao','zhouzhendong'],
+    'superAdmin' => ['ldaaww','baoshi56','zhouyaping','shiyao','zhouzhendong','胡浩'],
     'token_expire_minutes'=>7200,
     'token_check_in_expire_minutes'=>7200, //打卡过期时间，单位为分钟
 ];

public/css/app.css

@@ -15,6 +15,14 @@
   height: auto;
 }
 
+.nav2 {
+  margin-top: 0;
+}
+
+.nav3 .card {
+  background: #f9f0f0;
+}
+
 /*!
  * Bootstrap v4.3.1 (https://getbootstrap.com/)
  * Copyright 2011-2019 The Bootstrap Authors

public/js/app.js

@@ -61297,7 +61297,7 @@ var tempTip = {
   okWindow: function okWindow(text, okText) {
     var bg = $("<div style='opacity:0.4;position:fixed;top:0;width:100%;height:100%;z-index:98;background-color:#000;'></div>");
     if (typeof okText == 'undefined') okText = '确定';
-    var tiper = $("<div class='row' style='opacity:0.9;position:fixed;top:40%;transform:translateY(-50%);width:100%;z-index:99'>" + "<div class='col-8 offset-2'><div class='card'><div class='card-body h2 text-center'>" + text + "<p><button class='btn btn-success btn-lg okWindow mt-3'>" + okText + "</button></p><div>" + "</div></div></div>");
+    var tiper = $("<div class='row' style='opacity:0.9;position:fixed;top:40%;transform:translateY(-50%);width:100%;z-index:99'>" + "<div class='col-8 offset-2'><div class='card'><div class='card-body h2 text-center'>" + text + "<p><button class='btn btn-success btn-lg okWindow'>" + okText + "</button></p><div>" + "</div></div></div>");
     tiper.find('.okWindow').on('click', function () {
       tiper.off('click');
       tiper.remove();

public/t.php

@@ -1,4 +1,7 @@
 <?php
 
 
-phpinfo();
+$a=['3'=>'33','4'=>'44'];
+
+$str = $a['5'] ;
+var_dump($a['3'], $str);

resources/js/singles/rejectedIndex.js

@@ -27,6 +27,9 @@ let vueList=new Vue({
             $("body").append(form);
             form.submit();
         },
+        searchByFilters:function(e){
+            this.filterRun();
+        },
         created_at_startChange:function(e){
             this.filterParams.created_at_start=e.target.value;
             this.filterRun();
@@ -200,6 +203,9 @@ let vueList=new Vue({
             }else if(parseInt(val)===2){
                 is_loaded=2;
                 is_loadedLabel='待推单';
+            }else if(parseInt(val)===4){
+                is_loaded=4;
+                is_loadedLabel='待确认';
             }else if(val==="null"){
                 is_loaded='null';
                 is_loadedLabel='无需入库';

resources/js/utilities/tempTip.js

@@ -34,7 +34,7 @@ const tempTip={
         let tiper=$("<div class='row' style='opacity:0.9;position:fixed;top:40%;transform:translateY(-50%);width:100%;z-index:99'>" +
             "<div class='col-8 offset-2'><div class='card'><div class='card-body h2 text-center'>" +
             text +
-            "<p><button class='btn btn-success btn-lg okWindow mt-3'>"+okText+"</button></p><div>" +
+            "<p><button class='btn btn-success btn-lg okWindow'>"+okText+"</button></p><div>" +
             "</div></div></div>");
         tiper.find('.okWindow').on('click',function () {
             tiper.off('click');

resources/sass/layout.scss

@@ -16,4 +16,13 @@
         width: 100%;
         height: auto;
     }
-}
+}
+
+.nav2{
+    margin-top:0;
+}
+.nav3{
+    .card{
+        background: #f9f0f0;
+    }
+}

resources/views/auth/login.blade.php

@@ -3,7 +3,7 @@
 @section('content')
     <div class="container-fluid">
         <div class="row justify-content-center">
-            <div class="col-md-12 mt-3">
+            <div class="col-md-12">
                 <div class="card">
                     <div class="card-header">登录</div>
                     <div class="card-body">

resources/views/index.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @can('退货管理')

resources/views/layouts/app.blade.php

@@ -3,30 +3,21 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" href="{{asset('icon/favicon.ico')}}" type="image/x-icon"/>
+    <link rel="icon" href="{{asset('icon/faviconb.ico')}}" type="image/x-icon"/>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <title>@yield('title') {{ config('app.name', 'BsWAS') }}</title>
     @yield('head')
     <!-- Styles -->
-    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+    <link href="{{ asset('css/app200513.css') }}" rel="stylesheet">
 </head>
 <body>
 <div id="app">
-    <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm d-none" id="navForSet">
-        <div class="container-fluid">
-            <span class="navbar-brand">
-                <img src="{{asset('icon/logo100.png')}}" alt="">
-                BsWAS
-            </span>
-        </div>
-    </nav>
     <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm">
         <div class="container-fluid">
-            <a class="navbar-brand" href="{{ url('/') }}" title="宝时 Warehouse Assistance System">
-                <img src="{{asset('icon/logo100.png')}}" alt="宝时 Warehouse Assistance System" height="20">
-                BsWAS
+            <a class="navbar-brand" href="{{ url('/') }}" title="宝时 Warehouse Assistance System" style="vertical-align: text-bottom">
+                <img src="{{asset('icon/logo100b.png')}}" alt="宝时 Warehouse Assistance System" height="30" >
             </a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
                 <span class="navbar-toggler-icon"></span>

resources/views/maintenance/authority/create.blade.bak.php

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.authority.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.authority.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -10,7 +10,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.authority.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/authority/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('权限-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.carType.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/carType') }}">

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 <form method="POST" action='{{url("maintenance/carType/{$carType->id}")}}'>

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.carType.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/carType/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('车型-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.carrier.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/carrier') }}">

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 <form method="POST" action='{{url("maintenance/carrier/{$carrier->id}")}}'>

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

@@ -7,7 +7,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.carrier.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/carrier/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('承运商-查询')
             <li class="nav-item">

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 <form method="POST" action='{{url("maintenance/city/{$city->id}")}}'>

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.city.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/city/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('城市-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.commodity.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/commodity/import.blade.php

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.commodity.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.commodity.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/commodity/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('商品信息-查询')
                 <li class="nav-item">

resources/views/maintenance/index.blade.php

@@ -3,7 +3,7 @@
 
 @section('content')
     @component('maintenance.menu')@endcomponent
-{{--    <div class="container-fluid mt-3" id="nav2">--}}
+{{--    <div class="container-fluid" id="nav2">--}}
 {{--        <div class="card">--}}
 {{--            --}}
 {{--        </div>--}}

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.log.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/log/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('日志-查询')
             <li class="nav-item">

resources/views/maintenance/log/show.blade.php

@@ -10,7 +10,7 @@
             </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card ">
             <div class="card-body">
                 <table class="table table-striped">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.logistic.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.logistic.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('物流公司-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.measuringMachine.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/measuringMachine') }}">

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 <form method="POST" action='{{url("maintenance/measuringMachine/{$measuringMachine->id}")}}'>

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.measuringMachine.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3" id="list">
+    <div class="container-fluid" id="list">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/measuringMachine/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('测量设备-查询')
             <li class="nav-item">

resources/views/maintenance/menu.blade.php

@@ -1,5 +1,5 @@
 
-<div class="container-fluid mt-3">
+<div class="container-fluid nav2">
     <div class="card">
         <ul class="nav nav-pills">
             @can('用户')

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.owner.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.owner.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/owner/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('货主-查询')
             <li class="nav-item">

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

@@ -8,7 +8,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.paperBox.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3" id="form">
+    <div class="container-fluid" id="form">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/paperBox') }}">

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

@@ -12,7 +12,7 @@
             </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3" id="form">
+    <div class="container-fluid" id="form">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/paperBox/'.$paperBox->id) }}">

resources/views/maintenance/paperBox/import.blade.php

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.paperBox.menu')@endcomponent
     </div>
-    <div class="container mt-3">
+    <div class="container">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/paperBox/excel/import') }}" enctype="multipart/form-data" target="_blank">

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

@@ -13,7 +13,7 @@
     </div>
 </div>
     </span>
-        <div class="container-fluid mt-3">
+        <div class="container-fluid">
             <div class="card">
                 <div class="card-body">
                     @if(Session::has('successTip'))

resources/views/maintenance/paperBox/indexOwner.blade.php

@@ -13,7 +13,7 @@
     </div>
 </div>
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/paperBox/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('纸箱-查询')
                 <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.province.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/province') }}">

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 <form method="POST" action='{{url("maintenance/province/{$province->id}")}}'>

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.province.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/province/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('省份-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.qualityLabel.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.qualityLabel.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/qualityLabel/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('品质标签-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.role.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3" id="editPanel">
+    <div class="container-fluid" id="editPanel">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3" id="editPanel">
+    <div class="container-fluid" id="editPanel">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.role.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/role/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('角色-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.tutorial.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3" id="list">
+    <div class="container-fluid" id="list">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/tutorial/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('教程-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.unit.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/unit') }}">

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 <form method="POST" action='{{url("maintenance/unit/{$unit->id}")}}'>

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.unit.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/unit/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('计量单位-查询')
             <li class="nav-item">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.user.menu')@endcomponent
     </div>
-    <div class="container mt-3" id="editPanel">
+    <div class="container" id="editPanel">
         <div class="row justify-content-center">
             @if(Session::has('successTip'))
                 <div class="alert alert-success h1">{{Session::get('successTip')}}</div>

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

@@ -11,7 +11,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3" id="editPanel">
+    <div class="container-fluid" id="editPanel">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.user.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))

resources/views/maintenance/user/menu.blade.php

@@ -1,6 +1,6 @@
 
-<div class="container-fluid">
-    <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
+<div class="container-fluid nav3">
+    <div class="card" >
         <ul class="nav nav-pills">
             @can('用户-查询')
             <li class="nav-item">

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

@@ -5,7 +5,7 @@
     <span id="nav2">
         @component('maintenance.menu')@endcomponent
     </span>
-    <div class="container-fluid mt-3 card" id="list">
+    <div class="container-fluid card" id="list">
         <div class="card-body">
             @if(Session::has('successTip'))
                 <div class="alert alert-success h1">{{Session::get('successTip')}}</div>

resources/views/maintenance/userLabor/show.blade.php

@@ -5,7 +5,7 @@
     <div id="nav2">
         @component('maintenance.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3" id="show">
+    <div class="container-fluid" id="show">
         <div class="card ">
             <div class="card-body">
                 <table class="table table-striped">

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

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.waybillPriceModel.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3" id="list">
+    <div class="container-fluid" id="list">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('maintenance/waybillPriceModel') }}">

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

@@ -9,7 +9,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container-fluid mt-3" id="list">
+    <div class="container-fluid" id="list">
         <div class="card">
             <div class="card-body">
                 <form method="POST" action='{{url("maintenance/waybillPriceModel/{$waybillPriceModel->id}")}}'>

resources/views/maintenance/waybillPriceModel/import.blade.php

@@ -6,7 +6,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.waybillPriceModel.menu')@endcomponent
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('waybillPriceModel/excel/import') }}" enctype="multipart/form-data" target="_blank">

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

@@ -8,10 +8,10 @@
         @component('maintenance.waybillPriceModel.menu')@endcomponent
     </span>
     <div id="list">
-    <div class="container-fluid mt-3">
+    <div class="container-fluid">
         <div class="card">
             <div>
-                <form  method="GET" action="{{url('maintenance/waybillPriceModel')}}" style="margin-top: 1%" id="optionSubmit">
+                <form  method="GET" action="{{url('maintenance/waybillPriceModel')}}" id="optionSubmit">
                     <table class="table  table-sm table-bordered table-hover text-nowrap ">
                         <tr>
                             <td  > <label style="margin-left: 2%" class="form-inline">页显示条数：