m

app/Http/Controllers/Admin/OrderController.php

@@ -485,11 +485,21 @@ class OrderController extends Controller
         if($self_role == '销售'){
             $is_saler = 1;
         }
+
+        if($self_role == 'A仓库管理员'){
+            $warehouse = 1;
+        }elseif($self_role == 'B仓库管理员'){
+            $warehouse = 2;
+        }else{
+            $warehouse = 0;
+        }
+
         $stime = $request->input('stime');
         $etime = $request->input('etime');
 
-        $result = Order::where(function($query) use($admin_id, $stime, $etime){
+        $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse){
             if($admin_id) $query->where('admin_id',  $admin_id);
+            if($warehouse) $query->where('warehouse',  $warehouse);
             if($stime) $query->where('createTime', '>=', $stime);
             if($etime) $query->where('createTime', '<=', $etime);
         })->where('is_del',0)->orderBy('id', 'desc')->get();