Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_batch_goods_20181129

public/js/self_order.js

@@ -86,7 +86,7 @@
                         listUrl += '&test_order=' + 1;
                     }
 
-                    if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && (is_new === '') && !is_new_order && !test_order.is(':checked')) {
+                    if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && (is_new === '') && !test_order.is(':checked')) {
                         listUrl = '/self_order';
                     }
 

resources/views/detail/content.blade.php

@@ -606,13 +606,13 @@
         @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && $action_name != 'changeOrder') 
             <p style="padding-left: 5px;">操作</p>
             <div class="tabs-box">
-                <!-- 判断状态和权限 -->
-                @if ($order_info['status'] == 1 && in_array('add_offline_audit', $userPerms)) 
+                <!-- 判断状态和权限 $extend-自营线下订单 -->
+                @if ($order_info['status'] == 1 && in_array('add_offline_audit', $userPerms) && $extend) 
                     <a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}">内部订单审核</a>
                 @endif
                 
                 <!-- 订单审单 -->
-                @if (in_array($order_info['status'], [1, 2]) && in_array('self_check_order', $userPerms))
+                @if (in_array($order_info['status'], [1, 2]) && in_array('self_check_order', $userPerms) && !$extend)
                     <a class="btn btn-info"  href="/change/{{$order_info['order_id']}}?tags=self">人工审单</a>
                 @endif