和笕尚接口调整，界面调整变宽

app/Http/Controllers/RejectedBillController.php

@@ -7,6 +7,7 @@ use App\Owner;
 use App\QualityLabel;
 use App\Rejected;
 use App\RejectedBill;
+use App\RejectedBillItem;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -147,7 +148,7 @@ class RejectedBillController extends Controller
     {
         if(!Gate::allows('退货管理-编辑')){ return redirect(url('/'));  }
         $ids=$request->input('ids')??'';
-        $rejecteds=RejectedBill::whereIn('id',$ids)->get();
+        $rejecteds=RejectedBill::with('items')->whereIn('id',$ids)->get();
         $is_loaded = $request->input('is_loaded');
         switch ($is_loaded){
             case '0':$is_loaded=0;break;
@@ -155,12 +156,23 @@ class RejectedBillController extends Controller
             case '2':$is_loaded=2;break;
             case 'null':$is_loaded=null;break;
         }
-        $rejecteds->each(function($rejected)use($is_loaded){
+        $rejecteds->each(function($rejected)use($is_loaded,$request){
             $rejected['is_loaded']=$is_loaded;
             $re=$rejected->update();
             if (!$re){
                 return ['success'=>'false','fail_info'=>"数据 {$rejected['id']} 更新失败"];
             }
+            $is_loadedItem='未入库';
+            switch ($request->input('is_loaded')){
+                case '1':$is_loadedItem='已入库';break;
+                case '2':$is_loadedItem='待推单';break;
+                case '0':$is_loadedItem='未入库';break;
+                case 'null':$is_loadedItem='无需入库';break;
+            }
+            $rejected->items()->each(function($item)use($is_loadedItem){
+                $item['is_loaded']=$is_loadedItem;
+                $item->save();
+            });
         });
         return ['success'=>'true'];
     }

app/Http/Controllers/RejectedBillItemController.php

@@ -212,8 +212,9 @@ class RejectedBillItemController extends Controller
         }
         return true;
     }
