m

app/Http/Controllers/Admin/OrderController.php

@@ -238,6 +238,28 @@ class OrderController extends Controller
 
         $result = json_decode(json_encode($result),true);
 
+        $status_arr = array(
+            0 => '已录入',
+            1 => '待审核',
+            2 => '已审核',
+            3 => '已发货',
+        );
+        foreach($result as $k=>&$v){
+            
+            //获取商品信息
+            $v['goods'] = '';
+            $goods = DB::table('order_goods_skus')->where('order_id', $v['id'])->where('is_del', 0)->get();
+            if(!empty($goods)){
+                foreach($goods as $item){
+                    $goods_name = Goods::where('id', $item->goods_id)->pluck('name');
+                    $props_name = GoodsSkus::where('id', $item->sku_id)->pluck('propsName');
+                    $v['goods'][] = $goods_name.'('.$props_name.')  单价:￥'.$item->price.'  件数:'.$item->num.'';
+                }
+            }
+
+            $v['status_name'] = $status_arr[$v['status']];            
+        }
+
         $yestoday = date('Y-m-d', strtotime('-1 day'));
         //获取超时未发订单
         $order_overtime = Order::where('is_del',0)->where('warehouse', $warehouse)->where('status', '>', 1)->where('delivery_date', '<', $yestoday)->where('createTime', '>=', $_start)->where('logistics_id', '=', '')->lists('id');
@@ -354,14 +376,16 @@ class OrderController extends Controller
             3 => '已发货',
         );
         foreach($result as $k=>&$v){
-            /*
             //获取商品信息
             $v['goods'] = '';
-            $goods = DB::table('order_goods')->where('outerParentCode', $v['outerCode'])->get();
-            foreach($goods as $item){
-                $v['goods'][] = $item->goodsName.'&nbsp; 单价:￥'.$item->price.'&nbsp; 件数:'.$item->quantity.'';
+            $goods = DB::table('order_goods_skus')->where('order_id', $v['id'])->where('is_del', 0)->get();
+            if(!empty($goods)){
+                foreach($goods as $item){
+                    $goods_name = Goods::where('id', $item->goods_id)->pluck('name');
+                    $props_name = GoodsSkus::where('id', $item->sku_id)->pluck('propsName');
+                    $v['goods'][] = $goods_name.'('.$props_name.')&nbsp; 单价:￥'.$item->price.'&nbsp; 件数:'.$item->num.'';
+                }
             }
-            */
             #加粉时间
             $fanTime = DB::table('customers')->select('fanTime')->where('phone', $v['receiverMobile'])->first();
             $v['fanTime'] = isset($fanTime->fanTime) ? $fanTime->fanTime : '';

resources/views/order/predictorderlist.blade.php

@@ -89,7 +89,15 @@
                             <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>
+                                @if( is_array($a['goods']) && $a['warehouse'] == 3)
+                                    @foreach($a['goods'] as $good)
+                                        <p>{{$good}}</p>
+                                    @endforeach
+                                @else
+                                {{$a['goods_note']}}
+                                @endif
+                            </td> 
                             <td>{{$a['delivery_date']}}</td> 
 
                             @if($self_role =='销售' || ($self_role =='管理员' && $a['status']>0) ) 

resources/views/order/warehouselist.blade.php

@@ -77,7 +77,15 @@
                             <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>
+                                @if( is_array($a['goods']) && $a['warehouse'] == 3)
+                                    @foreach($a['goods'] as $good)
+                                        <p>{{$good}}</p>
+                                    @endforeach
+                                @else
+                                {{$a['goods_note']}}
+                                @endif
+                            </td>                             
                             <td style="">{{$a['delivery_date']}}</td>                            
                             <td>{{$a['verify_time']}}</td>                            
                             <td class ="change_logistics_id">