调整自营审核

app/Http/Controllers/OrderController.php

@@ -894,9 +894,12 @@ Class OrderController extends Controller
 
 
                 $url = Config('website.api_domain').'order/tempSaveOrder';    
                 $url = Config('website.api_domain').'order/tempSaveOrder';    
             } else {
             } else {
-                $auditor_role = $request->input('auditor_role', 1); // 当前操作人角色
+                $auditor_role     = $request->input('auditor_role', 1); // 当前操作人角色
+                $order_goods_type = $request->input('order_goods_type', 1);
 
 
-                $resData['status'] = $auditor_role == 3 ? 1 : 2; // 角色为‘查看自己’时，状态为待审核，否则为待付款
+                if ($order_goods_type == 1) {
+                    $resData['status'] = $auditor_role == 3 ? 1 : 2; // 角色为‘查看自己’时，状态为待审核，否则为待付款
+                }
 
 
                 $url = Config('website.api_domain').'order/changeOrder';
                 $url = Config('website.api_domain').'order/changeOrder';
             }
             }

resources/views/changeOrder/content.blade.php

@@ -486,7 +486,7 @@
 @include('changeOrder.addGoodsNoSkuid')
 @include('changeOrder.addGoodsNoSkuid')
 
 
 <script>
 <script>
-    var is_manager       = "{{ in_array($role, [1, 2]) ? true : false }}"; 
+    var is_manager       = "{{ in_array($role, [1, 2, 5]) ? true : false }}"; 
 
 
     var isNewClient      = "{{isset($isNewClient) ? $isNewClient : 0}}"; 
     var isNewClient      = "{{isset($isNewClient) ? $isNewClient : 0}}"; 
     // var order_amount  = "{{$order_info['order_amount']}}"; 
     // var order_amount  = "{{$order_info['order_amount']}}"; 

resources/views/orderlist/content.blade.php

@@ -330,24 +330,24 @@
                             <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
                             <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
                             <td>
                             <td>
                                 <div class="btn-group btn-group-xs" style="width: 260px;">
                                 <div class="btn-group btn-group-xs" style="width: 260px;">
-	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}" target="_blank">详情</a>
-
                                         @if (in_array('check_order', $userPerms) && $v['sale_id'])
                                         @if (in_array('check_order', $userPerms) && $v['sale_id'])
                                             @if ($v['status'] == 1) 
                                             @if ($v['status'] == 1) 
                                                 <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
                                                 <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
                                             @elseif ($v['status'] == 2 && in_array($role, [1, 2]))
                                             @elseif ($v['status'] == 2 && in_array($role, [1, 2]))
-    	                                       <a class="btn btn-success re-audit" data-id="{{$v['order_id']}}">反审</a>
+                                               <a class="btn btn-success re-audit" data-id="{{$v['order_id']}}">反审</a>
                                             @endif
                                             @endif
                                         @endif
                                         @endif
 
 
                                         <!-- 主管审核 -->
                                         <!-- 主管审核 -->
-                                        @if ($order_extend->is_manager_audit && in_array($role, [1, 2]) && $v['status'] == 1)
+                                        @if (isset($order_extend->is_manager_audit) && in_array($role, [1, 2]) && $v['status'] == 1)
                                             <a class="btn btn-danger manager-audit" data-id="{{$v['order_id']}}">主管审核</a>
                                             <a class="btn btn-danger manager-audit" data-id="{{$v['order_id']}}">主管审核</a>
                                         @endif
                                         @endif
 
 
                                         @if (!empty($order_extend->erp_sn))
                                         @if (!empty($order_extend->erp_sn))
                                             <a class="btn btn-primary send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a>        
                                             <a class="btn btn-primary send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a>        
                                         @endif
                                         @endif
+
+	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}" target="_blank">详情</a>     
                                         
                                         
                                         <!-- 管理员和经理或有推送权限显示 -->
                                         <!-- 管理员和经理或有推送权限显示 -->
                                         @if ((in_array($role, [1, 2]) || in_array('send_salesman', $userPerms)))
                                         @if ((in_array($role, [1, 2]) || in_array('send_salesman', $userPerms)))