+
     public function sendRejectedToThirdPart2(Collection $items,$rejectedBill):bool {
-        if($rejectedBill['is_loaded']){
+        if($rejectedBill['is_loaded']!=0){
             return true;
         }
         $rejected=new Rejected();
@@ -226,14 +227,14 @@ class RejectedBillItemController extends Controller
         $rejected['goodses']=$goodses;
         $sended= $rejectedJianshang->sendRejected2($rejected);
         if(!$sended){return false;}
-        $rejectedBill['is_loaded']=true;
+        $rejectedBill['is_loaded']=2;
         $rejectedBill->save();
         $items->each(function(RejectedBillItem $item)use(&$goodses){
-            $item['is_loaded']='已入库';
+            $item['is_loaded']='待推单';
             $item->save();
         });
 
-        //标记WMS所有该退单作废（为已上传) ，检查这里是否正确！
+        //标记WMS所有该退单下的作废（为已上传) ，检查这里是否正确！
         $receives=WMSReflectReceive::where('ASNREFERENCE3',$rejectedBill['logistic_number_return'])->where('is_uploaded',0)->get();
         $receives->each(function ($receive){
             $receive['is_uploaded']=1;

app/Http/Controllers/api/thirdPart/jianshang/RejectedController.php

@@ -143,7 +143,7 @@ class RejectedController extends Controller
         if(!$json['logistic_number_return']){
             $this->log(__METHOD__,'error',"没有退回快递单号：".json_encode($json));
         }
-        $this->markItemsIsLoaded($json);
+//        $this->markItemsIsLoaded($json);
         return true;
     }
 

composer.lock

@@ -2404,7 +2404,7 @@
             "homepage": "https://github.com/php-fig/container",
             "keywords": [
                 "PSR-11",
-                "container",
+                "container-fluid",
                 "container-interface",
                 "container-interop",
                 "psr"

database/migrations/2019_11_05_130942_create_rejected_bill_items_table.php

@@ -24,7 +24,7 @@ class CreateRejectedBillItemsTable extends Migration
             $table->date('made_at')->nullable();
             $table->date('validity_at')->nullable();
             $table->string('remark')->nullable();
-            $table->enum('is_loaded',['无需入库','已入库','未入库'])->nullable();
+            $table->enum('is_loaded',['无需入库','已入库','未入库','待推单'])->nullable();
             $table->timestamps();
             $table->softDeletes();
         });

resources/views/admin.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">

resources/views/auth/login.blade.php

@@ -1,21 +1,21 @@
 @extends('layouts.app')
 
 @section('content')
-    <div class="container">
+    <div class="container-fluid">
         <div class="row justify-content-center">
             <div class="col-md-12 mt-3">
                 <div class="card">
                     <div class="card-header">登录</div>
                     <div class="card-body">
                         <div class="row">
-                            <div class="col-6">
+                            <div class="col-md-6 text-md-right">
                                 <img src="{{asset('images/login/bg1.jpg')}}" alt="" class="img-fluid">
                             </div>
-                            <div class="col-6"><form method="POST" action="{{ route('login') }}">
+                            <div class="col-md-6"><form method="POST" action="{{ route('login') }}">
                                     @csrf
 
-                                    <div class="form-group row mt-lg-5">
-                                        <label for="name" class="col-md-3 col-form-label text-md-right">用户名</label>
+                                        <label for="name" class="col-form-label text-md-right">用户名</label>
+                                    <div class="form-group row">
 
                                         <div class="col-md-8">
                                             <input id="name" type="text" class="form-control @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}" required autocomplete="name" autofocus>
@@ -28,8 +28,8 @@
                                         </div>
                                     </div>
 
+                                        <label for="password" class="col-form-label text-md-right">密码</label>
                                     <div class="form-group row">
-                                        <label for="password" class="col-md-3 col-form-label text-md-right">密码</label>
 
                                         <div class="col-md-8">
                                             <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
@@ -43,7 +43,7 @@
                                     </div>
 
                                     <div class="form-group row">
-                                        <div class="col-md-6 offset-md-4">
+                                        <div class="col-md-6">
                                             <div class="form-check">
                                                 <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
 
@@ -55,8 +55,8 @@
                                     </div>
 
                                     <div class="form-group row mb-0">
-                                        <div class="col-md-8 offset-md-4">
-                                            <button type="submit" class="btn btn-primary">
+                                        <div class="col-md-8">
+                                            <button type="submit" class="btn btn-primary form-control">
                                                 登录
                                             </button>
 

resources/views/auth/passwords/change.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">

resources/views/auth/passwords/changed.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row justify-content-center">
         <div class="col-md-8 mt-4">
             <div class="card">

resources/views/auth/passwords/email.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">

resources/views/auth/passwords/reset.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">

resources/views/auth/register.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">

resources/views/auth/verify.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">

resources/views/home.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">

resources/views/index.blade.php

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

resources/views/layouts/app.blade.php

@@ -15,7 +15,7 @@
 <body>
 <div id="app">
     <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm d-none" id="navForSet">
-        <div class="container">
+        <div class="container-fluid">
             <span class="navbar-brand">
                 <img src="{{asset('icon/logo100.png')}}" alt="">
                 BsWAS
@@ -23,7 +23,7 @@
         </div>
     </nav>
     <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm">
-        <div class="container">
+        <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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.carType.menu')@endcomponent
     </div>
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.carrier.menu')@endcomponent
     </div>
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -10,7 +10,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <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 mt-3">
+    <div class="container-fluid mt-3">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 @if(Session::has('successTip'))

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

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

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

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

resources/views/maintenance/index.blade.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.measuringMachine.menu')@endcomponent
     </div>
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <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

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

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

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

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

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

resources/views/maintenance/menu.blade.php

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

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.paperBox.menu')@endcomponent
     </div>
-    <div class="container mt-3" id="form">
+    <div class="container-fluid mt-3" 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

@@ -11,7 +11,7 @@
             </li>
         @endcomponent
     </div>
-    <div class="container mt-3" id="form">
+    <div class="container-fluid mt-3" 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/index.blade.php

@@ -5,14 +5,14 @@
     <span id="nav2">
         @component('maintenance.menu')@endcomponent
         @component('maintenance.paperBox.menu')@endcomponent
-<div class="container">
+<div class="container-fluid">
     <div class="form-inline" style="transform: scale(0.9)">
         <button class="btn btn-outline-primary" onclick="window.location.href='{{url('maintenance/paperBox/index/model')}}'"  :class="{active:isActive('model',4)}">按型号查询</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <button class="btn btn-outline-primary" onclick="window.location.href='{{url('maintenance/paperBox/index/owner')}}'"   :class="{active:isActive('owner',4)}">按货主查询</button>
     </div>
 </div>
     </span>
-        <div class="container mt-3">
+        <div class="container-fluid mt-3">
             <div class="card">
                 <div class="card-body">
                     @if(Session::has('successTip'))
@@ -111,4 +111,4 @@
             }
         });
     </script>
-@endsection
+@endsection

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

@@ -5,14 +5,14 @@
     <span id="nav2">
         @component('maintenance.menu')@endcomponent
         @component('maintenance.paperBox.menu')@endcomponent
-<div class="container">
+<div class="container-fluid">
     <div class="form-inline" style="transform: scale(0.9)">
         <button class="btn btn-outline-primary" onclick="window.location.href='{{url('maintenance/paperBox/index/model')}}'"  :class="{active:isActive('model',4)}">按型号查询</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <button class="btn btn-outline-primary" onclick="window.location.href='{{url('maintenance/paperBox/index/owner')}}'"   :class="{active:isActive('owner',4)}">按货主查询</button>
     </div>
 </div>
     </span>
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <div class="card">
             <div class="card-body">
                 @if(Session::has('successTip'))
@@ -108,4 +108,4 @@
             }
         });
     </script>
-@endsection
+@endsection

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

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

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.province.menu')@endcomponent
     </div>
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.role.menu')@endcomponent
     </div>
-    <div class="container mt-3" id="editPanel">
+    <div class="container-fluid mt-3" 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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.unit.menu')@endcomponent
     </div>
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.user.menu')@endcomponent
     </div>
-    <div class="container mt-3" id="editPanel">
+    <div class="container-fluid mt-3" 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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.waybillPriceModel.menu')@endcomponent
     </div>
-    <div class="container mt-3" id="list">
+    <div class="container-fluid mt-3" 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

@@ -8,7 +8,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container mt-3" id="list">
+    <div class="container-fluid mt-3" 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

@@ -5,7 +5,7 @@
         @component('maintenance.menu')@endcomponent
         @component('maintenance.waybillPriceModel.menu')@endcomponent
     </div>
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <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

@@ -7,7 +7,7 @@
         @component('maintenance.waybillPriceModel.menu')@endcomponent
     </span>
     <div id="list">
