1. 联营订单详情添加供应商列;

2. 联营导入取消供应商校验;

resources/views/addOrder/content.blade.php

@@ -247,7 +247,7 @@
 
 
                 <div class="batch-btn">
                 <div class="batch-btn">
                     <a class="btn btn-success goods_import" data-type="1">批量导入物料</a>
                     <a class="btn btn-success goods_import" data-type="1">批量导入物料</a>
-                    <a class="btn btn-info" href="http://img.ichunt.com/doc/excel/template/%E8%81%94%E8%90%A5%E8%AE%A2%E5%8D%95%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.csv">联营物料模板下载</a>
+                    <a class="btn btn-info" href="http://img.ichunt.com/doc/excel/template/%E8%81%94%E8%90%A5%E8%AE%A2%E5%8D%95%E6%89%B9%E9%87%8F%E6%B7%BB%E5%8A%A0%E6%A8%A1%E6%9D%BF.csv">联营物料模板下载</a>
                 </div>
                 </div>
             </div>   
             </div>   
         </div>
         </div>

resources/views/detail/content.blade.php

@@ -449,6 +449,10 @@
                             <th>商品名</th>
                             <th>商品名</th>
                         @endif
                         @endif
 
 
+                        @if ($order_info['order_goods_type'] == 1)
+                            <th>供应商</th>
+                        @endif
+
                         <th>制造商</th>
                         <th>制造商</th>
                         
                         
                         <!-- ERP或京东订单 -->
                         <!-- ERP或京东订单 -->
@@ -513,6 +517,10 @@
                                 <td><a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
                                 <td><a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
                             @endif
                             @endif
 
 
+                            @if ($order_info['order_goods_type'] == 1)
+                                <td>{{$v['supplier_name']}}</td>
+                            @endif
+
                             <td>{{$v['brand_name']}}</td>
                             <td>{{$v['brand_name']}}</td>
                             <td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
                             <td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
                             <td>
                             <td>
@@ -555,8 +563,6 @@
                                <?php echo !empty($v['batch'])?$v['batch']:''; ?>
                                <?php echo !empty($v['batch'])?$v['batch']:''; ?>
                             </td>   
                             </td>   
 
 
-                            
-
                             @if ($order_info['order_goods_type'] == 1)
                             @if ($order_info['order_goods_type'] == 1)
                                 <td><a class="order-track" data-rid="{{$v['rec_id']}}">{{ App\Http\Controllers\getLastTrack($v['rec_id']) }}</a></td>
                                 <td><a class="order-track" data-rid="{{$v['rec_id']}}">{{ App\Http\Controllers\getLastTrack($v['rec_id']) }}</a></td>
                             @endif
                             @endif