m

app/Http/Controllers/Admin/OrderController.php

@@ -215,7 +215,7 @@ class OrderController extends Controller
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
             $query->where('createTime', '>=', $_start);
             if($id>0) $query->where('id', $id);
-        })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
+        })->where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<=', $today_date)->orderBy('verify_time', 'asc')->offset($offset)->limit($pageSize)->get();
 
         $result = json_decode(json_encode($result),true);
                 
@@ -233,6 +233,8 @@ class OrderController extends Controller
             'receiverName'         =>$receiverName,
             'receiverMobile'       =>$receiverMobile,
             'id'       =>$id,
+            'today'    =>$today_date,
+            'yestoday'    => date('Y-m-d', strtotime('-1 day')),
             ]);
     }
 
@@ -752,6 +754,9 @@ class OrderController extends Controller
                 $order->refuse_reason = $refuse_reason;
             }
         }
+        if($order->status == 2 || $order->status == 0){
+            $order->verify_time = date('Y-m-d H:i:s'); //审核时间
+        }
         $res = $order ->save(); 
         if($res){
             #记录操作日志

resources/views/order/orderlist.blade.php

@@ -65,6 +65,7 @@
                     <th width="5%">退补备注</th>                 
                     <th width="4%">所属销售</th> 
                     <th width="4%">订单状态</th>                  
+                    <th width="4%">审核时间</th>                  
                     @if($self_role =='销售' )<th width="5%">驳回原因</th>@endif                                    
                     <th width="5%">买家备注</th>                  
                     <th width="5%">卖家备注</th>                                                        
@@ -124,6 +125,7 @@
 
                             <td>{{$a['admin_name']}}</td>
                             <td id="order_verify{{$a['id']}}">{{$a['status_name']}}</td>
+                            <td>{{$a['verify_time']}}</td>
                             @if($self_role =='销售' ) <td>@if($a['status'] == 0)<font color='red'> {{$a['refuse_reason']}} </font> @endif</td> @endif
                            
                             <!--td id="refund{{$a['id']}}">@if($a['order_status']==2) <span class="btn btn-danger radius">退款</span> @else 正常<br><span class="btn btn-primary radius" onclick="order_refund({{$a['id']}})">设为退款</span> @endif</td --> 

resources/views/order/warehouselist.blade.php

@@ -40,13 +40,14 @@
             <table class="table table-border table-bordered table-bg table-hover table-sort">
                 <thead>
                 <tr class="text-c">
-                    <th width="8%">订单编号</th>
+                    <th width="5%">订单编号</th>
                     <th width="5%">买家名称</th>
                     <th width="5%">收货人</th>
                     <th width="6%">收货人手机号</th>
                     <th width="10%">收货地址</th>
                     <th width="12%">商品信息</th>
-                    <th width="7%">预发货时间</th>
+                    <th width="6%">预发货时间</th>
+                    <th width="6%">审核时间</th>
                     <th width="6%">物流单号</th>                    
                     <th width="5%">货品成本</th>                  
                     <th width="5%">运费成本</th>                  
@@ -59,14 +60,15 @@
                 <tbody>
                 @if($result)
                     @foreach($result as $a)
-                        <tr class="text-c" style=" text-align:center;">                           
+                        <tr class="text-c" style=" text-align:center; ">                           
                             <td>{{$a['id']}}</td>                            
                             <td>{{$a['customerName']}}</td>                            
                             <td>{{$a['receiverName']}}</td>                            
                             <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 style="@if($a['delivery_date'] < $yestoday && !$a['logistics_id']) background-color: #FF0000; @elseif($a['delivery_date'] < $today && !$a['logistics_id']) background-color: #f37b1d; @endif">{{$a['delivery_date']}}</td>                            
+                            <td>{{$a['verify_time']}}</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']}})" />