-    <div class="container mt-3">
+    <div class="container-fluid mt-3">
         <div class="card">
             <div>
                 <form  method="GET" action="{{url('maintenance/waybillPriceModel')}}" style="margin-top: 1%" id="optionSubmit">

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

@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container-fluid">
     <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
         <ul class="nav nav-pills">
             @can('计费模型-查询')

resources/views/rejected/import.blade.php

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

resources/views/rejected/index.blade.php

@@ -5,168 +5,167 @@
         @component('rejected.menu')@endcomponent
     </div>
     <div class="container-fluid">
-        <div class="card" style="min-width: 2070px;">
-            <div class="card-body d-none" id="list">
+        <div style="min-width: 2070px;">
+            <div class="d-none mt-3" id="list">
                 @if(Session::has('successTip'))
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
                 @endif
-                <div class="card">
-                    <div class="card-body">
+
+
+                    <div class="col-12" style="background: #fff;">
                         <div class="row">
-                            <div class="col-12">
-                                <div class="row">
-                                    <div class="col" v-if="isBeingFilterConditions">
-                                        <label for="">
-                                            <a :href="'{{url('rejected').'?paginate='}}'+filterParams.paginate"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
-                                        </label>
-                                    </div>
-                                    <table class="table mb-n3 table-sm table-bordered">
-                                        <tr>
-                                            <td>
-                                                <span class="text-muted">每页显示记录：</span>
-                                            </td>
-                                            <td colspan="9">
-                                                <select name="" id="setPaginate" class="tooltipTarget form-control-sm" style="vertical-align: middle"
-                                                        @change="setPaginate" v-model="filterParams.paginate">
-                                                    <option value="50">50条</option>
-                                                    <option value="100">100条</option>
-                                                    <option value="200">200条</option>
-                                                    <option value="500">500条</option>
-                                                    <option value="1000">1000条</option>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="text-muted">按条件过滤：</td>
-                                            <td colspan="2">
-                                                <label for="">时间：</label>
-                                                <input type="date" name="created_at_start" class="form-control-sm tooltipTarget" style="width:140px"
-                                                       :class="filterParams.created_at_start?'bg-warning':''" v-model="filterParams.created_at_start"
-                                                       @keypress="created_at_startEntering" @change="created_at_startChange" title="选择显示指定日期的起始时间">
-                                            </td>
-                                            <td>
-                                                <label for="">客户：</label>
-                                                <input type="text" class="form-control-sm tooltipTarget" placeholder="查找"
-                                                       style="width:70px" @input="locateOwner" @keypress="owner_idEntering"
-                                                       title="输入关键词快速定位下拉列表，回车确定">
-                                                <select name="owner_id" id="owner_id" class="form-control-sm tooltipTarget"
-                                                        :class="filterParams.owner_id?'bg-warning':''" v-model="filterParams.owner_id"
-                                                        title="选择要显示的客户" @change="owner_idChange">
-                                                    <option value="" selected>全部客户</option>
-                                                    <option v-for="owner in owners" :value="owner.id">@{{ owner.name }}</option>
-                                                </select>
-                                            </td>
-                                            <td>
-                                                <label for="">订单号：</label>
-                                                <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索订单号" name="order_number"
-                                                       :class="filterParams.order_number?'bg-warning':''" v-model="filterParams.order_number"
-                                                       @keypress="order_numberEntering" title="15天以内的支持模糊搜索，回车提交">
-                                            </td>
-                                            <td>
-                                                <label for="">退回单号：</label>
-                                                <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索退回单号" name="logistic_number_return"
-                                                       :class="filterParams.logistic_number_return?'bg-warning':''"
-                                                       @keypress="logistic_number_returnEntering" title="15天以内的支持模糊搜索，回车提交">
-                                            </td>
-                                            <td>
-                                                <label for="">审核：</label>
-                                                <select name="is_checked" class="form-control-sm" @change="is_checkedChange"
-                                                        :class="filterParams.is_checked?'bg-warning':''">
-                                                    <option value=""></option>
-                                                    <option value="1">已审核</option>
-                                                    <option value="0">未审核</option>
-                                                </select></td>
-                                            <td></td>
-                                            <td width="16%"></td>
-                                        </tr>
-                                        <tr>
-                                            <td ></td>
-                                            <td colspan="2">
-                                                <label for="">&nbsp;　　&nbsp;&nbsp;</label>
-                                                <input type="date" name="created_at_end" class="form-control-sm tooltipTarget" style="width:140px"
-                                                       :class="filterParams.created_at_end?'bg-warning':''"
-                                                       @keypress="created_at_endEntering" @change="created_at_endChange" title="选择显示指定日期的结束时间">
-                                            </td>
-                                            <td>
-                                                <label for="">商品条码：</label>
-                                                <input type="text" class="form-control-sm tooltipTarget" placeholder="包含该商品的退单" name="barcode_goods"
-                                                       :class="filterParams.barcode_goods?'bg-warning':''" title="可模糊匹配右边未填完的部分，按回车提交"
-                                                       @keypress="barcode_goodsEntering">
-                                            </td>
-                                            <td>
-                                                <label for="">是否正品：</label>
-                                                <select name="id_quality_label" id="id_quality_label" class="form-control-sm tooltipTarget"
-                                                        :class="filterParams.id_quality_label?'bg-warning':''"
-                                                        title="正品仅显示全部是正品的退单，但残次显示的是包含有残次的退单" @change="id_quality_labelChange">
-                                                    <option value="" selected></option>
-                                                    <option v-for="qualityLabel in qualityLabels" :value="qualityLabel.id">@{{ qualityLabel.name }}</option>
-                                                </select>
-                                            </td>
-                                            <td>
-                                                <label for="">寄件人手机：</label>
-                                                <input type="text" class="form-control-sm tooltipTarget" name="mobile_sender"
-                                                       :class="filterParams.mobile_sender?'bg-warning':''"
-                                                       @change="mobile_senderChange" title="输入完成敲回车提交">
-                                            </td>
-                                            <td>
-                                                <label for="">审核批次号：</label>
-                                                <input type="text" class="form-control-sm tooltipTarget" name="checked_numbers"
-                                                       :class="filterParams.checked_numbers?'bg-warning':''"
-                                                       @change="checked_numbersChange" title="支持右位留空的模糊搜索">
-                                            </td>
-                                            <td>
-                                                <label for="">是否入库：</label>
-                                                <select name="is_loaded" id="is_loaded" class="form-control-sm"
-                                                        :class="filterParams.is_loaded?'bg-warning':''"
-                                                        title="" @change="is_loadedChange">
-                                                    <option value="" selected></option>
-                                                    <option value="1">是</option>
-                                                    <option value="0">否</option>
-                                                    <option value="null">无需入库</option>
-                                                    <option value="2">待推单</option>
-                                                </select>
-                                            </td>
-                                            <td></td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <span class="text-muted">操作选定记录：</span>
-                                            </td>
-                                            <td colspan="9">
-                                                @can('退货管理-审核')
-                                                    <span class="btn btn-sm" @click="checkAll" style="cursor: pointer"
-                                                          :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">审核</span>
-                                                @endcan
-                                                @can('退货管理-编辑')
-                                                    <span class="btn btn-sm" @click="finishAll" style="cursor: pointer"
-                                                          :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">完结</span>
-                                                @endcan
-                                                <select name="" id="setIsLoaded_batch" class="tooltipTarget form-control-sm" style="vertical-align: middle"
-                                                        @change="exportExcel" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出"
-                                                        :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">
-                                                    <option value="">导出Excel</option>
-                                                    <option value="1">导出勾选内容</option>
-                                                    <option value="2">导出所有页</option>
-                                                </select>
-                                                @can('退货管理-编辑')
-                                                    <select name="" id="setIsLoaded_batch" class="tooltipTarget form-control-sm" style="vertical-align: middle"
-                                                            title="将勾选记录的入库状态设定为是或否，仅对未完结状态的记录有效" @change="setIsLoaded_batch"
-                                                            :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">
-                                                        <option value="">修改入库</option>
-                                                        <option value="1">设定为是</option>
-                                                        <option value="2">设定为否</option>
-                                                        <option value="null">无需入库</option>
-                                                    </select>
-                                                @endcan
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </div>
+                            <div class="col" v-if="isBeingFilterConditions">
+                                <label for="">
+                                    <a :href="'{{url('rejected').'?paginate='}}'+filterParams.paginate"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                                </label>
                             </div>
