称重广播给客户端的前缀问题

退货系统搜索时不方便多条件一起输入问题

app/Events/WeighedEvent.php

@@ -2,6 +2,7 @@
 
 namespace App\Events;
 
+use App\Http\Controllers\Controller;
 use App\Package;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
@@ -33,9 +34,9 @@ class WeighedEvent implements ShouldBroadcast
     {
         return new Channel('package');
     }
-
-    public function broadcastAs(){
-        return "weight";        //频道别名
-    }
+//
+//    public function broadcastAs(){
+//        return "weight";        //频道别名
+//    }
 
 }

app/Http/Controllers/MeasureMonitorController.php

@@ -18,13 +18,14 @@ class MeasureMonitorController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index(Request $request)
     {
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $measuringMachines=MeasuringMachine::select('id','name','code','status')->get();
-        return view('weight.measureMonitor.index',['measuringMachines'=>$measuringMachines]);
+        $laravelEchoPrefix = config('database.redis.options.prefix');
+        return view('weight.measureMonitor.index',compact('laravelEchoPrefix','measuringMachines'));
     }
 
     public function data(Request $request){

app/Jobs/MarkPackageExcepted.php

@@ -32,15 +32,15 @@ class MarkPackageExcepted implements ShouldQueue
      */
     public function handle()
     {
-        $delivery_number=Package::where('logistic_number',$this->package->logistic_number)->select('id','delivery_number','status')->first();
-        if(!$delivery_number)return;
-        if (!$delivery_number->delivery_number){
-            $delivery_number->status="下发异常";
-            $delivery_number->save();
+        $pickedPackage=Package::where('id',$this->package->id)->select('id','delivery_number','status')->first();
+        if(!$pickedPackage)return;
+        if (!$pickedPackage->delivery_number){
+            $pickedPackage->status="下发异常";
+            $pickedPackage->save();
         }
-        if (!$delivery_number->measuring_machine_id){
-            $delivery_number->status="测量异常";
-            $delivery_number->save();
+        if (!$pickedPackage->measuring_machine_id){
+            $pickedPackage->status="测量异常";
+            $pickedPackage->save();
         }
     }
 }

public/js/app.js

@@ -61348,8 +61348,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),

resources/js/singles/rejectedIndex.js

@@ -51,14 +51,6 @@ let vueList=new Vue({
             this.filterParams.is_loaded=e.target.value;
             this.filterRun();
         },
-        mobile_senderChange:function(e){
-            this.filterParams.mobile_sender=e.target.value;
-            this.filterRun();
-        },
-        checked_numbersChange:function(e){
-            this.filterParams.checked_numbers=e.target.value;
-            this.filterRun();
-        },
         initInputs:function(){
             let data=this;
             // let uriParts = decodeURI(location.href).split("?");
@@ -116,6 +108,11 @@ let vueList=new Vue({
                     console.log(err);
                 });
         },
+        submitFilterOnEnter:function(e){
+            if(e.key==='Enter'){
+                this.filterRun();
+            }
+        },
         created_at_startEntering:function(e){
             if(e.key==='Enter'){
                 this.created_at_startChange(e)
@@ -139,29 +136,41 @@ let vueList=new Vue({
             $("#owner_id option").attr("selected",false);
             let selectingOption=$("#owner_id").find("option:contains("+str+")").eq(0);
             selectingOption.attr("selected",true);
-            // this.filterParams.owner_id=selectingOption.val();
+            this.filterParams.owner_id=selectingOption.val();
+        },
+        mobile_senderEntering:function(e){
+            this.filterParams.mobile_sender=e.target.value;
+            if(e.key==='Enter'){
+                this.filterRun();
+            }
         },
         order_numberEntering:function(e){
+            this.filterParams.order_number=e.target.value;
             if(e.key==='Enter'){
-                this.filterParams.order_number=e.target.value;
                 this.filterRun();
             }
         },
         barcode_goodsEntering:function(e){
+            this.filterParams.barcode_goods=e.target.value;
+            if(e.key==='Enter'){
+                this.filterRun();
+            }
+        },
+        checked_numbersEntering:function(e){
+            this.filterParams.checked_numbers=e.target.value;
             if(e.key==='Enter'){
-                this.filterParams.barcode_goods=e.target.value;
                 this.filterRun();
             }
         },
         logistic_number_returnEntering:function(e){
+            this.filterParams.logistic_number_return=e.target.value;
             if(e.key==='Enter'){
-                this.filterParams.logistic_number_return=e.target.value;
                 this.filterRun();
             }
         },
         logistic_numberEntering:function(e){
+            this.filterParams.logistic_number=e.target.value;
             if(e.key==='Enter'){
-                this.filterParams.logistic_number=e.target.value;
                 this.filterRun();
             }
         },

resources/views/rejected/index.blade.php

@@ -60,19 +60,19 @@
                                         <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天以内的支持模糊搜索，回车提交">
+                                               @input="order_numberEntering" @keypress="submitFilterOnEnter" 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天以内的支持模糊搜索，回车提交">
+                                               @input="logistic_number_returnEntering" @keypress="submitFilterOnEnter" title="15天以内的支持模糊搜索，回车提交">
                                     </td>
                                     <td>
                                         <label for="">原单单号：</label>
                                         <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索原单单号" name="logistic_number"
                                                :class="filterParams.logistic_number?'bg-warning':''"
-                                               @keypress="logistic_numberEntering" title="15天以内的支持模糊搜索，回车提交">
+                                               @input="logistic_numberEntering" @keypress="submitFilterOnEnter" title="15天以内的支持模糊搜索，回车提交">
                                     </td>
                                     <td>
                                         <label for="">审核：</label>
@@ -97,7 +97,7 @@
                                         <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">
+                                               @input="barcode_goodsEntering" @keypress="submitFilterOnEnter">
                                     </td>
                                     <td>
                                         <label for="">是否正品：</label>
@@ -112,13 +112,13 @@
                                         <label for="">寄件人手机：</label>
                                         <input type="text" class="form-control-sm tooltipTarget" name="mobile_sender"
                                                :class="filterParams.mobile_sender?'bg-warning':''"
-                                               @change="mobile_senderChange" title="输入完成敲回车提交">
+                                               @input="mobile_senderEntering" @keypress="submitFilterOnEnter" 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="支持右位留空的模糊搜索">
+                                               @input="checked_numbersEntering" @keypress="submitFilterOnEnter" title="支持右位留空的模糊搜索">
                                     </td>
                                     <td>
                                         <label for="">是否入库：</label>
@@ -319,5 +319,5 @@
         let exportExcelOnFilterParamsURL='{{url("rejected/exportExcelOnFilterParams")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/singles/rejectedIndex200212.js')}}"></script>
+    <script src="{{asset('js/singles/rejectedIndex200305.js')}}"></script>
 @endsection

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

@@ -97,7 +97,7 @@
             },
             mounted(){
                 initEcho();
-                Echo.channel('bswas_database_package').listen('.weight',(e)=>{
+                Echo.channel('{{$laravelEchoPrefix}}package').listen('WeighedEvent',(e)=>{
                     let package=e.package;
                     let _this=this;
                     let audio=document.getElementById('audio');

webpack.mix.js

@@ -13,7 +13,7 @@ const mix = require('laravel-mix');
 
 mix.js('resources/js/app.js', 'public/js')
     .sass('resources/sass/app.scss', 'public/css');
-mix.js('resources/js/singles/rejectedIndex.js', 'public/js/singles/rejectedIndex200212.js');
+mix.js('resources/js/singles/rejectedIndex.js', 'public/js/singles/rejectedIndex200305.js');
 mix.copy('resources/sass/fonts/','public/fonts');
 mix.copy('resources/icon','public/icon');
 mix.copy('resources/images','public/images');