add

app/Http/Controllers/Admin/DepartmentController.php

@@ -1,7 +1,126 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: brand
- * Date: 16-9-6
- * Time: 上午8:20
- */
+
+namespace App\Http\Controllers\Admin;
+
+use App\Model\Adminuser;
+use App\Model\Department;
+use App\Model\Job;
+use App\Model\Tablelist;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
+use App\Http\Controllers\Admin\CommonController;
+use Session;
+class DepartmentController extends CommonController{
+
+    public function index()
+    {
+        $data = Department::orderby('id','asc')->paginate(20);
+        return view('admin.department.index',compact('data'));
+    }
+
+    public function edit($dep_id)
+    {
+        $data = Department::find($dep_id);
+        return view('admin.department.edit',compact('data'));
+    }
+
+    public function create()
+    {
+        return view('admin.department.create');
+    }
+
+    public function update($dep_id)
+    {
+        $input = Input::except('_token','_method');
+        $re = Department::where('id',$dep_id)->update($input);
+        if($re){
+            return redirect('/department');
+        }else{
+            return back()->with('errors','机构信息更新失败，请稍后重试!');
+        }
+    }
+
+    public function destroy($dep_id)
+    {
+        $re = Department::where('id',$dep_id)->delete();
+        if($re){
+            $data = [
+                'status'=>1,
+                'msg' => '删除成功！'
+            ];
+        }else{
+            $data =[
+                'status'=>0,
+                'msg' => '删除失败，请刷新重试！'
+            ];
+        }
+        return $data;
+    }
+
+    public function store()
+    {
+        $input = Input::except('_token');
+        $input['display'] = '1';
+        $rules = [
+            'department_description'=>'max:200',
+            'department_name'=>'required|max:100',
+        ];
+        $msg = [
+            'department_name.required'=>'名称不能为空！',
+            'department_description.max'=>'描述不能超过100字！',
+            'department_name.max'=>'名称请保持在50字内！',
+        ];
+        $validator = Validator::make($input,$rules,$msg);
+        if($validator->passes()){
+            $re = Department::create($input);
+            if($re){
+                return redirect('/department');
+            }else{
+                return back()->with('msg','新建失败，请稍后重试！');
+            }
+        }else{
+            return back()->withErrors($validator);
+        }
+    }
+
+
+    public function ting($dep_id)
+    {
+        $temp['display'] = 0;
+        $department = Department::where('id',$dep_id)->update($temp);
+        if($department){
+            $data = [
+                'status'=>'1',
+                'msg' =>'隐藏成功！'
+            ];
+            return $data;
+        }else{
+            $data = [
+                'status' => '0',
+                'msg' => '隐藏失败！'
+            ];
+            return $data;
+        }
+    }
+
+    public function start($dep_id)
+    {
+        $temp['display'] = 1;
+        $department = Department::where('id',$dep_id)->update($temp);
+        if($department){
+            $data = [
+                'status'=>'1',
+                'msg' =>'显示成功！'
+            ];
+            return $data;
+        }else{
+            $data = [
+                'status' => '0',
+                'msg' => '显示失败！'
+            ];
+            return $data;
+        }
+    }
+
+}

app/Http/Controllers/Admin/UserController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Model\Department;
 use App\Model\Job;
 use App\Model\User;
 use Illuminate\Http\Request;