+                            <table class="table table-sm table-bordered m-0">
+                                <tr>
+                                    <td>
+                                        <span class="text-muted">每页显示记录：</span>
+                                    </td>
+                                    <td colspan="9">
+                                        <select name="" id="setPaginate" class="tooltipTarget form-control-sm" style="vertical-align: middle"
+                                                @change="setPaginate" v-model="filterParams.paginate">
+                                            <option value="50">50条</option>
+                                            <option value="100">100条</option>
+                                            <option value="200">200条</option>
+                                            <option value="500">500条</option>
+                                            <option value="1000">1000条</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="text-muted">按条件过滤：</td>
+                                    <td colspan="2">
+                                        <label for="">时间：</label>
+                                        <input type="date" name="created_at_start" class="form-control-sm tooltipTarget" style="width:140px"
+                                               :class="filterParams.created_at_start?'bg-warning':''" v-model="filterParams.created_at_start"
+                                               @keypress="created_at_startEntering" @change="created_at_startChange" title="选择显示指定日期的起始时间">
+                                    </td>
+                                    <td>
+                                        <label for="">客户：</label>
+                                        <input type="text" class="form-control-sm tooltipTarget" placeholder="查找"
+                                               style="width:70px" @input="locateOwner" @keypress="owner_idEntering"
+                                               title="输入关键词快速定位下拉列表，回车确定">
+                                        <select name="owner_id" id="owner_id" class="form-control-sm tooltipTarget"
+                                                :class="filterParams.owner_id?'bg-warning':''" v-model="filterParams.owner_id"
+                                                title="选择要显示的客户" @change="owner_idChange">
+                                            <option value="" selected>全部客户</option>
+                                            <option v-for="owner in owners" :value="owner.id">@{{ owner.name }}</option>
+                                        </select>
+                                    </td>
+                                    <td>
+                                        <label for="">订单号：</label>
+                                        <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索订单号" name="order_number"
+                                               :class="filterParams.order_number?'bg-warning':''" v-model="filterParams.order_number"
+                                               @keypress="order_numberEntering" title="15天以内的支持模糊搜索，回车提交">
+                                    </td>
+                                    <td>
+                                        <label for="">退回单号：</label>
+                                        <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索退回单号" name="logistic_number_return"
+                                               :class="filterParams.logistic_number_return?'bg-warning':''"
+                                               @keypress="logistic_number_returnEntering" title="15天以内的支持模糊搜索，回车提交">
+                                    </td>
+                                    <td>
+                                        <label for="">审核：</label>
+                                        <select name="is_checked" class="form-control-sm" @change="is_checkedChange"
+                                                :class="filterParams.is_checked?'bg-warning':''">
+                                            <option value=""></option>
+                                            <option value="1">已审核</option>
+                                            <option value="0">未审核</option>
+                                        </select></td>
+                                    <td></td>
+                                    <td width="16%"></td>
+                                </tr>
+                                <tr>
+                                    <td ></td>
+                                    <td colspan="2">
+                                        <label for="">&nbsp;　　&nbsp;&nbsp;</label>
+                                        <input type="date" name="created_at_end" class="form-control-sm tooltipTarget" style="width:140px"
+                                               :class="filterParams.created_at_end?'bg-warning':''"
+                                               @keypress="created_at_endEntering" @change="created_at_endChange" title="选择显示指定日期的结束时间">
+                                    </td>
+                                    <td>
+                                        <label for="">商品条码：</label>
+                                        <input type="text" class="form-control-sm tooltipTarget" placeholder="包含该商品的退单" name="barcode_goods"
+                                               :class="filterParams.barcode_goods?'bg-warning':''" title="可模糊匹配右边未填完的部分，按回车提交"
+                                               @keypress="barcode_goodsEntering">
+                                    </td>
+                                    <td>
+                                        <label for="">是否正品：</label>
+                                        <select name="id_quality_label" id="id_quality_label" class="form-control-sm tooltipTarget"
+                                                :class="filterParams.id_quality_label?'bg-warning':''"
+                                                title="正品仅显示全部是正品的退单，但残次显示的是包含有残次的退单" @change="id_quality_labelChange">
+                                            <option value="" selected></option>
+                                            <option v-for="qualityLabel in qualityLabels" :value="qualityLabel.id">@{{ qualityLabel.name }}</option>
+                                        </select>
+                                    </td>
+                                    <td>
+                                        <label for="">寄件人手机：</label>
+                                        <input type="text" class="form-control-sm tooltipTarget" name="mobile_sender"
+                                               :class="filterParams.mobile_sender?'bg-warning':''"
+                                               @change="mobile_senderChange" title="输入完成敲回车提交">
+                                    </td>
+                                    <td>
+                                        <label for="">审核批次号：</label>
+                                        <input type="text" class="form-control-sm tooltipTarget" name="checked_numbers"
+                                               :class="filterParams.checked_numbers?'bg-warning':''"
+                                               @change="checked_numbersChange" title="支持右位留空的模糊搜索">
+                                    </td>
+                                    <td>
+                                        <label for="">是否入库：</label>
+                                        <select name="is_loaded" id="is_loaded" class="form-control-sm"
+                                                :class="filterParams.is_loaded?'bg-warning':''"
+                                                title="" @change="is_loadedChange">
+                                            <option value="" selected></option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                            <option value="null">无需入库</option>
+                                            <option value="2">待推单</option>
+                                        </select>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span class="text-muted">操作选定记录：</span>
+                                    </td>
+                                    <td colspan="9">
+                                        @can('退货管理-审核')
+                                            <span class="btn btn-sm" @click="checkAll" style="cursor: pointer"
+                                                  :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">审核</span>
+                                        @endcan
+                                        @can('退货管理-编辑')
+                                            <span class="btn btn-sm" @click="finishAll" style="cursor: pointer"
+                                                  :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">完结</span>
+                                        @endcan
+                                        <select name="" id="setIsLoaded_batch" class="tooltipTarget form-control-sm" style="vertical-align: middle"
+                                                @change="exportExcel" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出"
+                                                :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">
+                                            <option value="">导出Excel</option>
+                                            <option value="1">导出勾选内容</option>
+                                            <option value="2">导出所有页</option>
+                                        </select>
+                                        @can('退货管理-编辑')
+                                            <select name="" id="setIsLoaded_batch" class="tooltipTarget form-control-sm" style="vertical-align: middle"
+                                                    title="将勾选记录的入库状态设定为是或否，仅对未完结状态的记录有效" @change="setIsLoaded_batch"
+                                                    :class="[rejectedBills_checkBoxes.length>0?'btn-dark':'btn-outline-dark']">
+                                                <option value="">修改入库</option>
+                                                <option value="1">设定为是</option>
+                                                <option value="0">设定为否</option>
+                                                <option value="null">无需入库</option>
+                                                <option value="2">待推单</option>
+                                            </select>
+                                        @endcan
+                                    </td>
+                                </tr>
+                            </table>
                         </div>
                     </div>
