Merge branch 'zjl_erp_syn_20190514' into development

app/Http/Controllers/OrderController.php

@@ -459,8 +459,10 @@ Class OrderController extends Controller
         } else if ($tid == 2) {
         } else if ($tid == 2) {
             $manager   = $perm->getRoleUsers($request, '自营客服主管');
             $manager   = $perm->getRoleUsers($request, '自营客服主管');
             $test      = $perm->getRoleUsers($request, '测试');
             $test      = $perm->getRoleUsers($request, '测试');
+            $assistant = $perm->getRoleUsers($request, '自营客服主管助理');
+            $purchase  = $perm->getRoleUsers($request, '自营内部采购');
             $kefu      = $perm->getRoleUsers($request, '自营客服');
             $kefu      = $perm->getRoleUsers($request, '自营客服');
-            $sale_list = array_merge($manager, $test, $kefu);
+            $sale_list = array_merge($manager, $test, $assistant, $purchase, $kefu);
         }
         }
 
 
         //获取订单列表
         //获取订单列表
@@ -835,7 +837,10 @@ Class OrderController extends Controller
             $manager   = $perm->getRoleUsers($request, '自营客服主管');
             $manager   = $perm->getRoleUsers($request, '自营客服主管');
             $test      = $perm->getRoleUsers($request, '测试');
             $test      = $perm->getRoleUsers($request, '测试');
             $sale_list = '';
             $sale_list = '';
+            $assistant = $perm->getRoleUsers($request, '自营客服主管助理');
+            $purchase  = $perm->getRoleUsers($request, '自营内部采购');
             $kefu      = $perm->getRoleUsers($request, '自营客服');
             $kefu      = $perm->getRoleUsers($request, '自营客服');
+            $kefu      = array_merge($assistant, $purchase, $kefu);
         } else {
         } else {
             $manager   = $perm->getRoleUsers($request, '经理');
             $manager   = $perm->getRoleUsers($request, '经理');
             $test      = $perm->getRoleUsers($request, '测试');
             $test      = $perm->getRoleUsers($request, '测试');

resources/views/detail/changeOrder.blade.php

@@ -445,7 +445,7 @@
 @endif
 @endif
 
 
 <script>
 <script>
-    var is_manager = "{{ $role == 1 || $role == 2 ? true : false }}"; 
+    var is_manager = "{{ $role == 1 || $role == 2 || $role == 10 ? 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/detail/content.blade.php

@@ -773,7 +773,7 @@
                 @endif
                 @endif
 
 
                 <!-- 判断状态和权限 $extend-自营线下订单 -->
                 <!-- 判断状态和权限 $extend-自营线下订单 -->
-                @if ($order_info['status'] == 1 && in_array('add_offline_audit', $userPerms) && $extend) 
+                @if ($order_info['status'] == 1 && in_array('add_offline_audit', $userPerms) && isset($extend) && !$extend) 
                     <!-- <a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}">内部订单审核</a> -->
                     <!-- <a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}">内部订单审核</a> -->
                 @endif
                 @endif