Merge branch 'zjl_brand_20210715'

resources/views/selfOrder/content.blade.php

@@ -404,6 +404,12 @@
                                     @if ($username == 'vpadmin@ichunt.com')
                                         <a class="btn btn-info edit_erp_sn" data-oid="{{$v['order_id']}}" data-erp_sn="{{ $order_extend ? $order_extend->erp_sn : '' }}">编辑ERP单号</a>
                                     @endif
+
+                                    <!-- 解锁审单 -->
+                                    <?php $is_lock_check = App\Http\Controllers\isLockCheck($v['order_id']); ?>
+                                    @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>
+                                    @endif
                                 </div>
                             </td>
                         </tr>