Merge branch 'zjl_perm_20191022'

app/Http/Controllers/OrderController.php

@@ -877,7 +877,7 @@ Class OrderController extends Controller
         $tags = $request->input('tags', '');
         $tags = $request->input('tags', '');
 
 
         // 联营
         // 联营
-        $joint_manager     = $perm->getRoleUsers($request, '经理');
+        // $joint_manager     = $perm->getRoleUsers($request, '经理');
         $joint_in_charge_1 = $perm->getRoleUsers($request, '线销一组主管');
         $joint_in_charge_1 = $perm->getRoleUsers($request, '线销一组主管');
         $joint_in_charge_2 = $perm->getRoleUsers($request, '线销二组主管');
         $joint_in_charge_2 = $perm->getRoleUsers($request, '线销二组主管');
         $joint_in_charge_3 = $perm->getRoleUsers($request, '线销三组主管');
         $joint_in_charge_3 = $perm->getRoleUsers($request, '线销三组主管');
@@ -896,7 +896,7 @@ Class OrderController extends Controller
             $self_kefu      = array_merge($self_assistant, $self_kefu);
             $self_kefu      = array_merge($self_assistant, $self_kefu);
         }
         }
 
 
-        $info['joint_manager']   = $this->filterLeave($joint_manager);
+        // $info['joint_manager']   = $this->filterLeave($joint_manager);
         
         
         $joint_in_charge_1       = $this->filterLeave($joint_in_charge_1);
         $joint_in_charge_1       = $this->filterLeave($joint_in_charge_1);
         $joint_in_charge_2       = $this->filterLeave($joint_in_charge_2);
         $joint_in_charge_2       = $this->filterLeave($joint_in_charge_2);

resources/views/detail/sendSales.blade.php

@@ -9,24 +9,6 @@
             <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
             <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
 
 
             <table class="table table-bordered table-hover check-table" style="min-height:150px;">
             <table class="table table-bordered table-hover check-table" style="min-height:150px;">
-                @if (!empty($joint_manager))
-                <tr>
-                    <td class="check-table-title" width="10%">管理员：</td>
-
-                    <td>
-                        <ul>
-                        @foreach ($joint_manager as $k => $v)      
-                            @if ($v->userId == $order_info['sale_id'])
-                                <li><label><input type="radio" name="sale_id" value="{{$v->userId}}" checked /><span>{{$v->name}}</span></label></li>
-                            @else
-                                <li><label><input type="radio" name="sale_id" value="{{$v->userId}}"/><span>{{$v->name}}</span></label></li>
-                            @endif
-                        @endforeach
-                        </ul>
-                    </td>
-                </tr>
-                @endif
-
                 @if (!empty($joint_in_charge)) 
                 @if (!empty($joint_in_charge)) 
                 <tr>
                 <tr>
                     <td class="check-table-title">联营客服：</td>
                     <td class="check-table-title">联营客服：</td>