Merge branch 'zjl_commit_20200526'

resources/views/detail/content.blade.php

@@ -157,7 +157,7 @@
                 @endif
 
                 @if (in_array('check_order', $userPerms) && $order_info['sale_id'])
-                    @if (isset($order_temp_info['is_manager_audit']) && $order_temp_info['is_manager_audit'] != 1 && in_array($order_info['status'], [1, 2])) 
+                    @if (isset($order_temp_info['is_manager_audit']) && $order_temp_info['is_manager_audit'] != 3 && in_array($order_info['status'], [1, 2])) 
                         <a class="btn btn-success" href="{{URL('change', ['order_id'=>$order_info['order_id']])}}" target="_blank">人工审单</a>
                     @elseif ($order_info['status'] == 2 && $order_temp_info['is_manager_audit'] == 3 && in_array($role, [1, 2]))
                        <a class="btn btn-success re-audit" data-id="{{$order_info['order_id']}}">反审</a>
@@ -165,12 +165,12 @@
                 @endif
 
                 <!-- 申请主管审核 -->
-                @if (isset($order_temp_info['is_manager_audit']) && $order_temp_info['is_manager_audit'] == 1)
+                @if (isset($order_temp_info['is_manager_audit']) && $order_temp_info['is_manager_audit'] == 1 && $order_info['status'] == 2)
                     <a class="btn btn-info apply-manager-audit" data-id="{{$order_info['order_id']}}">申请主管审核</a>
                 @endif
 
                  <!-- 主管审核 -->
-                @if ($order_temp_info['is_manager_audit'] && in_array($role, [1, 2]) && $order_info['status'] == 1)
+                @if (isset($order_temp_info['is_manager_audit']) && (($order_info['status'] == 2 && $order_temp_info['is_manager_audit'] == 2) || ($order_info['status'] > 2 && $order_temp_info['is_manager_audit'] != 3)) && in_array($role, [1, 2]) && empty($order_temp_info['erp_sn']))
                     <a class="btn btn-danger manager-audit" data-id="{{$order_info['order_id']}}">主管审核</a>
                 @endif
 

resources/views/orderlist/content.blade.php

@@ -305,7 +305,7 @@
                             </td>
                             <td class="show-list">
                                 <?php 
-                                    if ($v['status'] >= 1 && $v['status'] < 4 && isset($order_extend->is_manager_audit)) {
+                                    if ($v['status'] >= 1 && isset($order_extend->is_manager_audit)) {
                                         switch ($order_extend->is_manager_audit) { 
                                             case 1: 
                                                 echo '<span class="list-text-checking"><b>未申请</b></span>';break;
@@ -352,7 +352,7 @@
                                         @endif
 
                                         <!-- 申请主管审核 -->
-                                        @if (isset($order_extend->is_manager_audit) && $order_extend->is_manager_audit == 1)
+                                        @if (isset($order_extend->is_manager_audit) && $order_extend->is_manager_audit == 1 && $v['status'] == 2)
                                             <a class="btn btn-info apply-manager-audit" data-id="{{$v['order_id']}}">申请主管审核</a>
                                         @endif