GGican преди 8 години
родител
ревизия
7e851be006

+ 5 - 1
app/Http/Controllers/Admin/TableController.php

xqd
@@ -25,7 +25,11 @@ class TableController extends CommonController
     public function on_table()
     {
         $user = session('user');
-        $data = Tablelist::where('status','=','0')->where('user_id','=',$user['id'])->orderby('id','asc')->paginate(10);
+       if($user->role == 0){
+           $data = Tablelist::where('status','=','0')->where('user_id','=',$user['id'])->orderby('id','asc')->paginate(10);
+       }else{
+           $data = Tablelist::where('status','=',$user->role)->orderby('id','asc')->paginate(10);
+       }
         return view('admin.table.on_table',compact('data'));
     }
 

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

xqd
@@ -17,7 +17,7 @@ class UserController extends CommonController
 //    用户列表
     public function user_list()
     {
-        $data = User::orderby('id','asc')->paginate(10);
+        $data = User::orderby('role','asc')->paginate(10);
 
         return view('admin.user.userlist',compact('data'));
     }

+ 8 - 8
resources/views/admin/index.blade.php

xqd xqd
@@ -128,7 +128,7 @@
                                         <th>房型</th>
                                         <th>联系方式</th>
                                         <th>用途</th>
-                                        <th>操作</th>
+                                        {{--<th>操作</th>--}}
                                     </tr>
                                     </thead>
                                     <tbody>
@@ -142,13 +142,13 @@
                                         <td>{{ $list->house_type }}</td>
                                         <td>{{ $list->bzc_tel }}</td>
                                         <td>{{ $list->used }}</td>
-                                        <td><a href="{{ url('/table/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
-                                                <i class="fa fa-search"></i> 查看</a>
-                                            @if($user->role>5)
-                                                <a href="{{ url('/table/'.$list->id.'/edit') }}" class="btn btn-success btn-sm">
-                                                    <i class="fa fa-pencil"></i> 编辑</a>
-                                                @endif
-                                        </td>
+                                        {{--<td><a href="{{ url('/table/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">--}}
+                                                {{--<i class="fa fa-search"></i> 查看</a>--}}
+                                            {{--@if($user->role>5)--}}
+                                                {{--<a href="{{ url('/table/'.$list->id.'/edit') }}" class="btn btn-success btn-sm">--}}
+                                                    {{--<i class="fa fa-pencil"></i> 编辑</a>--}}
+                                                {{--@endif--}}
+                                        {{--</td>--}}
                                     </tr>
                                         @endforeach
                                     </tbody>

+ 4 - 2
resources/views/admin/table/table_one.blade.php

xqd
@@ -253,8 +253,10 @@
                             <div class="row">
                                 <div class="col-sm-8"></div>
                                 <div class="col-sm-4">
-                                    <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_type_id) }}'" class="btn btn-success">
-                                        保存</button>
+                                    @if($user->role == 0)
+                                        <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_type_id) }}'" class="btn btn-success">
+                                            保存</button>
+                                        @endif
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_type_id.'/create') }}'" class="btn btn-primary">
                                         提交</button>
                                     <a href="{{ url('/table') }}" class="btn btn-info">返回</a>

+ 9 - 7
resources/views/admin/user/userlist.blade.php

xqd
@@ -151,14 +151,16 @@
                                         </td>
                                         <td>{{ $list->department }}</td>
                                         <td>
-                                            <a href="{{ url('/user/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
-                                                <i class="fa fa-pencil"></i> 编辑</a>
-                                            @if($list->display == 1)
-                                                <a href="javascript:;" onclick="del_user({{ $list->id }})" class="btn btn-danger btn-sm article-delete">
-                                                    <i  class="fa fa-trash-o"></i> 停用</a>
+                                            @if($user->role > 4)
+                                                <a href="{{ url('/user/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
+                                                    <i class="fa fa-pencil"></i> 编辑</a>
+                                                @if($list->display == 1)
+                                                    <a href="javascript:;" onclick="del_user({{ $list->id }})" class="btn btn-danger btn-sm article-delete">
+                                                        <i  class="fa fa-trash-o"></i> 停用</a>
                                                 @else
-                                                <a href="javascript:;" onclick="start({{ $list->id }})" class="btn btn-success btn-sm article-delete">
-                                                    <i  class="fa fa-trash-o"></i> 启用</a>
+                                                    <a href="javascript:;" onclick="start({{ $list->id }})" class="btn btn-success btn-sm article-delete">
+                                                        <i  class="fa fa-trash-o"></i> 启用</a>
+                                                @endif
                                             @endif
                                         </td>
                                     </tr>

+ 1 - 1
resources/views/layouts/admin.blade.php

xqd
@@ -78,7 +78,7 @@
                     <li class="dropdown user user-menu">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                             <img src="{{asset('img/arr.jpg')}}" class="user-image" alt="User Image">
-                            <span class="hidden-xs">管理员</span>
+                            <span class="hidden-xs">{{ $user->name }}</span>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- User image -->