样式和命名

app/Http/Controllers/PackageController.php

@@ -85,7 +85,7 @@ class PackageController extends Controller
         ]);
         $package->save();
         event(new WeightEvent($package));
-        return redirect('weight/package/create')->with('successTip','新记录“'.$logistic_number.'”录入成功');
+        return redirect('package/create')->with('successTip','新记录“'.$logistic_number.'”录入成功');
     }
 
     /**

resources/views/layouts/menu.blade.php

@@ -8,8 +8,8 @@
             <li class="nav-item"><a href="{{url("waybill/index")}}" class="nav-link"
                                     :class="{active:isActive('waybill',1)}">运输管理</a></li> @endcan
         @can('称重管理')
-            <li class="nav-item"><a href="{{url("weight/package/index")}}" class="nav-link"
-                                    :class="{active:isActive('weight',1)}">称重管理</a></li> @endcan
+            <li class="nav-item"><a href="{{url("package/")}}" class="nav-link"
+                                    :class="{active:isActive('package',1)}">称重管理</a></li> @endcan
         @can('基础设置')
         <li class="nav-item"><a href="{{url("maintenance/")}}" class="nav-link"
                                 :class="{active:isActive('maintenance',1)}">基础设置</a></li> @endcan

resources/views/weight/menu.blade.php

@@ -4,14 +4,14 @@
         <ul class="nav nav-pills">
             @can('测量机监视界面-查询')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('weight/package/index')}}" :class="{active:isActive('index',3)}">记录</a>
+                    <a class="nav-link" href="{{url('package/')}}" :class="{active:isActive('',2)}">记录</a>
                 </li> @endcan
             @can('测量记录管理-查询')
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('weight/measureMonitor')}}" :class="{active:isActive('measureMonitor',2)}">设备</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('weight/package/create')}}" :class="{active:isActive('create',3)}">手动录入</a>
+                    <a class="nav-link text-dark" href="{{url('package/create')}}" :class="{active:isActive('create',2)}">手动录入</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('weight/weightExcepted/indexCreate')}}" :class="{active:isActive('weightExcepted',2)}">异常记录</a>

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

@@ -7,7 +7,7 @@
     <div class="container-fluid mt-3" id="package">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
-                <form method="POST" action="{{ url('weight/package') }}">
+                <form method="POST" action="{{ url('package') }}">
                     @csrf
                     @if(Session::has('successTip'))
                         <div class="alert alert-success h1">{{Session::get('successTip')}}</div>

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

@@ -10,11 +10,11 @@
         <div class="container-fluid mt-3">
             <div class="">
                 <div>
-                    <form  method="GET" action="{{url('weight/package/index')}}" style="margin-top: 1%" id="optionSubmit">
+                    <form  method="GET" action="{{url('package/')}}" style="margin-top: 1%" id="optionSubmit">
                         <table class="table  table-sm table-bordered table-hover text-nowrap ">
                             <tr>
                                 <td colspan="10"><div class="col" v-if="isBeingFilterConditions" style="padding:0">
-                                        <a  href="{{url('weight/package')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                                        <a  href="{{url('package')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
                                     </div></td>
                             </tr>
                             <tr>
@@ -240,9 +240,9 @@
                         tempTip.showSuccess('没有勾选任何记录');
                     }else{
                         if (e===1){
-                            location.href="{{url('weight/package/export').'/'}}"+this.checkData;
+                            location.href="{{url('package/export').'/'}}"+this.checkData;
                         } else {
-                            location.href="{{url('weight/package/export/-1')}}";
+                            location.href="{{url('package/export/-1')}}";
                         }
 
                     }

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

@@ -3,7 +3,7 @@
         <ul class="nav nav-pills">
             @can('包裹信息-查询')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('weight/package/index')}}" :class="{active:isActive('index',3)}">查询</a>
+                    <a class="nav-link" href="{{url('package/')}}" :class="{active:isActive('',2)}">查询</a>
                 </li> @endcan
         </ul>
     </div>

routes/web.php

@@ -92,9 +92,9 @@ Route::get('maintenance/', function () {return view('maintenance.index');});
 Route::any('weight/measureMonitor/speech','MeasureMonitorController@speech');
 Route::post('weight/measureMonitor/data','MeasureMonitorController@data');
 Route::resource('weight/measureMonitor','MeasureMonitorController');
-Route::get('weight/package/index','PackageController@index');
-Route::resource('weight/package','PackageController');
-Route::get('weight/package/export/{id}','PackageController@export');
+//Route::get('weight/package/index','PackageController@index');
+Route::resource('package','PackageController');
+Route::get('package/export/{id}','PackageController@export');
 Route::get('weight/relating', function () {return view('weight.menuWeight');});
 Route::get('weight/weightExcepted/indexCreate','WeighExceptedController@indexCreate');
 Route::get('weight/weightExcepted/indexIssued','WeighExceptedController@indexIssued');

tests/Unit/PackageTest.php

@@ -65,9 +65,9 @@ class PackageTest extends TestCase
      * @depends testAddPackage
      */
     public function testIndex(User $user,User $userMark,Package $package){
-        $response=$this->actingAs($user)->get('weight/package');
+        $response=$this->actingAs($user)->get('package');
         $response->assertOk()->assertSee('Test浏览量');
-        $response=$this->actingAs($userMark)->get('weight/package');
+        $response=$this->actingAs($userMark)->get('package');
         $response->assertStatus(302)->assertRedirect('/');
     }