@@ -64,13 +65,16 @@ class UserController extends CommonController
     public function create()
     {
         $user_job = Job::where('display','=','1')->orderby('role','asc')->get();
-        return view('admin.user.add_user',compact('user_job'));
+        $department = Department::all();
+        return view('admin.user.add_user',compact('user_job','department'));
     }
 
     public function store()
     {
         $input = Input::except('_token');
         $input['display'] = '1';
+        $dep = Department::find($input['department_id']);
+        $input['department'] = $dep->department_name;
 //        $input['status'] = '1';
         $rules = [
             'name'=>'required',

app/Http/routes.php

@@ -39,6 +39,7 @@ Route::group(['namespace'=>'Admin','middleware'=>['admin.login']],function() {
     Route::resource('/permission','PermissionController');
     Route::resource('/job','JobController');
     Route::resource('/project','ProjectController');
+    Route::resource('/department','DepartmentController');
 
     Route::post('/project/show/{id}','ProjectController@show');
     Route::post('/project/display/{id}','ProjectController@display');
@@ -46,6 +47,8 @@ Route::group(['namespace'=>'Admin','middleware'=>['admin.login']],function() {
     Route::post('/user/start/{id}','UserController@start');
     Route::post('/job/ting/{id}','JobController@ting');
     Route::post('/job/start/{id}','JobController@start');
+    Route::post('/department/ting/{id}','DepartmentController@ting');
+    Route::post('/department/start/{id}','DepartmentController@start');
 });
 
 Route::any('/login', 'Admin\IndexController@login');

app/Model/Department.php

@@ -1,7 +1,13 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: brand
- * Date: 16-9-6
- * Time: 上午8:26
- */
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Department extends Model
+{
+    protected $table = 'department';
+    protected $primaryKey = 'id';
+    public $timestamps = false;
+    public $guarded=[];
+}

resources/views/admin/department/create.blade.php

@@ -79,7 +79,7 @@
                             <i class="fa fa-circle-o"></i>
                             <span>用户管理</span></a>
                     </li>
-                    <li class="active"><a href="{{ url('/job') }}">
+                    <li><a href="{{ url('/job') }}">
                             <i class="fa fa-circle-o"></i>
                             <span>职位管理</span>
                         </a>
@@ -89,6 +89,11 @@
                             <span>项目管理</span>
                         </a>
                     </li>
+                    <li class="active"><a href="{{ url('/department') }}">
+                            <i class="fa fa-circle-o"></i>
+                            <span>机构管理</span>
+                        </a>
+                    </li>
                 </ul>
             </li>
         </ul>
@@ -107,21 +112,21 @@
         <ol class="breadcrumb">
             <li><a href="{{ url('/ ')}}"><i class="fa fa-dashboard"></i> 主页</a></li>
             <li><a href="#">系统设置</a></li>
-            <li class="active">职位管理</li>
+            <li class="active">机构管理</li>
         </ol>
     </section>
     <!-- Main content -->
     <section class="content">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">添加职位</h3>
+                <h3 class="box-title">添加机构</h3>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
                         <i class="fa fa-minus"></i></button>
                 </div>
             </div>
             <div class="box-body">
-                <form class="form-horizontal form-bordered" action="{{ url('/job') }}" method="POST">
+                <form class="form-horizontal form-bordered" action="{{ url('/department') }}" method="POST">
                     {{ csrf_field() }}
                     @if(count($errors)>0)
                         <div class="callout callout-danger">
@@ -136,28 +141,19 @@
                     @endif
                     <div class="panel-body panel-body-nopadding">
 
-
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">职位权限</label>
-
-                            <div class="col-sm-6">
-                                <input type="text" class="form-control" name="role" value="" placeholder="0 - 6,数字越大权限越高">
-                            </div>
-                        </div>
-
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">职位名称</label>
+                            <label class="col-sm-3 control-label">机构名称</label>
 
                             <div class="col-sm-6">
-                                <input type="text" class="form-control" name="display_name" value="">
+                                <input type="text" class="form-control" name="department_name" value="">
                             </div>
                         </div>
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">职位详述</label>
+                            <label class="col-sm-3 control-label">机构说明</label>
 
                             <div class="col-sm-6">
-                                <input type="text" class="form-control" name="description" value="">
+                                <input type="text" class="form-control" name="department_description" value="">
                             </div>
                         </div>
 
@@ -168,7 +164,7 @@
                             <div class="col-sm-6 col-sm-offset-3">
                                 <a><button type="submit" class="btn btn-primary">保存</button></a>
                                 &nbsp;
-                                <a class="btn btn-default" href="{{ url('/job') }}">取消</a>
+                                <a class="btn btn-default" href="{{ url('/department') }}">取消</a>
                             </div>
                         </div>
                     </div><!-- panel-footer -->

resources/views/admin/department/edit.blade.php

@@ -79,7 +79,7 @@
                             <i class="fa fa-circle-o"></i>
                             <span>用户管理</span></a>
                     </li>
-                    <li class="active"><a href="{{ url('/job') }}">
+                    <li><a href="{{ url('/job') }}">
                             <i class="fa fa-circle-o"></i>
                             <span>职位管理</span>
                         </a>
@@ -89,6 +89,11 @@
                             <span>项目管理</span>
                         </a>
                     </li>
+                    <li class="active"><a href="{{ url('/department') }}">
+                            <i class="fa fa-circle-o"></i>
+                            <span>机构管理</span>
+                        </a>
+                    </li>
                 </ul>
             </li>
         </ul>
@@ -107,21 +112,21 @@
         <ol class="breadcrumb">
             <li><a href="{{ url('/ ')}}"><i class="fa fa-dashboard"></i> 主页</a></li>
             <li><a href="#">系统设置</a></li>
-            <li class="active">职位管理</li>
+            <li class="active">机构管理</li>
         </ol>
     </section>
     <!-- Main content -->
     <section class="content">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">编辑职位</h3>
+                <h3 class="box-title">编辑机构</h3>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
                         <i class="fa fa-minus"></i></button>
                 </div>
             </div>
             <div class="box-body">
-                <form class="form-horizontal form-bordered"  action="{{ url("/job/$data->id") }}" method="POST">
+                <form class="form-horizontal form-bordered"  action="{{ url("/department/$data->id") }}" method="POST">
                     @if(count($errors)>0)
                         <div class="callout callout-danger">
                             @if(is_object($errors))
@@ -138,27 +143,19 @@
                     <div class="panel-body panel-body-nopadding">
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">权限 <span class="asterisk">*</span></label>
-
-                            <div class="col-sm-6">
-                                <input type="text"  name="name" class="form-control tooltips" value="{{ $data->role }}" disabled >
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">职位名称</label>
+                            <label class="col-sm-3 control-label">机构名称</label>
 
                             <div class="col-sm-6">
-                                <input type="text" class="form-control" name="display_name" value="{{ $data->display_name }}">
+                                <input type="text" class="form-control" name="department_name" value="{{ $data->department_name }}">
                             </div>
                         </div>
 
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">职位详述</label>
+                            <label class="col-sm-3 control-label">机构说明</label>
 
                             <div class="col-sm-6">
-                                <input type="text" class="form-control" name="description" value="{{ $data->description }}">
+                                <input type="text" class="form-control" name="department_description" value="{{ $data->department_description }}">
                             </div>
                         </div>
 
@@ -170,7 +167,7 @@
                             <div class="col-sm-6 col-sm-offset-3">
                                 <a><button type="submit" class="btn btn-primary">保存</button></a>
                                 &nbsp;
-                                <a class="btn btn-default" href="{{ url('/job') }}">取消</a>
+                                <a class="btn btn-default" href="{{ url('/department') }}">取消</a>
                             </div>
                         </div>
                     </div><!-- panel-footer -->

resources/views/admin/department/index.blade.php

@@ -78,7 +78,7 @@
                             <i class="fa fa-circle-o"></i>
                             <span>用户管理</span></a>
                     </li>
-                    <li class="active"><a href="{{ url('/job') }}">
+                    <li><a href="{{ url('/job') }}">
                             <i class="fa fa-circle-o"></i>
                             <span>职位管理</span>
                         </a>
@@ -88,6 +88,11 @@
                             <span>项目管理</span>
                         </a>
                     </li>
+                    <li class="active"><a href="{{ url('/department') }}">
+                            <i class="fa fa-circle-o"></i>
+                            <span>机构管理</span>
+                        </a>
+                    </li>
                 </ul>
             </li>
         </ul>
@@ -106,7 +111,7 @@
         <ol class="breadcrumb">
             <li><a href="{{ url('/')}}"><i class="fa fa-dashboard"></i> 主页</a></li>
             <li><a href="#">系统设置</a></li>
-            <li><a href="{{ url('/job') }}">职位管理</a></li>
+            <li><a href="{{ url('/department') }}">机构管理</a></li>
         </ol>
     </section>
     <!-- Main content -->
@@ -114,7 +119,7 @@
         <!-- Default box -->
         <div class="box">
             <div class="box-header">
-                <h3 class="box-title">职位管理</h3>
+                <h3 class="box-title">机构管理</h3>
             </div>
             <!-- /.box-header -->
             <div class="box-body">
@@ -123,7 +128,7 @@
                         <div class="col-sm-11"></div>
                         <div class="col-sm-1">
                             @if($user->role>4)
-                                <a href="{{ url('/job/create') }}" class="btn btn-primary tooltips">
+                                <a href="{{ url('/department/create') }}" class="btn btn-primary tooltips">
                                     <i class="fa fa-plus"></i>新增</a>
                                 @endif
                         </div>
@@ -133,21 +138,21 @@
                             <table class="table mb30">
                                 <thead>
                                 <tr>
-                                    <th>权限</th>
-                                    <th>职位名称</th>
-                                    <th>职位详述</th>
+                                    <th>id</th>
+                                    <th>机构名称</th>
+                                    <th>机构说明</th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 @foreach($data as $list)
                                     <tr>
-                                        <td>{{ $list -> role }}</td>
-                                        <td>{{ $list -> display_name }}</td>
-                                        <td>{{ $list -> description}}</td>
+                                        <td>{{ $list -> id }}</td>
+                                        <td>{{ $list -> department_name }}</td>
+                                        <td>{{ $list -> department_description}}</td>
                                         <td>
                                             @if($user->role>4)
-                                                <a href="{{ url('/job/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
+                                                <a href="{{ url('/department/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
                                                     <i class="fa fa-pencil"></i> 编辑</a>
                                                 @if($list->display == 1)
                                                     <a href="javascript:;" onclick="ting({{ $list->id }})" class="btn btn-danger btn-sm article-delete">
@@ -191,11 +196,11 @@
 
 
 <script>
-    function del_user(job_id){
-        layer.confirm('确定要删除这个职位吗？',{
+    function del_user(dep_id){
+        layer.confirm('确定要删除这个机构吗？',{
             btn:['确定','取消']
         },function(){
-            $.post('{{ url('/job/') }}/'+job_id,{
+            $.post('{{ url('/department/') }}/'+dep_id,{
                 '_method':'delete',
                 '_token' :'{{ csrf_token() }}'
             },function(data){
@@ -211,11 +216,11 @@
         });
     }
 
-    function ting(job_id){
-        layer.confirm('确定要隐藏这个职位吗？',{
+    function ting(dep_id){
+        layer.confirm('确定要隐藏这个机构吗？',{
             btn:['确定','取消']
         },function(){
-            $.post('{{ url('/job/ting') }}/'+job_id,{
+            $.post('{{ url('/department/ting') }}/'+dep_id,{
                 '_token' :'{{ csrf_token() }}'
             },function(data){
                 if(data.status == 1){
@@ -230,11 +235,11 @@
         });
     }
 
-    function start(job_id){
-        layer.confirm('确定要显示这个职位吗？',{
+    function start(dep_id){
+        layer.confirm('确定要显示这个机构吗？',{
             btn:['确定','取消']
         },function(){
-            $.post('{{ url('/job/start') }}/'+job_id,{
+            $.post('{{ url('/department/start') }}/'+dep_id,{
                 '_token' :'{{ csrf_token() }}'
             },function(data){
                 if(data.status == 1){

resources/views/admin/index.blade.php

@@ -89,6 +89,11 @@
                                 <span>项目管理</span>
                             </a>
                         </li>
+                        <li><a href="{{ url('/department') }}">
+                                <i class="fa fa-circle-o"></i>
+                                <span>机构管理</span>
+                            </a>
+                        </li>
                     </ul>
                 </li>
             </ul>

resources/views/admin/user/add_user.blade.php

@@ -197,7 +197,14 @@
                         </tr>
                         <tr>
                             <td>单位</td>
-                            <td><input name="department" class="form-control" value=""  ></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
+                                </select>
+                            </td>
                         </tr>
                         <tr>
                             <td>证件名称</td>