Merge branch 'zjl_iteration_v4_20210526'

resources/views/orderlist/content.blade.php

@@ -455,7 +455,7 @@
 
 
                                         <!-- 解锁审单 -->
                                         <!-- 解锁审单 -->
                                         <?php $is_lock_check = App\Http\Controllers\isLockCheck($v['order_id']); ?>
                                         <?php $is_lock_check = App\Http\Controllers\isLockCheck($v['order_id']); ?>
-                                        @if (in_array($role, [1, 2]) && $is_lock_check)
+                                        @if (in_array($role, [1, 2]) && $is_lock_check && in_array($v['status'], [1, 2]) && $order_extend->is_manager_audit != 3)
                                             <a class="btn btn-danger unlock_check" data-oid="{{$v['order_id']}}">解锁审单</a>
                                             <a class="btn btn-danger unlock_check" data-oid="{{$v['order_id']}}">解锁审单</a>
                                         @endif
                                         @endif
                                 </div>
                                 </div>