m

app/Http/Controllers/Admin/OrderController.php

@@ -180,9 +180,6 @@ class OrderController extends Controller
         $delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间（未填物流信息） 2全部 
         $receiverName = trim($request->input('receiverName'));
         $receiverMobile = trim($request->input('receiverMobile'));
-        if($etime){
-            $etime = $etime. ' 23:59:59';
-        }
 
         //仓库管理员只能看到 918之后的数据
         $_start = '2019-09-18';
@@ -1064,10 +1061,6 @@ class OrderController extends Controller
         $receiverMobile = $request->input('receiverMobile');
         $delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间（未填物流信息） 2全部
 
-        if($etime){
-            $etime = $etime. ' 23:59:59';
-        }
-
         $_start = '2019-09-18';// 只看18号之后数据
         $today_date = date('Y-m-d');
         $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $today_date, $delivery_type, $_start){

resources/views/order/warehouselist.blade.php

@@ -10,9 +10,9 @@
         <div>
             <div>                      
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="开始时间"/>
-                <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="stime" value="{{$stime?$stime:''}}">
+                <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="结束时间"/>
-                <input id="etime"type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="etime" value="{{$etime?$etime:''}}">
+                <input id="etime"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="etime" value="{{$etime?$etime:''}}">
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="收货人"/>
                 <input id="receiverName" type="text"  class="input-text" style="width:8%;text-align:center" name="receiverName" value="{{$receiverName?$receiverName:''}}">
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="收货人手机号"/>