Merge branch 'zzd'

# Conflicts:
#	resources/views/personnel/laborReport/index.blade.php

app/Http/Controllers/InventoryController.php

@@ -36,32 +36,32 @@ class InventoryController extends Controller
         if ($date_start) $sql.=" and addtime > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if (!$date_start && !$date_end)$sql .= " and addtime >to_date('".date('Y-m-d H:i:s',strtotime("-1 day"))."','yyyy-mm-dd hh24:mi:ss') ";
-        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."%' ";
-        if ($SKU)$sql.=" and FMSKU like '".$SKU."%' ";
+        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."' ";
+        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
         $sql.=' group by TOCustomerID, TOLocation,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,FMCUSTOMERID 客户,sum(FMQty_Each) as 移出数量, 0 as 移入数量, FMLOCATION as 库位 ';
         $sql.=" from ACT_Transaction_Log where TransactionType='SO' ";
         if ($date_start) $sql.=" and addtime > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if (!$date_start && !$date_end)$sql .= " and addtime >to_date('".date('Y-m-d H:i:s',strtotime("-1 day"))."','yyyy-mm-dd hh24:mi:ss') ";
-        if ($TOLocation)$sql .= " and FMLOCATION like '".$TOLocation."%' ";
-        if ($SKU)$sql.=" and FMSKU like '".$SKU."%' ";
+        if ($TOLocation)$sql .= " and FMLOCATION like '".$TOLocation."' ";
+        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
         $sql.=' group by FMCustomerID, FMLocation,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,FMCUSTOMERID 客户,sum(FMQty_Each) as 移出数量,0 as 移入数量, FMLocation as 库位 ';
         $sql.=" from ACT_Transaction_Log  where TransactionType='MV' ";
         if ($date_start) $sql.=" and addtime > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if (!$date_start && !$date_end)$sql .= " and addtime >to_date('".date('Y-m-d H:i:s',strtotime("-1 day"))."','yyyy-mm-dd hh24:mi:ss') ";
-        if ($TOLocation)$sql .= " and FMLocation like '".$TOLocation."%' ";
-        if ($SKU)$sql.=" and FMSKU like '".$SKU."%' ";
+        if ($TOLocation)$sql .= " and FMLocation like '".$TOLocation."' ";
+        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
         $sql.=' group by FMLocation,FMCUSTOMERID,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,TOCustomerID 客户,0 as 移出数量,sum(TOQty_Each)as 移入数量, TOLocation as 库位 ';
         $sql.=" from ACT_Transaction_Log where TransactionType='MV' ";
         if ($date_start) $sql.=" and addtime > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if (!$date_start && !$date_end)$sql .= " and addtime >to_date('".date('Y-m-d H:i:s',strtotime("-1 day"))."','yyyy-mm-dd hh24:mi:ss') ";
-        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."%' ";
-        if ($SKU)$sql.=" and FMSKU like '".$SKU."%' ";
+        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."' ";
+        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
         $sql.=' group by TOLocation,TOCustomerID,FMSKU,FMLotNum)stockLog ';
         $sql.=' left join BAS_Customer customer on customer.CustomerID=stockLog.客户 ';
         $sql.=' left join BAS_SKU sku on sku.SKU=stockLog.FMSKU and sku.CUSTOMERID=stockLog.客户 ';
@@ -72,11 +72,11 @@ class InventoryController extends Controller
         $sql.=' ,sku.Descr_C,FMLotNum,lot.LotAtt05,lot.LotAtt08,lot.LotAtt02,lot.LotAtt04 ';
         $sql.=' , storeStatus.QTY, storeStatus.QtyAllocated,stockLog.客户  ';
         $sql.=' )result where 1=1 ';
-        if ($LotAtt05)$sql .=" and 属性仓 like '".$LotAtt05."%' ";
+        if ($LotAtt05)$sql .=" and 属性仓 like '".$LotAtt05."' ";
         if ($LotAtt02_start)$sql.=" and 失效日期 >='".$LotAtt02_start." 00:00:00' ";
         if ($LotAtt02_end)$sql.=" and 失效日期 <='".$LotAtt02_end." 23:59:59' ";
         if ($descr_c)$sql.=" and 货主 ='".$descr_c."' ";
