Merge branch 'zjl_adjust_check_0125' into 'master'

人工审单时去掉操作按钮

See merge request !5

resources/views/detail/content.blade.php

@@ -408,8 +408,9 @@
             <!--账期设置-->
             <include file="recovery"/>
         </if>
-
-
+        
+        <!-- 人工审单时去掉操作按钮 -->
+        @if ($action_name != 'changeOrder')
         <p style="padding-left: 5px;">操作</p>
         <div class="tabs-box">
             <!-- 判断操作权限 -->
@@ -444,6 +445,7 @@
             <!-- <a href="{:U('cancel', 'order_id='.$order_info['order_id'])}" class="btn btn-default">退货退款</a>
             <a href="{:U('recovery', 'order_id='.$order_info['order_id'])}" class="btn btn-default">平账设置</a> -->
         </div>
+        @endif
         <!-- 二期处理 -->
         <!-- <p>操作记录</p>
         <div class="tabs-box">