ChenWuJie 4 年之前
父节点
当前提交
529aaa6245
共有 2 个文件被更改,包括 11 次插入10 次删除
  1. 7 7
      app/Http/Controllers/Admin/ProjectController.php
  2. 4 3
      resources/views/admin/projects/index.blade.php

+ 7 - 7
app/Http/Controllers/Admin/ProjectController.php

xqd xqd
@@ -36,9 +36,9 @@ class ProjectController extends BaseController
 
     public function index()
     {
-        $user = ProjectUser::getProjectManagerUser();
+        $manager_user_id = ProjectUser::getProjectManagerUser();
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
-        return view($this->view_path . 'index', compact('model', 'model_name','pre_uri','user'));
+        return view($this->view_path . 'index', compact('model', 'model_name','pre_uri','manager_user_id'));
     }
 
     public function applyIndex()
@@ -73,15 +73,15 @@ class ProjectController extends BaseController
         if($request->input('type') == 'apply') {
             $items = $items->whereNotNull('user_id');
         }
-        $user_id = request('user_id');
-        if(empty($user_id)){
-            $user_id = 0;
+        $manager_user_id = request('manager_user_id');
+        if(empty($manager_user_id)){
+            $manager_user_id = 0;
         }
-        if($user_id){
+        if($manager_user_id){
             $items->whereHas('project_user',function ($query){
                 $query->where('project_role_id','=','4');
                 $query->whereHas('user',function ($query){
-                    $query->where('id','=',request('user_id'));
+                    $query->where('id','=',request('manager_user_id'));
                 });
             });
         }

+ 4 - 3
resources/views/admin/projects/index.blade.php

xqd
@@ -23,12 +23,13 @@
                         </div>
                     </div>
                     <div class="layui-inline">
+                        {{--@php(dd($manager_user_id))--}}
                         <div class="layui-input-inline">
-                            <select name="user_id">
+                            <select name="manager_user_id">
                                 <option value="0">项目经理</option>
                                 {{--<option value="0">项目经理</option>--}}
-                                @foreach($user as $option)
-                                    <option value="{{ $option['user_id'] }}" {{ request('user_id') == $option['user_id'] ? 'selected' : ''  }}>{{ $option['name'] }}</option>
+                                @foreach($manager_user_id as $option)
+                                    <option value="{{ $option['user_id'] }}" {{ request('manager_user_id') == $option['user_id'] ? 'selected' : ''  }}>{{ $option['name'] }}</option>
                                 @endforeach
                             </select>
                         </div>