-        if ($ALTERNATE_SKU1)$sql.=" and 产品条码 like '".$ALTERNATE_SKU1."%' ";
+        if ($ALTERNATE_SKU1)$sql.=" and 产品条码 like '".$ALTERNATE_SKU1."' ";
         if ($page&&$paginate)$sql.="  and ROWNUM<='".$page*$paginate."'";
         $sql.=' )  ';
         if ($page&&$paginate)$sql.="  where rn>'".($page-1)*$paginate."'";
@@ -93,8 +93,8 @@ class InventoryController extends Controller
     }
 
     public function exportData(Request $request){
-        if ($request->input('export')==1){
-            $oracleActTransactingLogs=json_decode($request->input('checkData'),true);
+        if (!$request->checkAllSign){
+            $oracleActTransactingLogs=json_decode($request->input('data'),true);
             return $this->export($oracleActTransactingLogs);
         }
         $oracleActTransactingLogs=$this->conditionQuery($request);

app/Http/Controllers/LaborReportController.php

@@ -34,6 +34,7 @@ class LaborReportController extends Controller
     {
         //if(!Gate::allows('人事管理')){ return redirect(url('/'));  }
         if(!Gate::allows('人事管理-临时工报表')){ return redirect(url('/'));  }
+        $paginateParams=$request->input();
         $user=Auth::user();
         if (!$user)return redirect('/');
         $userWorkgroupIds=$user->getPermittingWorkgroupIds(Gate::allows('人事管理-临时工报表-可见全部组'));
@@ -62,9 +63,8 @@ class LaborReportController extends Controller
                 $this->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
             }
         }
-        $request=$request->input();
         $userWorkGroups=UserWorkgroup::select('id','name')->get();
-        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','request'));
+        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','paginateParams'));
     }
     public function export(Request $request){
         if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }

app/Http/Controllers/OrderController.php

