Sfoglia il codice sorgente

add user verification

GGican 8 anni fa
parent
commit
13d0261f12

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

xqd xqd
@@ -33,7 +33,9 @@ class UserController extends CommonController
 
         $user_job = Job::where('display', '=', '1')->orderby('role', 'asc')->get();
 
-        return view('admin.user.edit', ['data' => $data, 'user_job' => $user_job]);
+        $department = Department::where('display', '=', '1')->get();
+
+        return view('admin.user.edit', ['data' => $data, 'user_job' => $user_job,'department'=>$department]);
 
     }
 
@@ -48,6 +50,8 @@ class UserController extends CommonController
         $input['job_name'] = $job_role->display_name;
         $input['pswd'] =  Crypt::encrypt($input['pswd']);
 
+        !$input['department_id']?$input['department'] =' ':$input['department'] = Department::find($input['department_id'])->department_name;
+
         if (!User::find($user_id)->update($input)) return back()->withErrors('用户信息更新失败,请稍后重试!');
 
         $sesson_user = session('user');

+ 7 - 3
app/Http/Requests/UserRequest.php

xqd
@@ -27,15 +27,19 @@ class UserRequest extends Request
             'name'=>'required',
             'pswd'=>'required',
             'surname'=>'required',
+            'role_id'=>'required',
+            'department_id'=>'required',
         ];
     }
 
     public function messages()
     {
         return[
-            'name.required'=>'登录名为空',
-            'pswd.required'=>'密码为空',
-            'surname.required'=>'姓名为空',
+            'name.required'=>'登录名不能为空',
+            'pswd.required'=>'密码不能为空',
+            'surname.required'=>'姓名不能为空',
+            'role_id.required'=>'职位不能为空',
+            'department_id.required'=>'单位机构不能为空',
         ];
     }
 

+ 0 - 1
resources/views/admin/user/add_user.blade.php

xqd
@@ -97,7 +97,6 @@
                             <td>单位</td>
                             <td>
                                 <select class="form-control" name="department_id">
-                                    <option value=""></option>
                                     @foreach( $department as $dep)
                                         <option value="{{ $dep->id }}">{{ $dep->department_name }}</option>
                                         @endforeach

+ 10 - 0
resources/views/admin/user/edit.blade.php

xqd
@@ -57,6 +57,16 @@
                                 </select>
                             </td>
                         </tr>
+                        <tr>
+                            <td>单位</td>
+                            <td>
+                                <select class="form-control" name="department_id">
+                                    @foreach( $department as $dep)
+                                        <option value="{{ $dep->id }}" @if($data->department_id == $dep->id) selected @endif>{{ $dep->department_name }}</option>
+                                    @endforeach
+                                </select>
+                            </td>
+                        </tr>
                         <tr>
                             <td>姓名</td>
                             <td><input name="surname" class="form-control" value="{{ $data->surname }}"></td>