调整erp列表

app/Http/Controllers/OrderController.php

@@ -482,7 +482,7 @@ Class OrderController extends Controller
         $show = $page->show();
 
         $info['condition']        = $info['map']; 
-        $info['sale_list']        = $sale_list; 
+        $info['sale_list']        = isset($sale_list) ? $sale_list : ''; 
         $info['list']             = $response['data']['data']; 
         $info['count']            = $response['data']['count']; 
         $info['page']             = $show; 

resources/views/erpOrder/content.blade.php

@@ -79,7 +79,6 @@
                     <th class="pl30">订单状态</th>
                     <th class="pl30">付款类型</th>
                     <th class="pl30">支付方式</th>                  
-                    <th class="pl30">推送业务员</th>
                     <th class="pl30">发货状态</th>
                     <th class="pl30">配送方式</th>
                     <th class="pl30">订单来源</th>
@@ -90,7 +89,7 @@
 
                 @if (empty($list))
                     <tr>
-                        <td colspan="11" class="text-center">没有查询到相关记录~</td>
+                        <td colspan="10" class="text-center">没有查询到相关记录~</td>
                     </tr>
                 @else
                 <tbody>
@@ -122,15 +121,6 @@
                             <td class="show-list"> {{ Config('params.order_pay_type')[$v['order_pay_type']] }} </td>
                             <td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td>
                             
-                            <td class="show-list">
-                                <?php 
-                                    foreach ($sale_list as $val) {
-                                        if ($val->userId == $v['sale_id']) {
-                                            echo $val->name;
-                                        }
-                                    }     
-                                ?>
-                            </td>
                             <td class="show-list" class="show-list">
                                 <?php
                                     $status = App\Http\Controllers\getShipping($v['order_id']);