-                </div>
-                <table class="table table-striped table-sm table-bordered table-hover">
+
+
+                    <table class="table table-striped table-sm table-bordered table-hover mt-3" style="background: #fff;">
                     <tr>
                         <th>
                             <input type="checkbox" class="form-control-sm tooltipTarget" title="全选"
@@ -297,9 +296,9 @@
             {id:'{{$qualityLabel->id}}',name:'{{$qualityLabel->name}}'},
             @endforeach
         ];
-        @if(isset($paginateParams))
-            let paginateParams={!! json_encode($paginateParams) !!};
-        @endif
+            @if(isset($paginateParams))
+        let paginateParams={!! json_encode($paginateParams) !!};
+            @endif
         let total='{{$rejectedBills->total()}}';
         let editUrl = "{{url('rejectedBill')}}/";
         let destroyUrl = "{{url('rejectedBill')}}/";

resources/views/rejected/menu.blade.php

@@ -1,5 +1,5 @@
 
-<div class="container mt-3" id="nav2">
+<div class="container-fluid mt-3" id="nav2">
     <div class="card">
         <ul class="nav nav-pills">
             @can('退货管理-查询')

resources/views/rejected/menuRelating.blade.php

@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container-fluid">
     <div class="card" style="background: #f9f0f0;transform: scale(0.95)">
         <ul class="nav">
             @can('货主')

