Merge branch 'zjl_erp_20190923' into development

resources/views/selfOrder/content.blade.php

@@ -226,6 +226,7 @@
                     <th class="pl30">会员账号</th>
                     <th class="pl30">公司</th>
                     <th class="pl30">订单编号</th>
+                    <th class="pl30">ERP单号</th>
                     <th class="pl30">应付金额</th>
                     <th class="pl30">订单状态</th>               
                     <th class="pl30">付款类型</th>               
@@ -270,6 +271,8 @@
                                 @endif
                             </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">
                                 <?php 
                                     $currencySign = $v['currency'] == 1 ? '￥' : '$';