Merge branch 'zjl_merge_20200821'

public/js/change_order.js

@@ -514,7 +514,8 @@
                         }
                         }
                     }       
                     }       
 
 
-                    if (!is_manager && order_goods_type != 1) { // 非管理员或经理权限和非联营订单需要判断商品价格是否低于80%以下 
+                     // 非管理员或经理权限、非联营订单、非样片单 需要判断商品价格是否低于80%以下
+                    if (!is_manager && order_goods_type != 1 && business_type != 1) { 
                         // 设置默认值false
                         // 设置默认值false
                         $('input[name=check_failed]').val(0);
                         $('input[name=check_failed]').val(0);
                         $('input[name=change_pay_type]').val(0);
                         $('input[name=change_pay_type]').val(0);

resources/views/changeOrder/content.blade.php

@@ -557,7 +557,6 @@
 
 
 <script>
 <script>
     var is_manager       = "{{ in_array($role, [1, 2, 5]) ? true : false }}"; 
     var is_manager       = "{{ in_array($role, [1, 2, 5]) ? true : false }}"; 
-
     var isNewClient      = "{{isset($isNewClient) ? $isNewClient : 0}}"; 
     var isNewClient      = "{{isset($isNewClient) ? $isNewClient : 0}}"; 
     // var order_amount  = "{{$order_info['order_amount']}}"; 
     // var order_amount  = "{{$order_info['order_amount']}}"; 
     var currency         = "{{$order_info['currency']}}"; // 币种
     var currency         = "{{$order_info['currency']}}"; // 币种
@@ -566,6 +565,7 @@
     var pay_preferential = "{{ $order_price_info['pay_preferential'] ? $order_price_info['pay_preferential'] : 0 }}"; // 支付优惠（钱包）
     var pay_preferential = "{{ $order_price_info['pay_preferential'] ? $order_price_info['pay_preferential'] : 0 }}"; // 支付优惠（钱包）
     var new_client_price = "{{ $order_price_info['new_client_price'] }}";
     var new_client_price = "{{ $order_price_info['new_client_price'] }}";
     var buyers           = eval('{!! isset($buyers) ? json_encode($buyers) : '' !!}'); // 采购员集合
     var buyers           = eval('{!! isset($buyers) ? json_encode($buyers) : '' !!}'); // 采购员集合
+    var business_type    = "{{$order_temp_info['business_type']}}";
 
 
     // 明细数目
     // 明细数目
     var item_count = "{{ count($order_items_info) }}";
     var item_count = "{{ count($order_items_info) }}";