resources/views/test/index.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container" >
+<div class="container-fluid" >
     <div class="row justify-content-center">
         abc
     </div>

resources/views/waybill/billingModel/create.blade.php

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

resources/views/waybill/billingModel/edit.blade.php

@@ -8,7 +8,7 @@
                 </li>
         @endcomponent
     </div>
-    <div class="container mt-3" id="list">
+    <div class="container-fluid mt-3" id="list">
         <div class="card">
             <div class="card-body">
                 <form method="POST" action='{{url("billingModel/{$billingModel->id}")}}'>
@@ -173,4 +173,4 @@
         });
 
     </script>
-@endsection
+@endsection

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

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

resources/views/waybill/billingModel/menu.blade.php

@@ -1,5 +1,5 @@
 
-<div class="container mt-3" id="nav2">
+<div class="container-fluid mt-3" id="nav2">
     <div class="card">
         <ul class="nav nav-pills">
             @can('计费模型-查询')

resources/views/waybill/create.blade.php

@@ -3,7 +3,7 @@
 @section('content')
     <div id="nav2">
         @component('waybill.menu')@endcomponent
-        <div class="container">
+        <div class="container-fluid">
             <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
                 <ul class="nav nav-pills">
                     @can('运输管理-录入')
@@ -18,7 +18,7 @@
             </div>
         </div>
     </div>
-    <div class="container mt-3" id="list">
+    <div class="container-fluid mt-3" id="list">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('waybill') }}">

resources/views/waybill/edit.blade.php

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

resources/views/waybill/index.blade.php

@@ -4,7 +4,7 @@
     <div id="nav2">
         @component('waybill.menu')
         @endcomponent
-        <div class="container">
+        <div class="container-fluid">
             <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
                 <ul class="nav nav-pills">
                     @can('运输管理-查询')
@@ -24,16 +24,16 @@
             </div>
         </div>
     </div>
-<div class="card" style="min-width: 3500px;">
-    <div id="list">
-        <div class="card">
-            <div class="card-body">
-                <form  method="GET" action="@if($uriType=='ZF'){{url('waybill/index/ZF')}}@elseif($uriType=='ZX'){{url('waybill/index/ZX')}}@else{{url('waybill/index')}}@endif" style="margin-top: 1%" id="optionSubmit">
-                <table class="table  table-sm table-bordered table-hover text-nowrap ">
-                    <tr>
-                        <td colspan="4"><div class="col" v-if="isBeingFilterConditions" style="padding:0">
+    <div class="container-fluid" style="min-width: 3500px;">
+        <div id="list">
+
+            <form  method="GET" action="@if($uriType=='ZF'){{url('waybill/index/ZF')}}@elseif($uriType=='ZX'){{url('waybill/index/ZX')}}@else{{url('waybill/index')}}@endif" style="margin-top: 1%" id="optionSubmit">
+                <table class="table  table-sm table-bordered table-hover text-nowrap " style="background: #fff;">
+                    <tr v-if="isBeingFilterConditions">
+                        <td colspan="4"><div class="col" style="padding:0">
                                 <a  href="@if($uriType=='ZF'){{url('waybill/index/ZF')}}@elseif($uriType=='ZX'){{url('waybill/index/ZX')}}@else{{url('waybill/index')}}@endif"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
-                            </div></td>
+                            </div>
+                        </td>
                     </tr>
                     <tr >
                         <td> <label style="margin-left: 2%">页显示条数：</label>
@@ -70,10 +70,10 @@
                     <tr>
                         <td  style="width: 500px"><div><label style="margin-left: 2%"> 始发地：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
                                 <input type="text" name="origination" class="form-control-sm  " v-model="filterData.origination" style="vertical-align: middle">
-                            <label style="margin-left: 2%"> 目的地：&nbsp;&nbsp;</label>
+                                <label style="margin-left: 2%"> 目的地：&nbsp;&nbsp;</label>
                                 <input type="text" style="vertical-align: middle"  name="destination" class="form-control-sm  " v-model="filterData.destination"></div></td>
                         <td  style="width: 500px"><div><label style="margin-left: 2%"> 开始日期：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input type="date" name="created_at_start" class="form-control-sm"  v-model="filterData.created_at_start">
-                            <label style="margin-left: 1%"> 截至日期：&nbsp;&nbsp;</label><input type="date" class="form-control-sm" name="created_at_end" v-model="filterData.created_at_end"></div></td>
+                                <label style="margin-left: 1%"> 截至日期：&nbsp;&nbsp;</label><input type="date" class="form-control-sm" name="created_at_end" v-model="filterData.created_at_end"></div></td>
                         <td>
                             <label style="margin-left: 2%">运单状态：&nbsp;&nbsp;&nbsp;&nbsp;</label>
                             <select name="state" v-model="filterData.state" @change="setState" class="form-control-sm" style="vertical-align: middle">
@@ -93,127 +93,126 @@
                         </td>
                     </tr>
                 </table>
-                </form>
+            </form>
+
+            <div>
+                @if(Session::has('successTip'))
+                    <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
+                @endif
             </div>
