hu hao před 5 roky
rodič
revize
ebfd0168f9

+ 2 - 1
app/Http/Controllers/UserController.php

@@ -27,6 +27,7 @@ class UserController extends Controller
     public function index(Request $request)
     {
         if(!Gate::allows('用户-查询')){ return redirect(url('/'));  }
+        $owners=app("OwnerService")->getIntersectPermitting();
         $userDetailQuery = UserDetail::query()->select('user_id')->where('type','临时工');
         $query = User::with(['roles','logistics','userWorkgroups','suppliers','userDetail'])->whereNotIn('id',$userDetailQuery);
         if($request->has('user')){
@@ -42,7 +43,7 @@ class UserController extends Controller
         $users->each(function (User $user){
             $user['isSuperAdmin']=$user->isSuperAdmin();
         });
-        return view('maintenance.user.index',['users'=>$users]);
+        return view('maintenance.user.index',compact('users','owners'));
     }
 
     /**

+ 12 - 2
resources/views/maintenance/user/index.blade.php

@@ -64,11 +64,21 @@
             data:{
                 users:{!! $users->toJson() !!}['data'],
                 form:'',
+                owners:[
+                        @foreach($owners as $owner)
+                    {name:'{{$owner->id}}',value:'{{$owner->name}}'},
+                    @endforeach
+                ],
                 selectTr:0
             },
             mounted:function(){
-                let data = [[{name:'user',type:'input',tip:'用户名:可在两侧添加百分号(%)进行模糊搜索',placeholder:'用户名'},
-                    {name:'role',type:'input',tip:'角色名:可在两侧添加百分号(%)进行模糊搜索',placeholder:'角色名'}]];
+                let data = [
+                    [{name:'user',type:'input',tip:'用户名:可在两侧添加百分号(%)进行模糊搜索',placeholder:'用户名'},
+                    {name:'role',type:'input',tip:'角色名:可在两侧添加百分号(%)进行模糊搜索',placeholder:'角色名'},
+                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表,回车确定','选择要显示的客户'],
+                            placeholder:['货主','定位或多选货主'],data:this.owners},
+                    ]
+                ];
                 this.form = new query({
                     el: '#form_div',
                     condition: data,