Merge branch 'waybill_ZD'

# Conflicts:
#	resources/views/weight/measureMonitor/index.blade.php

app/Http/Controllers/StoreItemsController.php

@@ -16,10 +16,7 @@ class StoreItemsController extends Controller
     public function index()
     {
         $storeItems=StoreItems::orderBy('id','DESC')->paginate(50);
-        $pickedPackage=Package::where('id',null)->select('id','delivery_number','status')->first();
-        dd(
-        );
-        return view('store.storeItem.index',['storeItems',$storeItems]);
+        return view('store.storeItem.index',['storeItems'=>$storeItems]);
     }
 
     /**

laravel-echo-server.lock

@@ -1,3 +1,3 @@
 {
-	"process": 12812
+	"process": 21500
 }

resources/views/store/menu.blade.php

@@ -4,7 +4,7 @@
         <ul class="nav nav-pills">
             @can('仓库管理')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('store/fast')}}" :class="{active:isActive('',3)}">记录</a>
+                    <a class="nav-link" href="{{url('store')}}" :class="{active:isActive('',2)}">记录</a>
                 </li> @endcan
             @can('仓库管理')
                 <li class="nav-item">

resources/views/store/storeItem/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')称重管理@endsection
+@section('title')入库管理@endsection
 
 @section('content')
     <span id="nav2">

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

@@ -140,12 +140,12 @@
                                         audio.play();
                                     }else {
                                         tempTip.setDuration(4000);
-                                        tempTip.showSuccess('文件名不规范!');
+                                        tempTip.show('文件名不规范!');
                                     }
                                 })
                                 .catch(function (err) {
                                     tempTip.setDuration(4000);
-                                    tempTip.showSuccess('语音合成发生错误：'+err);
+                                    tempTip.show('语音合成发生错误：'+err);
                                 });
                         }
                         tempTip.setDuration(1000);
@@ -173,7 +173,7 @@
                         })
                         .catch(function (err) {
                             tempTip.setDuration(4000);
-                            tempTip.showSuccess('切换设备错误：'+err);
+                            tempTip.show('切换设备错误：'+err);
                         });
                 },
                 updateData(_this,package){

routes/web.php

@@ -99,6 +99,7 @@ Route::get('package/weightExcepted/indexIssued','WeighExceptedController@indexIs
 Route::get('package/weightExcepted/export/{id}','WeighExceptedController@export');
 Route::resource('package','PackageController');
 
+Route::get('store','StoreController@index');
 Route::resource('store/fast','StoreController');
 Route::resource('store/storeItem','storeItemsController');
 

tests/webApi/test.http

@@ -23,4 +23,5 @@ Content-Type: application/json
 
 {"request":{"TASKID":"75331710268640","SOReference5":"75331710268640","Weigh":"0.05","Addwho":"","Addtime":"2020-02-28 17:30","Package":"xx","USERDEFINE1":"W200228000193","USERDEFINE2":"01.[ALLBLU]普通波次","USERDEFINE3":"OK"}}
 
-###
+###
+