-        </div>
-        <div>
-            @if(Session::has('successTip'))
-                <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
-            @endif
-        </div>
-        <table class="table table-striped table-sm table-bordered table-hover text-nowrap" >
-            <tr>
-                <th>
-                    <label for="all">
-                        <input id="all" type="checkbox" @click="checkAll($event)">全选
-                    </label>
-                </th>
-                <th>ID</th>
-                <th>运单类型</th>
-                <th>当前状态</th>
-                <th>运单号</th>
-                <th>货主</th>
-                <th>WMS单号</th>
-                <th>始发地</th>
-                <th>目的地</th>
-                <th>收件人</th>
-                <th>收件人电话</th>
-                <th>收费(元)</th>
-                <th>到付金额(元)</th>
-                <th>下单备注</th>
-                <th>运单审核人</th>
-                @can('运输管理-编辑','运输管理-运单审核','运输管理-调度')
-                    <th>运单操作</th>
-                @endcan
-                <th>承运商</th>
-                <th>承运商单号</th>
-                <th>始发市</th>
-                <th>目的市</th>
-                <th>仓库计数(抛)</th>
-                <th>仓库计数二</th>
-                <th>承运商计数(抛)</th>
-                <th>承运商计数二</th>
-                <th>车型</th>
-                <th>车辆信息</th>
-                <th>运费(元)</th>
-                <th>提货费(元)</th>
-                <th>其他费用(元)</th>
-                <th>调度备注</th>
-                <th>创建时间</th>
-                <th>调度审核人</th>
-                 @can('运输管理-编辑','运输管理-删除')
-                    <th>调度操作</th>
-                @endcan
-            </tr>
+            <table class="table table-striped table-sm table-bordered table-hover text-nowrap" style="background: #fff;">
+                <tr>
+                    <th>
+                        <label for="all">
+                            <input id="all" type="checkbox" @click="checkAll($event)">全选
+                        </label>
+                    </th>
+                    <th>ID</th>
+                    <th>运单类型</th>
+                    <th>当前状态</th>
+                    <th>运单号</th>
+                    <th>货主</th>
+                    <th>WMS单号</th>
+                    <th>始发地</th>
+                    <th>目的地</th>
+                    <th>收件人</th>
+                    <th>收件人电话</th>
+                    <th>收费(元)</th>
+                    <th>到付金额(元)</th>
+                    <th>下单备注</th>
+                    <th>运单审核人</th>
+                    @can('运输管理-编辑','运输管理-运单审核','运输管理-调度')
+                        <th>运单操作</th>
+                    @endcan
+                    <th>承运商</th>
+                    <th>承运商单号</th>
+                    <th>始发市</th>
+                    <th>目的市</th>
+                    <th>仓库计数(抛)</th>
+                    <th>仓库计数二</th>
+                    <th>承运商计数(抛)</th>
+                    <th>承运商计数二</th>
+                    <th>车型</th>
+                    <th>车辆信息</th>
+                    <th>运费(元)</th>
+                    <th>提货费(元)</th>
+                    <th>其他费用(元)</th>
+                    <th>调度备注</th>
+                    <th>创建时间</th>
+                    <th>调度审核人</th>
+                    @can('运输管理-编辑','运输管理-删除')
+                        <th>调度操作</th>
+                    @endcan
+                </tr>
 