@@ -81,10 +81,7 @@ class OrderController extends Controller
         }else $request->offsetUnset('addtime');
         if ($soreference5){
             $arr=array_filter(preg_split('/[,， ]+/is', $soreference5));
-            if (count($arr)==1){
-                $sql.=" and soreference5 like '".$soreference5."%'";
-            }
-            if (count($arr)>1){
+            if (count($arr)>0){
                 $sql.=" and (soreference5 in (";
                 foreach ($arr as $index=>$str){
                     if ($index==0){

app/Http/Controllers/PackageController.php

@@ -35,8 +35,9 @@ class PackageController extends Controller
     public function index(Request $request,OwnerService $ownerService)
     {
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
+        $paginateParams = $request->input();
         $packages = app('packageService')->paginate($request);
-        return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'request'=>$request->input()]);
+        return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'paginateParams'=>$paginateParams]);
     }
 
     /**

app/Http/Controllers/ProcessController.php

@@ -45,9 +45,10 @@ class ProcessController extends Controller
     public function index(Request $request,OwnerService $ownerService)
     {
         if(!Gate::allows('二次加工管理-查询')){ return redirect(url('/'));  }
+        $paginateParams = $request->input();
         $processes = app('processService')->paginate($request);
         $owners=$ownerService->getSelection();
-        return view('process.index',['processes'=>$processes,'owners'=>$owners,'request'=>$request->input()]);
+        return view('process.index',['processes'=>$processes,'owners'=>$owners,'paginateParams'=>$paginateParams]);
     }
 
     //获取每日参与人

app/Http/Controllers/RejectedController.php

@@ -44,12 +44,11 @@ class RejectedController extends Controller
                           QualityLabelService $qualityLabelService,LogisticService $logisticService)
     {
         if(!Gate::allows('退货管理-查询')){ return redirect(url('/login'));  }
-
+        $paginateParams = $request->input();
         $rejectedBills=app('rejectedService')->paginate($request);
         $owners = $ownerService->getSelection();
         $qualityLabels = $qualityLabelService->get();
         $logistics=$logisticService->get();
-        $paginateParams = $request->input();
         return view('rejected.search.general',compact('rejectedBills','owners','logistics',
             'paginateParams','qualityLabels'));
     }

app/Http/Controllers/WaybillsController.php

@@ -14,7 +14,6 @@ use App\WaybillAuditLog;
 use App\WaybillOnTop;
 use App\WaybillPriceModel;
 use App\Carrier;
-use App\CarType;
 use App\City;
 use App\Exports\Export;
 use App\Owner;
@@ -49,12 +48,13 @@ class WaybillsController extends Controller
     public function index(Request $request,OwnerService $ownerService,CarrierService $carrierService)
     {
         if(!Gate::allows('运输管理-查询')){ return redirect(url('/'));  }
+        $paginateParams = $request->input();
         $waybills=app('waybillService')->paginate($request);
         return view('waybill.index', [
             'waybills' => $waybills,
             'carriers' => $carrierService->getSelection(),
             'owners' => $ownerService->getSelection(),
-            'request'=>$request->input(),
+            'paginateParams'=>$paginateParams,
             'uriType'=>$request->uriType??'']);
     }
 

app/Services/PackageService.php

@@ -12,8 +12,8 @@ Class PackageService
     private function conditionQuery(Request $request){
         $packages = Package::query()->orderBy('id','DESC');
         $columnQueryRules=[
-            'logistic_number' => ['timeLimit' => 15],
-            'batch_number' => ['timeLimit' => 15],
+            'logistic_number' => ['like' => ''],
+            'batch_number' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at','startDate' => " 00:00:00"],
             'created_at_end' => ['alias' => 'created_at','endDate' => " 23:59:59"],
         ];

app/Services/ProcessService.php

@@ -15,41 +15,22 @@ Class ProcessService
                 return $query->with('barcodes');
             }]);
         }])->orderBy('processes.id','DESC');
-        $today=Carbon::now()->subDays(15)->format('Y-m-d');
         if ($request->input('commodity_barcode')){
             $barcode=$request->input('commodity_barcode');
-            $processesTem=clone $processes;
-            $processesTem=$processesTem->whereHas('processesContents',function ($query)use($barcode){
+            $processes=$processes->whereHas('processesContents',function ($query)use($barcode){
                 $query->whereHas('commodity',function ($builder)use($barcode){
                     $builder->whereHas('barcodes',function ($builder)use($barcode){
-                        $builder->where('code','like',$barcode.'%');
+                        $builder->where('code','like',$barcode);
                     });
                 });
-            })->where('created_at','>=',$today);
-            if ($processesTem->count()>0)$processes=$processesTem;
-            else{
-                $processes=$processes->whereHas('processesContents',function ($query)use($barcode){
-                    $query->whereHas('commodity',function ($builder)use($barcode){
-                        $builder->whereHas('barcodes',function ($builder)use($barcode){
-                            $builder->where('code',$barcode);
-                        });
-                    });
-                });
-            }
+            });
             $request->offsetUnset('commodity_barcode');
         }
         if ($request->input('wms_code')){
-            $processesTem=clone $processes;
             $wms_code=$request->input('wms_code');
-            $processesTem=$processesTem->whereHas('processesContents',function ($builder)use ($wms_code,$today){
-                $builder->where('wms_code','like','%'.$wms_code.'%');
-            })->where('created_at','>=',$today);
-            if ($processesTem->count()>0)$processes=$processesTem;
-            else{
-                $processes=$processes->whereHas('processesContents',function ($builder)use ($wms_code,$today){
-                    $builder->where('wms_code',$wms_code);
-                });
-            }
+            $processes=$processes->whereHas('processesContents',function ($builder)use ($wms_code){
+                $builder->where('wms_code','like',$wms_code);
+            });
             $request->offsetUnset('wms_code');
         }
         if (!$request->is_accomplish){
@@ -58,7 +39,8 @@ Class ProcessService
         $columnQueryRules=[
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'code' => ['like' => '']
+            'code' => ['like' => ''],
+            'owner_id' => ['multi' => ','],
         ];
         $processes = app(QueryService::class)->query($request,$processes,$columnQueryRules);
         return $processes;

app/Services/RejectedService.php

@@ -18,7 +18,7 @@ Class RejectedService
         $columnQueryRules=[
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'owner_id' => ['alias' => 'id_owner'],
+            'owner_id' => ['alias' => 'id_owner','multi' => ','],
             'order_number' => ['like' => ''],
             'logistic_number' => ['like' => ''],
             'mobile_sender' => ['like' => ''],

resources/js/queryForm/export.js

@@ -16,7 +16,7 @@ function excelExport(checkAllSign,checkData,url,sum,token) {
         } else {
             let form=$('<form hidden method="post" target="_blank" action="'+url+'">' +
                 '<input name="_token" value="'+token+'">' +
-                '<input name="data" value="'+checkData+'" >' +
+                "<input name='data' value='"+checkData+"' >" +
                 '</form>');
             $('body').append(form);
             form.submit();

resources/js/queryForm/queryForm.js

@@ -5,7 +5,7 @@ const query = function getQueryForm(data) {
         this.method = data.method || 'get';
         this.url = data.url || getPathname();
         this.condition = data.condition;
-        this.paginations = [50, 100, 200, 500] || data.paginations;
+        this.paginations = [50, 100, 200, 500,1000] || data.paginations;
         this.keydownfun = data.keydownfun || undefined;
         this.selectChange = data.selectChange || undefined;
         this.searchClick = data.searchClick || undefined;

resources/views/inventory/statement/changeInventory.blade.php

@@ -11,8 +11,8 @@
             导出Excel
         </button>
         <div class="dropdown-menu">
-            <a class="dropdown-item" @click="processExport(1)" href="javascript:">导出勾选内容</a>
-            <a class="dropdown-item" @click="processExport(2)" href="javascript:">导出所有页</a>
+            <a class="dropdown-item" @click="processExport(false)" href="javascript:">导出勾选内容</a>
+            <a class="dropdown-item" @click="processExport(true)" href="javascript:">导出所有页</a>
         </div>
     </span>
     <table class="table table-sm table-striped table-bordered table-hover text-nowrap card-body mt-2">
@@ -68,7 +68,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -165,16 +165,11 @@
                         this.checkData = [];
                     }
                 },
-                processExport:function(value){
-                    if (value==1&&this.checkData.length <= 0) {
-                        tempTip.setDuration(2000);
-                        tempTip.showSuccess('没有勾选任何记录');
-                        return
-                    }
-                    this.filterData.export=value;
-                    setTimeout(function () {
-                        $("#checkDataForm").submit();
-                    },1);
+                processExport(checkAllSign){
+                    let url = '{{url('inventory/statement/changeInventory/export')}}';
+                    let token='{{ csrf_token() }}';
+                    let data= JSON.stringify( this.checkData );
+                    excelExport(checkAllSign,data,url,this.sum,token);
                 },
             },
             filters:{

resources/views/order/index/delivering.blade.php

@@ -173,7 +173,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/order/wave/search.blade.php

@@ -83,7 +83,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",
@@ -122,7 +122,6 @@
                     {name: 'start_time', type: 'dataTime', tip: '选择显示指定日期的起始时间', placeholder: ''},
                     {name: 'end_time', type: 'dataTime', tip: '选择显示指定日期的结束时间', placeholder: ''},
                     {name: 'wave_num', type: 'input', tip: '波次编号：如模糊搜索需要在条件前后输入%号，回车提交', placeholder: ''},
-                    // {name:'wave_status',type:'select',tip:'',placeholder:'',data:[]},
                 ]];
                 this.form = new query({
                     el: '#form_div',

resources/views/personnel/laborReport/index.blade.php

@@ -155,8 +155,8 @@
                     </tbody>
                 </table>
         <div class="text-info h5 btn btn">{{$laborReports->count()}}/@{{ sum }}</div>
-        <div>{{$laborReports->appends($request)->links()}}</div>
-        {{--      选择晚饭时长弹框       --}}
+        <div>{{$laborReports->appends($paginateParams)->links()}}</div>
+        {{--      选择晚饭时长弹框      --}}
         <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
@@ -234,7 +234,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};
@@ -346,8 +346,8 @@
                     ],
                     [
                         {name:'created_at_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},
-                        {name:'mobile_phone',type:'input',tip:'',placeholder: '电话号'},
-                        {name:'identity_number',type:'input',tip:'',placeholder: '身份证号'},
+                        {name:'mobile_phone',type:'input',tip:'电话号:可在两侧增加百分号(%)进行模糊搜索',placeholder: '电话号'},
+                        {name:'identity_number',type:'input',tip:'身份证号:可在两侧增加百分号(%)进行模糊搜索',placeholder: '身份证号'},
                     ],
                 ];
                 this.form = new query({

resources/views/process/index.blade.php

@@ -467,7 +467,7 @@
                 </tr>
                 </template>
             </table>
-            {{$processes->appends($request)->links()}}
+            {{$processes->appends($paginateParams)->links()}}
         </div>
 </div>
 
@@ -476,7 +476,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         new Vue({
             el:"#process",
@@ -558,7 +558,8 @@
                 let data=[
                     [
                         {name:'date_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'owner_id',type:'select',placeholder: '客户',data:this.owners},
+                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                            placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'wms_code',type:'input',tip:'单据号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '单据号'},
                         {name:'status',type:'select',placeholder: '状态',data:this.status},
                     ],

resources/views/rejected/search/general.blade.php

@@ -209,7 +209,7 @@
         let csrfInput='@csrf';
     </script>
     <script src="{{asset('js/queryForm/export.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -233,13 +233,14 @@
                     @endforeach
                 ],
             },
-            mounted:function(){console.log(decodeURIComponent('eJxtkltLw0AQhf%2FLQt%2BWZO%2B7CRSJVqSCt7YWVPqQtiGW2gttlErxv3smbTGokIdvZ86eObNkzzbdKUulEF4Izj6KDUuZjETkGGfVFh2bOBGkF1IGCCY%2FNeutUUnC2Xgz7LD0RSoIrA8jqvRQOFS8EiN%2BQBeAyuAjTRcS9lpV620ax%2Bu8LKJ1MduulmW0KGbVe76MJqtFvH7LP8f5ZP7cj2fLabE7q%2FJxW7cuVSuIVnKBlAxmiwGZOc%2BlESj9Dzo5QSBwTfAnoL2daYIhUAB1AkkgAORsEy4VOdvQgEPLH29ZctYEJ0OrjyOsOCY0uGVIYygztQxuGTI0EFvyMRBbiqohdlTR0DgSazh78tFI6A09yrx%2BlD0%2Fv%2Bs8ofEboMgbz8YztGCBCbpmJ%2BGE5P377PbvkZa0qhYqidkqHJhWFYF3usM6XeAuqQ%2BYVtE0mnqDfwzd7axcgorr3eCx7GbZVZn1Htpt9vUNb5aS1Q%3D%3D'))
+            mounted:function(){
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 $('#list').removeClass('d-none');
                 let data=[
                     [
                         {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'owner_id',type:'search_select',tip:['',''],placeholder:['客户',''],data:this.owners},
+                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                            placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'order_number',type:'input',tip:'订单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'订单号'},
                         {name:'logistic_number_return',type:'input',tip:'退回单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'退回单号'},
                         {name:'logistic_number',type:'input',tip:'原单单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'原单单号'},

resources/views/waybill/index.blade.php

@@ -308,7 +308,7 @@
                 </div>
             </div>
             <div class="text-info h5 btn btn">{{$waybills->count()}}/{{$waybills->total()}}</div>
-            {{$waybills->appends($request)->links()}}
+            {{$waybills->appends($paginateParams)->links()}}
         </div>
     </div>
 
@@ -362,7 +362,7 @@
         }
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

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

@@ -70,11 +70,7 @@
                     </tr>
                 </table>
                 <div class="text-info h5 btn btn">{{$packages->count()}}/{{$packages->total()}}</div>
-                @if(isset($request))
-                    {{$packages->appends($request)->links()}}
-                @else
-                    {{$packages->links()}}
-                @endif
+                {{$packages->appends($paginateParams)->links()}}
             </div>
         </div>
     </div>
@@ -82,7 +78,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

routes/web.php

@@ -289,7 +289,7 @@ Route::group(['prefix'=>'personnel'],function(){
 Route::group(['prefix'=>'inventory'],function (){
     //动库报表
     Route::get('statement/changeInventory','InventoryController@changeInventory');
-    Route::post('statement/changeInventory/export','InventoryController@exportData');
+    Route::any('statement/changeInventory/export','InventoryController@exportData');
     Route::get('statement/changeInventory/downLoadExcel','InventoryController@downLoadExcel');
     Route::post('statement/changeInventory/deleteExcel','InventoryController@deleteExcel');
 });

webpack.mix.js

@@ -22,5 +22,5 @@ mix.copy('resources/images','public/images');
 mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
-mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200803.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export.js');