Merge branch 'master' of ssh://119.23.72.7:22611/zhujilai/Order into lt_订单周迭代3.08

public/js/order.js

@@ -324,9 +324,13 @@
                                                     <td>'+data[i].goods_number+'</td>\
                                                     <td>'+data[i].goods_number+'</td>\
                                                     <td>'+data[i].goods_price_format+'</td>\
                                                     <td>'+data[i].goods_price_format+'</td>\
                                                     <td>'+data[i].single_pre_price_format+'</td>\
                                                     <td>'+data[i].single_pre_price_format+'</td>\
-                                                    <td>'+data[i].single_pre_price_amount+'</td>\
-                                                    <td>'+data[i].supplier_name+'</td>\
-                                                    <td>'+data[i].delivery_time+'</td>';
+                                                    <td>'+data[i].single_pre_price_amount+'</td>';
+
+                                            if (order_goods_type == 1) {
+                                                html += '<td>'+data[i].supplier_name+'</td>';
+                                            } 
+                                                    
+                                            html += '<td>'+data[i].delivery_time+'</td>';
                                                 
                                                 
                                             if (order_goods_type == 1) {
                                             if (order_goods_type == 1) {
                                                 var rec_id = data[i].rec_id;
                                                 var rec_id = data[i].rec_id;

resources/views/detail/content.blade.php

@@ -471,10 +471,10 @@
                         <th>小计</th>
                         <th>小计</th>
                         <th>货期</th>
                         <th>货期</th>
                         
                         
-                        <!-- 15011111111和自营客服均不展示供应商列 -->
-                        @if ($role != 12 && $role != 7)
+                        @if ($order_info['order_goods_type'] == 1)
                             <th>供应商</th>
                             <th>供应商</th>
                         @endif
                         @endif
+
                         <th>自采标记</th>
                         <th>自采标记</th>
 
 
                         @if ($order_info['order_goods_type'] == 1)
                         @if ($order_info['order_goods_type'] == 1)
@@ -522,7 +522,7 @@
 
 
                             <td>{{$v['delivery_time']}}</td>
                             <td>{{$v['delivery_time']}}</td>
 
 
-                            @if ($role != 12 && $role != 7)
+                            @if ($order_info['order_goods_type'] == 1)
                                 <td>{{$v['supplier_name']}}</td>
                                 <td>{{$v['supplier_name']}}</td>
                             @endif
                             @endif
 
 

resources/views/selfOrder/content.blade.php

@@ -363,7 +363,6 @@
                                             <th>购买时单价</th>
                                             <th>购买时单价</th>
                                             <th>均摊后单价</th>
                                             <th>均摊后单价</th>
                                             <th>小计</th>
                                             <th>小计</th>
-                                            <th>供应商</th>
                                             <th colspan="5">交期</th>
                                             <th colspan="5">交期</th>
                                         </tr>
                                         </tr>
                                     </thead>
                                     </thead>