ソースを参照

增加运单备注查询

Zhouzhendong 4 年 前
コミット
c6dd8ae1f9

+ 0 - 1
app/Owner.php

@@ -4,7 +4,6 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Facades\Auth;
 

+ 0 - 1
app/Services/OwnerService.php

@@ -182,7 +182,6 @@ class OwnerService implements UserFilter
     }
 
     public function getAuthorizedOwners(){
-        $user = Auth::user();
         return Owner::query()->whereIn('id',app("OwnerService")->getQuery())->get();
     }
 

+ 2 - 2
app/Services/WaybillService.php

@@ -136,9 +136,9 @@ class WaybillService
             'uriType' => ['alias' => 'type'],
             'id' => ['multi' => ','],
             'logistic' => ['alias' => 'logistic_id', 'multi' => ','],
+            'ordering_remark' => ['like' => '%'],
         ];
-        $waybills = app(QueryService::class)->query($param,$waybills,$columnQueryRules,"waybills");
-        return $waybills;
+        return app(QueryService::class)->query($param,$waybills,$columnQueryRules,"waybills");
     }
 
     public function paginate(array $param){

+ 1 - 1
app/Services/common/QueryService.php

@@ -63,7 +63,7 @@ class QueryService
                     $isExecute = true;
                 }
                 if ($rule === 'like'){
-                    $query = $query->where($tableName.$column,'like',$value.$params[$param].$value.'%');
+                    $query = $query->where($tableName.$column,'like',$value.$params[$param].'%');
                     $isExecute = true;
                 }
                 if ($rule === 'multi'){

+ 1 - 0
resources/views/transport/waybill/index.blade.php

@@ -682,6 +682,7 @@
                             placeholder:['承运商','定位或多选承运商'],data:this.logistics},
                         {name:'carType_id',type:'select',placeholder: '车型',data:this.carTypes},
                         {name:'express_face_list',type:'select',placeholder: '快递面单是否打印',data:this.expresss},
+                        {name:'ordering_remark',type:'input',tip: '运单备注,默认全模糊查询,推荐配合日期使用',placeholder: '运单备注'},
                     ]
                 ];
                 let param=[];