补充上次的样式提交

app/Http/Controllers/OrderController.php

@@ -146,6 +146,9 @@ class OrderController extends Controller
         if(!Gate::allows('订单管理-查询')){ return redirect(url('/'));  }
         $paginate=$request->input('paginate')??50;
         $page=$request->input('page')??1;
+        if ($request->alternate_sku1){
+            $page = 1;$paginate=50;
+        }
         $checkData=$request->input('data');
         $export=$request->input('checkAllSign');
         $sql="select ACT_ALLOCATION_DETAILS.picktotraceid,ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
@@ -221,6 +224,7 @@ class OrderController extends Controller
         $commodities=new Collection($commodities);
         if ($checkData || $export)return $this->export($orders,$commodities);
         $customers=OracleBasCustomer::query()->select('customerid','descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
+        $page = $request->page ?? 1;
         $request=$request->input();
         $codes=DB::connection('oracle')->table('BAS_CODES')->select('code','codename_c')->where('codeid','SO_STS')->orderBy('code','asc')->get();
         return view('order/index/delivering',compact('orders','customers','request','codes','commodities','page','picktotraceids'));

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

@@ -130,9 +130,9 @@
                     </tr>
                 </table>
                 <button type="button" @click="pageUp()" :readonly="page>1?false:true" class="btn btn-sm " :class="page>1?'btn-outline-info':''">上一页</button>
-                <button type="button" @click="pageDown()" :readonly="page<maxPage?false:true" class="btn btn-sm m-3" :class="page<maxPage?'btn-outline-info':''">下一页</button>
-                <input  @keyup.enter="pageSkip($event)" class="form-control-sm ml-3 tooltipTarget" :placeholder="'当前页数：'+page+'/'+maxPage" title="去往指定页">
-                <span class="text-muted m-1">共 @{{ sum }} 条</span>
+                <button type="button" @click="pageDown()" :readonly="maxPage == 0 ? false : (page<maxPage?false:true)" class="btn btn-sm m-3" :class="maxPage == 0 ? 'btn-outline-info' : (page<maxPage?'btn-outline-info':'')">下一页</button>
+                <input  @keyup.enter="pageSkip($event)" class="form-control-sm ml-3 tooltipTarget" :placeholder="pagePlaceholder" title="去往指定页">
+                <span class="text-muted m-1" v-if="maxPage != 0">共 @{{ sum }} 条</span>
             </div>
         </div>
     </div>
@@ -166,6 +166,7 @@
                 ],
                 selectedStyle:'',
                 picktotraceidMap:{!! $picktotraceids !!},
+                pagePlaceholder:"",
             },
             mounted:function () {
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
@@ -174,6 +175,12 @@
                     this.maxPage=Math.ceil(this.orders[0].counted/50);
                     this.sum=this.orders[0].counted;
                 }
+                if (this.getQueryVariable('alternate_sku1')){
+                    this.maxPage=0;
+                    this.pagePlaceholder = '当前页数：'+this.page;
+                }else{
+                    this.pagePlaceholder = '当前页数：'+this.page+'/'+this.maxPage;
+                }
                 let data=[
                     [   {name:'codename_c',type:'select',placeholder:'订单状态',data:this.codes},
                         {name:'orderdate_start',type:'time',tip:['选择显示日期的起始时间','选择显示日期的起始时间'],
@@ -270,12 +277,21 @@
                 }
             },
             methods:{
+               getQueryVariable(variable){
+                    let query = window.location.search.substring(1);
+                    let vars = query.split("&");
+                    for (let i=0;i<vars.length;i++) {
+                        let pair = vars[i].split("=");
+                        if(pair[0] == variable){return pair[1];}
+                    }
+                    return(false);
+                },
                 pageUp(){
                     if (this.page<=1)return;
                     this.href(this.page-1);
                 },
                 pageDown(){
-                    if (this.page>=this.maxPage)return;
+                    if (this.page>=this.maxPage && this.maxPage !== 0)return;
                     this.href(this.page+1);
                 },
                 pageSkip(e){