Browse Source

只能看到自己的

sunhao 5 years ago
parent
commit
084ff45cc8

+ 3 - 0
app/Http/Controllers/Admin/LoginController.php

@@ -40,6 +40,9 @@ class LoginController extends Controller
40 40
             session(['username' => $admin->username]);
41 41
             session(['real_name' => $admin->realname]);
42 42
             session(['team_id' => $admin->team_id]);
43
+            #角色
44
+            $role = AdminRole::where('user_id', '=', $admin->id)->first();
45
+            session(['role_name' => $role->role_name]);
43 46
             //后台菜单
44 47
             $role = AdminRole::where('user_id', '=', $admin->id)->get();
45 48
             $res = [];

+ 16 - 3
app/Http/Controllers/Admin/OrderController.php

@@ -22,7 +22,15 @@ class OrderController extends Controller
22 22
             $page = 1;
23 23
         }
24 24
 
25
-        $admin_id = $request->input('admin_id');
25
+        $self_role = session('role_name');
26
+        if($self_role == '超级管理员' || $self_role == '团队主管'){
27
+            $admin_id = $request->input('admin_id');
28
+            $search_admin = 1;
29
+        }else{
30
+            $admin_id = session('admin_id');
31
+            $search_admin = 0;
32
+        }
33
+        
26 34
         $stime = $request->input('stime');
27 35
         $etime = $request->input('etime');
28 36
 
@@ -266,7 +274,7 @@ class OrderController extends Controller
266 274
         $order = array();
267 275
         $order['customerName'] = $request->input('customerName'); //买家名称
268 276
         $order['receiverName'] = $request->input('receiverName'); //收件人
269
-        if(preg_match('/^1\d{10}$/', $phone) && !substr($phone,3,4) == '****') $order['receiverMobile'] = $phone; //收件人手机
277
+        if(preg_match('/^1\d{10}$/', $phone)) $order['receiverMobile'] = $phone; //收件人手机
270 278
         $order['receiverState'] = $request->input('receiverState'); //省份
271 279
         $order['receiverCity'] = $request->input('receiverCity'); //市
272 280
         $order['receiverDistrict'] = $request->input('receiverDistrict'); //区
@@ -381,7 +389,12 @@ class OrderController extends Controller
381 389
 
382 390
     public function order_export(Request $request){
383 391
         
384
-        $admin_id = $request->input('admin_id');
392
+        $self_role = session('role_name');
393
+        if($self_role == '超级管理员' || $self_role == '团队主管'){
394
+            $admin_id = $request->input('admin_id');
395
+        }else{
396
+            $admin_id = session('admin_id');
397
+        }
385 398
         $stime = $request->input('stime');
386 399
         $etime = $request->input('etime');
387 400
 

+ 3 - 1
resources/views/order/orderlist.blade.php

@@ -5,13 +5,15 @@
5 5
         <div>
6 6
             <div>
7 7
                 <a class="btn btn-primary radius" onclick="order_add('新增', 0)" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 新增订单</a>
8
+                @if($search_admin == 1)
8 9
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="所属销售"/>
9 10
                 <select style="width:10%;text-align:center" id='admin_id' name="admin_id">
10 11
                     <option value="0" @if($admin_id=='') selected @endif>-- 选择销售 --</option>
11 12
                     @foreach($adminlist as $v)
12 13
                         <option value="{{$v['id']}}" @if($admin_id==$v['id']) selected @endif>{{$v['realname']}}</option>
13 14
                     @endforeach
14
-                </select>                
15
+                </select>  
16
+                @endif              
15 17
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="开始时间"/>
16 18
                 <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="stime" value="{{$stime?$stime:''}}">
17 19
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="结束时间"/>