-            <tr v-for="waybill in waybills" :style="{color:waybill.state=='待重审'?'red':''||waybill.state=='已完结'?'green':''}">
-                <td>
-                    <input class="checkItem" type="checkbox" :value="waybill.id" v-model="checkData">
-                </td>
-                <td>@{{waybill.id}}</td>
-                <td>@{{waybill.type}}</td>
-                <td :style="{color:waybill.state=='已审核'?'blue':''}">@{{waybill.state}}</td>
-                <td>@{{waybill.waybill_number}}</td>
-                <td>@{{waybill.owner}}</td>
-                <td>@{{waybill.wms_bill_number}}</td>
-                <td>@{{waybill.origination}}</td>
-                <td>@{{waybill.destination}}</td>
-                <td>@{{waybill.recipient}}</td>
-                <td>@{{waybill.recipient_mobile}}</td>
-                <td>@{{waybill.charge}}</td>
-                <td>@{{waybill.collect_fee}}</td>
-                <td>@{{waybill.ordering_remark}}</td>
-                <td><p v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="运单阶段">@{{waybillAuditLog.user.name}}</p></td>
-                <td>
-                    <div v-if=waybill.state==="未审核"||waybill.state==="待重审">
-                        @can('运输管理-运单审核')
-                            <button class="btn btn-outline-success" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
-                        @endcan
-                        @can('运输管理-运单编辑')
-                            <button class="btn btn-outline-secondary" @click="waybillUpdate(waybill.id)">修改</button>
-                        @endcan
-                    </div>
-                    <div v-if=waybill.state==="已审核">
-                        @can('运输管理-调度')
-                            <button class="btn btn-outline-secondary" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>
-                            <button class="btn btn-outline-secondary" @click="job(waybill.id)">调度</button>
-                        @endcan
-                    </div>
-                </td>
-                <td><p>@{{waybill.carrier}}</p></td>
-                <td>@{{waybill.carrier_bill}}</td>
-                <td>@{{waybill.origination_city}}</td>
-                <td>@{{waybill.destination_city}}</td>
-                <td>@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</td>
-                <td>@{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</td>
-                <td>@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</td>
-                <td>@{{waybill.carrier_weight_other}}  @{{waybill.carrier_weight_unit_other}}</td>
-                <td><p v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></p></td>
-                <td>@{{waybill.car_owner_info}}</td>
-                @can('运输管理-可见费用项')
-                    <td><p v-if="waybill.type=='专线'"></p><p v-else>@{{waybill.fee}}</p></td>
-                <td>@{{waybill.pick_up_fee}}</td>
-                <td>@{{waybill.other_fee}}</td>
-                @endcan
-                <td>@{{waybill.dispatch_remark}}</td>
-                <td>@{{waybill.created_at}}</td>
-                <td><p v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="调度阶段">@{{waybillAuditLog.user.name}}</p></td>
+                <tr v-for="waybill in waybills" :style="{color:waybill.state=='待重审'?'red':''||waybill.state=='已完结'?'green':''}">
+                    <td>
+                        <input class="checkItem" type="checkbox" :value="waybill.id" v-model="checkData">
+                    </td>
+                    <td>@{{waybill.id}}</td>
+                    <td>@{{waybill.type}}</td>
+                    <td :style="{color:waybill.state=='已审核'?'blue':''}">@{{waybill.state}}</td>
+                    <td>@{{waybill.waybill_number}}</td>
+                    <td>@{{waybill.owner}}</td>
+                    <td>@{{waybill.wms_bill_number}}</td>
+                    <td>@{{waybill.origination}}</td>
+                    <td>@{{waybill.destination}}</td>
+                    <td>@{{waybill.recipient}}</td>
+                    <td>@{{waybill.recipient_mobile}}</td>
+                    <td>@{{waybill.charge}}</td>
+                    <td>@{{waybill.collect_fee}}</td>
+                    <td>@{{waybill.ordering_remark}}</td>
+                    <td><p v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="运单阶段">@{{waybillAuditLog.user.name}}</p></td>
+                    <td>
+                        <div v-if=waybill.state==="未审核"||waybill.state==="待重审">
+                            @can('运输管理-运单审核')
+                                <button class="btn btn-outline-success" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
+                            @endcan
+                            @can('运输管理-运单编辑')
+                                <button class="btn btn-outline-secondary" @click="waybillUpdate(waybill.id)">修改</button>
+                            @endcan
+                        </div>
+                        <div v-if=waybill.state==="已审核">
+                            @can('运输管理-调度')
+                                <button class="btn btn-outline-secondary" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>
+                                <button class="btn btn-outline-secondary" @click="job(waybill.id)">调度</button>
+                            @endcan
+                        </div>
+                    </td>
+                    <td><p>@{{waybill.carrier}}</p></td>
+                    <td>@{{waybill.carrier_bill}}</td>
+                    <td>@{{waybill.origination_city}}</td>
+                    <td>@{{waybill.destination_city}}</td>
+                    <td>@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</td>
+                    <td>@{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</td>
+                    <td>@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</td>
+                    <td>@{{waybill.carrier_weight_other}}  @{{waybill.carrier_weight_unit_other}}</td>
+                    <td><p v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></p></td>
+                    <td>@{{waybill.car_owner_info}}</td>
+                    @can('运输管理-可见费用项')
+                        <td><p v-if="waybill.type=='专线'"></p><p v-else>@{{waybill.fee}}</p></td>
+                        <td>@{{waybill.pick_up_fee}}</td>
+                        <td>@{{waybill.other_fee}}</td>
+                    @endcan
+                    <td>@{{waybill.dispatch_remark}}</td>
+                    <td>@{{waybill.created_at}}</td>
+                    <td><p v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="调度阶段">@{{waybillAuditLog.user.name}}</p></td>
 
-                <td>
-                    <div v-if=waybill.state==="待终审">
-                        @can('运输管理-调度审核')
-                            <button class="btn btn-outline-success" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
-                        @endcan
-                        @can('运输管理-调度')
-                            <button class="btn btn-outline-secondary" @click="job(waybill.id)">改调度</button>
-                        @endcan
-                    </div>
-                </td>
-            </tr>
-        </table>
-        {{$waybills->appends($filterData)->links()}}
+                    <td>
+                        <div v-if=waybill.state==="待终审">
+                            @can('运输管理-调度审核')
+                                <button class="btn btn-outline-success" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
+                            @endcan
+                            @can('运输管理-调度')
+                                <button class="btn btn-outline-secondary" @click="job(waybill.id)">改调度</button>
+                            @endcan
+                        </div>
+                    </td>
+                </tr>
+            </table>
+            {{$waybills->appends($filterData)->links()}}
+        </div>
     </div>
-</div>
 @endsection
 
 @section('lastScript')

resources/views/waybill/menu.blade.php

@@ -1,5 +1,5 @@
 
-<div class="container mt-3" id="nav2">
+<div class="container-fluid mt-3" id="nav2">
     <div class="card">
         <ul class="nav nav-pills">
             @can('运输管理-查询')

resources/views/waybill/menuWaybill.blade.php

@@ -4,7 +4,7 @@
     <div id="nav2">
         @component('waybill.menu')
         @endcomponent
-        <div class="container">
+        <div class="container-fluid">
             <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
                 <ul class="nav nav-pills">
                     @can('计费模型')

resources/views/waybill/waybillEdit.blade.php

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

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

@@ -6,7 +6,7 @@
     <div  class="card" id="nav2">
         @component('waybill.menu')@endcomponent
 
-            <div class="container">
+            <div class="container-fluid">
                 <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
                     <ul class="nav nav-pills">
                         @can('财务报表-查询')