Merge branch 'zjl_sample_20190925' into development

public/js/add_order.js

@@ -265,6 +265,7 @@
                             $('.sku-info').show();
 
                             var data = resp.data;
+                          
                             var status_val = '';
 
                             $('.goods_name').text(data.goods_name);
@@ -273,6 +274,14 @@
                             $('.stock').text(data.goods_number);
                             $('.moq').text(data.min_buy);
                             $('.mpq').text(data.min_mpq);
+                            
+                            if(data.self_supplier_type == 1){
+                             $('.self_supplier_type').text('自采');
+                            }else if(data.self_supplier_type == 2){
+                                $('.self_supplier_type').text('立创');
+                            }else{
+                                $('.self_supplier_type').text('无');
+                            }
 
                             // if (goods_type == 1) {
                             //     var status = data.goods_status;

resources/views/addOnline/content.blade.php

@@ -294,6 +294,16 @@
                         </div>
                     </div>
                 </div>
+                
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <span>自采标记:</span>
+                            <span class="self_supplier_type"></span>
+                        </div>
+                    </div>
+                </div>
+
             </div>
 
             <div class="sku-info-right table-responsive">

resources/views/detail/content.blade.php

@@ -475,6 +475,7 @@
                         @if ($role != 12 && $role != 7)
                             <th>供应商</th>
                         @endif
+                        <th>自采标记</th>
 
                         @if ($order_info['order_goods_type'] == 1)
                             <th>生产跟踪</th>
@@ -523,10 +524,23 @@
                             @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>
                             @endif
-
+                           
                             @if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2]))
                                 <td><a class="btn btn-danger deletegoods" href="javascript:;" data-id="{{$v['rec_id']}}">删除</a></td>
                             @endif
+                            
+
+                            <td>   
+                                @if($v['self_supplier_type'] == 1)
+                                    自采
+                                @elseif($v['self_supplier_type'] == 2)
+                                    立创
+                                @else
+                                    无
+                                @endif
+
+                            </td>
+
                         </tr>
                     @endforeach
                 @endif