调整样式页头标题

app/Listeners/WmsReceiveNewListener.php

@@ -52,6 +52,7 @@ class WmsReceiveNewListener
                 break;
         }
     }
+
     private function handleJianshang($logisticNumberReturn, $downloadedSkuItems, $wmsReceives){
         $bills=RejectedBill::where('logistic_number_return',$logisticNumberReturn)->
             whereIn('is_loaded',[0,2])->get();

database/migrations/2020_02_10_103905_change_package_column.php

@@ -32,7 +32,7 @@ class ChangePackageColumn extends Migration
             $table->decimal('bulk')->nullable()->comment('体积(cm³)');
             $table->bigInteger('paper_box_id')->nullable()->index()->comment('外键纸箱');
             $table->dateTime('weighed_at')->nullable()->comment('称重时间');
-            $table->enum('status',['无','未上传','已上传','未测量','未下发','上传异常','下发异常','记录异常','已上传异常'])->default('无')->comment('包裹信息状态');
+            $table->enum('status',['无','未上传','已上传','未测量','未下发','上传异常','下发异常','记录异常','已上传异常','测量异常'])->default('无')->comment('包裹信息状态');
             $table->timestamps();
         });
     }

laravel-echo-server.lock

@@ -1,3 +0,0 @@
-{
-	"process": 20980
-}

resources/views/layouts/app.blade.php

@@ -7,7 +7,7 @@
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ config('app.name', 'BsWAS') }}</title>
+    <title>@yield('title') {{ config('app.name', 'BsWAS') }}</title>
 
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')权限@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')创建车辆@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑车辆@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')车辆@endsection
 
 @section('content')
     <span id="nav2">

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

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

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

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

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

@@ -1,5 +1,6 @@
 
 @extends('layouts.app')
+@section('title')承运商@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')创建城市@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑城市@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')城市@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')创建商品@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑商品@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')商品@endsection
 
 @section('content')
     <span id="nav2">

resources/views/maintenance/index.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')设置@endsection
 
 @section('content')
     @component('maintenance.menu')@endcomponent

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')日志@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')日志详情{{$log['id']}}@endsection
 
 @section('content')
     <div id="nav2">

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

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

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

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

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')物流公司@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建测量设备@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑测量设备@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')测量设备@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建货主@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑货主@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')货主@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建纸箱@endsection
 
 
 

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑纸箱@endsection
 
 
 

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')导入纸箱@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')纸箱@endsection
 
 @section('content')
     <div id="list">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')纸箱（按货主）@endsection
 
 @section('content')
 <div id="list">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建省份@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑省份@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')省份@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建品质标签@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑品质标签@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')品质标签@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建角色@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑角色@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')角色@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建单位@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑单位@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')单位@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建用户@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑用户@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')用户@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')新建价格模型@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')修改价格模型@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')导入价格模型@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,6 @@
 
 @extends('layouts.app')
+@section('title')运输价格模型@endsection
 
 @section('content')
     <span id="nav2">

resources/views/rejected/create.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')录入退货@endsection
 
 @section('content')
 

resources/views/rejected/edit.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')编辑退货@endsection
 
 @section('content')
 

resources/views/rejected/import.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')导入@endsection
 
 @section('content')
     <div id="nav2">

resources/views/rejected/index.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')退货管理@endsection
 
 @section('content')
     <div id="nav2">

resources/views/rejected/recycle.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')已删除@endsection
 
 @section('content')
     <div id="nav2">

resources/views/waybill/index.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')运输管理@endsection
 
 @section('content')
     <div id="nav2">

resources/views/waybill/waybillFinancialSnapshot/index.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')财务报表@endsection
 
 @section('content')
 <div class="d-none" id="editingPanel">

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')设备@endsection
 
 @section('content')
     @component('weight.menu')@endcomponent

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

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title')手动录入@endsection
 
 @section('content')
     <div id="nav2">

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

@@ -1,5 +1,6 @@
 
 @extends('layouts.app')
+@section('title')称重管理@endsection
 
 @section('content')
     <span id="nav2">
@@ -12,9 +13,9 @@
                 <div>
                     <form  method="GET" action="{{url('package/')}}" style="margin-top: 1%" id="optionSubmit">
                         <table class="table  table-sm table-bordered text-nowrap ">
-                            <tr>
+                            <tr v-if="isBeingFilterConditions">
                                 <td colspan="10"><div class="col" style="padding:0">
-                                        <a  href="{{url('package')}}"><span class="btn btn-warning text-dark" v-if="isBeingFilterConditions">清除过滤条件</span></a>
+                                        <a  href="{{url('package')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
                                     </div></td>
                             </tr>
                             <tr>

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

@@ -1,5 +1,6 @@
 
 @extends('layouts.app')
+@section('title')异常记录@endsection
 
 @section('content')
     <span id="nav2">

runServes.sh

@@ -1,2 +1,11 @@
-nohup php artisan queue:work --sleep=5 >/dev/null 2>&1 &
 nohup laravel-echo-server start >/dev/null 2>&1 &
+
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &