仓管只能看今天之前发货的

app/Http/Controllers/Admin/OrderController.php

@@ -178,7 +178,7 @@ class OrderController extends Controller
         
         $stime = $request->input('stime');
         $etime = $request->input('etime');
-        $delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间（未填物流信息） 2全部 
+        $delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间（未填物流信息） 2到发货时间全部 
         $receiverName = trim($request->input('receiverName'));
         $receiverMobile = trim($request->input('receiverMobile'));
 
@@ -190,11 +190,11 @@ class OrderController extends Controller
             if($admin_id) $query->where('admin_id', $admin_id);
             if($stime) $query->where('createTime', '>=', $stime);
             if($etime) $query->where('createTime', '<=', $etime);
-            if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
+            if($delivery_type==0) $query->where('logistics_id', '=', '');
             if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
             $query->where('createTime', '>=', $_start);
-        })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->count();
+        })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->count();
 
         if ($count > 1) {
             // 总页数
@@ -208,11 +208,11 @@ class OrderController extends Controller
             if($admin_id) $query->where('admin_id', $admin_id);
             if($stime) $query->where('createTime', '>=', $stime);
             if($etime) $query->where('createTime', '<=', $etime);            
-            if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
+            if($delivery_type==0) $query->where('logistics_id', '=', '');
             if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
             $query->where('createTime', '>=', $_start);
-        })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
+        })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
 
         $result = json_decode(json_encode($result),true);
                 
@@ -1077,9 +1077,9 @@ class OrderController extends Controller
             if($etime) $query->where('createTime', '<=', $etime);
             if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
-            if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
+            if($delivery_type==0) $query->where('logistics_id', '=', '');
             $query->where('createTime', '>=', $_start);
-        })->where('is_del',0)->where('status', '>', 1)->orderBy('id', 'desc')->get();
+        })->where('is_del',0)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->orderBy('id', 'desc')->get();
 
         $result = json_decode(json_encode($result),true);
         foreach ($result as $k => &$v)

resources/views/order/warehouselist.blade.php

@@ -8,7 +8,9 @@
     @endif
     <div class="page-container">
         <div>
-            <div>                      
+            <div>   
+                <input class="input-text" style="width:5%;text-align:center" type="text" value="订单编号"/>
+                <input id="id" type="text"  class="input-text" style="width:6%;text-align:center" name="id" value="{{$id?$id:''}}">                   
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="开始时间"/>
                 <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="stime" value="{{$stime?$stime:''}}">
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="结束时间"/>
@@ -43,6 +45,7 @@
                     <th width="6%">收货人手机号</th>
                     <th width="10%">收货地址</th>
                     <th width="12%">商品信息</th>
+                    <th width="7%">预发货时间</th>
                     <th width="6%">物流单号</th>                    
                     <th width="5%">货品成本</th>                  
                     <th width="5%">运费成本</th>                  
@@ -62,6 +65,7 @@
                             <td>{{$a['receiverMobile']}}</td>                            
                             <td>{{$a['receiverState']}}{{$a['receiverCity']}}{{$a['receiverDistrict']}}{{$a['receiverStreet']}}{{$a['receiverAddress']}}</td>                            
                             <td>{{$a['goods_note']}}</td>                            
+                            <td>{{$a['delivery_date']}}</td>                            
                             <td class ="change_logistics_id"> 
                                 <p id="logi_1{{$a['id']}}">{{$a['logistics_id']}}</p> 
                                 <input id="logi_2{{$a['id']}}" style="display: none" type='text' autofocus="autofocus" name='logistics_id' value="{{$a['logistics_id']}}" onblur="change_logistics_id({{$a['id']}})" />
@@ -149,8 +153,9 @@
             var etime = $('#etime').val();
             var receiverName = $('#receiverName').val();
             var receiverMobile = $('#receiverMobile').val();
+            var id = $('#id').val();
 
-            location.href="/admin/order/edit/"+id+'?page='+page+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
+            location.href="/admin/order/edit/"+id+'?page='+page+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile+'&id='+id;
         }
         /*广告-设为首页显示*/
         function up(obj,id){
@@ -176,8 +181,9 @@
             var delivery_type = $('#delivery_type').val();
             var receiverName = $('#receiverName').val();
             var receiverMobile = $('#receiverMobile').val();
+            var id = $('#id').val();
             //var page = {{$page}};
-            location.href = 'warehouse?stime='+stime+'&etime='+etime+'&delivery_type='+delivery_type+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
+            location.href = 'warehouse?stime='+stime+'&etime='+etime+'&delivery_type='+delivery_type+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile+'&id='+id;
         }
         //导出
         function order_export(){
@@ -186,6 +192,7 @@
             var delivery_type = $('#delivery_type').val();
             var receiverName = $('#receiverName').val();
             var receiverMobile = $('#receiverMobile').val();
+            var id = $('#id').val();
             location.href = '/admin/order/warehouse_export?stime='+stime+'&etime='+etime+'&delivery_type='+delivery_type+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
         }
 
@@ -320,7 +327,8 @@
                 var receiverName = $('#receiverName').val();
                 var receiverMobile = $('#receiverMobile').val();
                 var delivery_type = $('#delivery_type').val();
-                location.href = 'warehouse?page='+num+'&stime='+stime+'&etime='+etime+'&delivery_type='+delivery_type+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
+                var id = $('#id').val();
+                location.href = 'warehouse?page='+num+'&stime='+stime+'&etime='+etime+'&delivery_type='+delivery_type+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile+'&id='+id;
             }
         })