Merge branch 'zjl_order_list_20190902' into development

resources/views/orderlist/content.blade.php

@@ -257,8 +257,9 @@
                             <td class="show-list">
                             <td class="show-list">
                                 <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;">{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}</p>
                                 <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;">{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}</p>
                             </td>  
                             </td>  
-                            <td class="show-list">{{$v['order_sn']}}</td>  
-                            <td class="show-list">{{$v['erp_order_id']}}</td>  
+                            <td class="show-list">{{$v['order_sn']}}</td> 
+                            <?php $order_extend = App\Http\Controllers\getOrderExtend($v['order_id']); ?> 
+                            <td class="show-list">{{ $order_extend ? $order_extend->erp_sn : '' }}</td>  
                             <td class="show-list">
                             <td class="show-list">
                                 <?php 
                                 <?php 
                                     $currencySign = $v['currency'] == 1 ? '￥' : '$';
                                     $currencySign = $v['currency'] == 1 ? '￥' : '$';