fix something

app/Http/Controllers/Admin/IndexController.php

@@ -9,13 +9,6 @@ namespace App\Http\Controllers\Admin;
     use Illuminate\Support\Facades\Validator;
     use Session;
     class IndexController extends CommonController{
-
-        public function see()
-        {
-            return view('admin.see');
-        }
-
-
         public function index()
         {
             $data = Tablelist::orderby('id','asc')->paginate(2);

app/Http/Controllers/Admin/JobController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Model\Adminuser;
+use App\Model\Job;
 use App\Model\Tablelist;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Input;
@@ -13,12 +14,14 @@ class JobController extends CommonController{
 
     public function index()
     {
-        return view('admin.job.index');
+        $data = Job::all();
+        return view('admin.job.index',compact('data'));
     }
 
-    public function edit()
+    public function edit($job_id)
     {
-        return view('admin.job.edit');
+        $data = Job::find($job_id);
+        return view('admin.job.edit',compact('data'));
     }
 
     public function create()
@@ -26,4 +29,44 @@ class JobController extends CommonController{
         return view('admin.job.create');
     }
 
+    public function update($job_id)
+    {
+        $input = Input::except('_token','_method');
+        $re = Job::where('id',$job_id)->update($input);
+        if($re){
+            return redirect('/job');
+        }else{
+            return back()->with('errors','职位信息更新失败，请稍后重试!');
+        }
+    }
+
+    public function destroy($job_id)
+    {
+        $re = Job::where('id',$job_id)->delete();
+        if($re){
+            $data = [
+                'status'=>1,
+                'msg' => '删除成功！'
+            ];
+        }else{
+            $data =[
+                'status'=>0,
+                'msg' => '删除失败，请刷新重试！'
+            ];
+        }
+        return $data;
+    }
+
+    public function store()
+    {
+        $input = Input::except('_token');
+        $re = Job::create($input);
+        if($re){
+            return redirect('job');
+        }else{
+            return back()->with('errors','新建失败，请稍后重试！');
+        }
+        return 1;
+    }
+
 }

app/Http/Controllers/Admin/TableController.php

@@ -65,17 +65,18 @@ class TableController extends CommonController
 //        dd($input);
         $input['user_id'] = $user->id;
 //        表格未完成保存 0
-        $input['finish_status'] = '0';
+        $input['status'] = '0';
+
+        $v = json_encode($request->all());
+        $a = json_decode($v);
 
-        $test = $request->only('bzc_name');
-        dd($test);
 //        $re = Tablelist::create($input);
         return 1;
     }
 
     public function submit($user_id)
     {
-//        表格完成提交 1
+//        0:未提交 1已核算  2已复核 3已提交 4：已初审 5：已复审 6已监审
         return 1;
     }
 

app/Http/Controllers/Admin/UserController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Model\Job;
 use App\Model\User;
 use Illuminate\Http\Request;
 
@@ -15,7 +16,7 @@ class UserController extends CommonController
 //    用户列表
     public function user_list()
     {
-        $data = User::orderby('id','asc')->paginate(2);
+        $data = User::orderby('id','asc')->paginate(10);
         return view('admin.user.userlist',compact('data'));
     }
 
@@ -23,14 +24,15 @@ class UserController extends CommonController
     public function edit($user_id)
     {
         $data = User::find($user_id);
-        return view('admin.user.edit',compact('data'));
+        $user_job = Job::all();
+        return view('admin.user.edit',['data'=>$data,'user_job'=>$user_job]);
     }
     
 //    更新用户信息
     public function update($user_id)
     {
         $input = Input::except('_token','_method');
-        $re = User::where('id',$user_id)->update($input);
+        $re = User::find($user_id)->update($input);
         if($re){
             return redirect('/user_list');
         }else{

app/Model/Job.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Job extends Model
+{
+    protected $table = 'role';
+    protected $primaryKey = 'id';
+    public $timestamps = false;
+    public $guarded=[];
+}

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

@@ -112,41 +112,35 @@
                 </div>
             </div>
             <div class="box-body">
-                <form class="form-horizontal form-bordered" action="" method="POST">
-
-                    <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"  data-toggle="tooltip" name="name"
-                                       data-trigger="hover" class="form-control tooltips"
-                                       data-original-title="不可重复,不可点击路由输入`#`" value="" >
-                            </div>
+                <form class="form-horizontal form-bordered" action="{{ url('/job') }}" method="POST">
+                    {{ csrf_field() }}
+                    @if(count($errors)>0)
+                        <div class="callout callout-danger">
+                            @if(is_object($errors))
+                                @foreach($errors->all() as $error)
+                                    <p>{{ $error }}</p>
+                                @endforeach
+                            @else
+                                <p>{{ $errors }}</p>
+                            @endif
                         </div>
+                    @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="display_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="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="display_name" value="">
                             </div>
                         </div>
 
@@ -158,13 +152,12 @@
                             </div>
                         </div>
 
-
                     </div><!-- panel-body -->
 
                     <div class="panel-footer">
                         <div class="row">
                             <div class="col-sm-6 col-sm-offset-3">
-                                <a class="btn btn-primary" href="{{ url('/job') }}">保存</a>
+                                <a><button type="submit" class="btn btn-primary">保存</button></a>
                                 &nbsp;
                                 <a class="btn btn-default" href="{{ url('/job') }}">取消</a>
                             </div>

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

@@ -112,49 +112,44 @@
                 </div>
             </div>
             <div class="box-body">
-                <form class="form-horizontal form-bordered" action="" method="POST">
-
-                    <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"  data-toggle="tooltip" name="name"
-                                       data-trigger="hover" class="form-control tooltips"
-                                       data-original-title="不可重复,不可点击路由输入`#`" value="" >
-                            </div>
+                <form class="form-horizontal form-bordered"  action="{{ url("/job/$data->id") }}" method="POST">
+                    @if(count($errors)>0)
+                        <div class="callout callout-danger">
+                            @if(is_object($errors))
+                                @foreach($errors->all() as $error)
+                                    <p>{{ $error }}</p>
+                                @endforeach
+                            @else
+                                <p>{{ $errors }}</p>
+                            @endif
                         </div>
+                    @endif
+                    <input type="hidden" name="_method" value="put" >
+                    {{csrf_field()}}
+                    <div class="panel-body panel-body-nopadding">
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">姓名</label>
+                            <label class="col-sm-3 control-label">标识 <span class="asterisk">*</span></label>
 
                             <div class="col-sm-6">
-                                <input type="text" class="form-control" name="display_name" value="">
+                                <input type="text"  name="name" class="form-control tooltips" value="{{ $data->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="">
+                                <input type="text" class="form-control" name="display_name" value="{{ $data->display_name }}">
                             </div>
                         </div>
 
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">教育水平</label>
-
-                            <div class="col-sm-6">
-                                <input type="text" class="form-control" name="description" value="">
-                            </div>
-                        </div>
 
                         <div class="form-group">
                             <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="description" value="{{ $data->description }}">
                             </div>
                         </div>
 
@@ -164,7 +159,7 @@
                     <div class="panel-footer">
                         <div class="row">
                             <div class="col-sm-6 col-sm-offset-3">
-                                <a class="btn btn-primary" href="{{ url('/job') }}">保存</a>
+                                <a><button type="submit" class="btn btn-primary">保存</button></a>
                                 &nbsp;
                                 <a class="btn btn-default" href="{{ url('/job') }}">取消</a>
                             </div>

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

@@ -97,7 +97,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('/job') }}">职位管理</a></li>
         </ol>
     </section>
     <!-- Main content -->
@@ -105,7 +105,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">
@@ -121,78 +121,26 @@
                             <table class="table mb30">
                                 <thead>
                                 <tr>
-                                    <th>
-                                        <span class="ckbox ckbox-primary">
-                                            <input type="checkbox" id="selectall"/>
-                                            <label for="selectall"></label>
-                                        </span>
-                                    </th>
+                                    <th>标识</th>
                                     <th>职位名称</th>
-                                    <th>姓名</th>
-                                    <th>联系电话</th>
-                                    <th>教育水平</th>
                                     <th>职位详述</th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
                                 <tbody>
+                                @foreach($data as $list)
                                     <tr>
+                                        <td>{{ $list -> name }}</td>
+                                        <td>{{ $list -> display_name }}</td>
+                                        <td>{{ $list -> description}}</td>
                                         <td>
-                                            <div class="ckbox ckbox-default">
-                                                <input type="checkbox" name="id" id="" value="" class="selectall-item"/>
-                                                <label for=""></label>
-                                            </div>
-                                        </td>
-                                        <td>管理员</td>
-                                        <td>张三</td>
-                                        <td>12345678987</td>
-                                        <td>二本</td>
-                                        <td>维护系统正常运行</td>
-                                        <td>
-                                            <a href="{{ url('/job/1/edit') }}" class="btn btn-primary btn-sm">
-                                                <i class="fa fa-pencil"></i> 编辑</a>
-                                            <a class="btn btn-danger btn-sm job-delete"
-                                               href="{{url('/job')}}"><i  class="fa fa-trash-o"></i> 删除</a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="ckbox ckbox-default">
-                                                <input type="checkbox" name="id" id="" value="" class="selectall-item"/>
-                                                <label for=""></label>
-                                            </div>
-                                        </td>
-                                        <td>资料录入员</td>
-                                        <td>李四</td>
-                                        <td>12345678987</td>
-                                        <td>二本</td>
-                                        <td>表格资料录入</td>
-                                        <td>
-                                            <a href="{{ url('/job/1/edit') }}" class="btn btn-primary btn-sm">
-                                                <i class="fa fa-pencil"></i> 编辑</a>
-                                            <a class="btn btn-danger btn-sm job-delete"
-                                               href="{{url('/job')}}"><i  class="fa fa-trash-o"></i> 删除</a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="ckbox ckbox-default">
-                                                <input type="checkbox" name="id" id="" value="" class="selectall-item"/>
-                                                <label for=""></label>
-                                            </div>
-                                        </td>
-                                        <td>表格复审员</td>
-                                        <td>王五</td>
-                                        <td>12345678987</td>
-                                        <td>一本</td>
-                                        <td>复审表单</td>
-                                        <td>
-                                            <a href="{{ url('/job/1/edit') }}" class="btn btn-primary btn-sm">
+                                            <a href="{{ url('/job/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
                                                 <i class="fa fa-pencil"></i> 编辑</a>
-                                            <a class="btn btn-danger btn-sm job-delete"
-                                               href="{{url('/job')}}"><i  class="fa fa-trash-o"></i> 删除</a>
+                                            <a href="javascript:;" onclick="del_user({{ $list->id }})" class="btn btn-danger btn-sm article-delete">
+                                                <i  class="fa fa-trash-o"></i> 删除</a>
                                         </td>
                                     </tr>
+                                    @endforeach
                                 </tbody>
                             </table>
                         </div>
@@ -219,4 +167,28 @@
     <!-- /.content -->
 </div>
 <!-- /.content-wrapper -->
+
+
+<script>
+    function del_user(job_id){
+        layer.confirm('确定要删除这个职位吗？',{
+            btn:['确定','取消']
+        },function(){
+            $.post('{{ url('/job/') }}/'+job_id,{
+                '_method':'delete',
+                '_token' :'{{ csrf_token() }}'
+            },function(data){
+                if(data.status == 1){
+                    location.href = location.href;
+                    layer.alert(data.msg, {icon: 6});
+                }else {
+                    layer.alert(data.msg, {icon: 5});
+                }
+            });
+        },function(){
+
+        });
+    }
+
+</script>
 @endsection

resources/views/admin/table/table_one.blade.php

@@ -23,6 +23,9 @@
                 margin: 15px 0px 15px 0px;
                 width: 80%;
             }
+            .font>li>a{
+                font-size: 12px;
+            }
         </style>
 
         <!--左侧菜单栏-->
@@ -68,8 +71,8 @@
                     <ul class="treeview-menu">
                         <li class="active"><a href="{{ url('/table') }}"><i class="fa  fa-file-text-o"></i>受理案件
                                 <i class="fa fa-angle-left pull-right"></i></a>
-                            <ul class="treeview-menu">
-                                <li class="active"><a href="{{ url('/table/1') }}"><i class="fa fa-circle-o"></i>安置单(货币化安置)</a></li>
+                            <ul class="treeview-menu font">
+                                <li class="active"><a style="font-size: 12px;" href="{{ url('/table/1') }}"><i class="fa fa-circle-o"></i>安置单(货币化安置)</a></li>
                                 <li><a href="{{ url('/table/2') }}"><i class="fa fa-circle-o"></i>违章建筑自行拆除费用申领表</a></li>
                                 <li><a href="{{ url('/table/3') }}"><i class="fa fa-circle-o"></i>残疾人房征补贴审批确认单</a></li>
                                 <li><a href="{{ url('/table/4') }}"><i class="fa fa-circle-o"></i>房屋征收提前搬迁奖励单</a></li>
@@ -138,22 +141,23 @@
                 <div class="row" style="text-align: center">
                     <h3>国有土地房屋征收与补偿安置单（货币化安置）</h3><br>
                 </div>
+                <form action="" method="post">
+                    {{ csrf_field() }}
                 <div id="example2_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
                     <div class="row">
-                        <div class="col-sm-1" style="text-align: right">项目名称：</div>
-                        <div class="col-sm-8">
-                            <input style="margin: 0px;" class="form-control" type="text" placeholder="必填项">
+                        <div class="col-sm-2" style="text-align: right">项目名称：</div>
+                        <div class="col-sm-7">
+                            <input name="project_name" style="margin: 0px;" class="form-control" type="text" placeholder="必填项">
                         </div>
                         <div class="col-sm-1"  style="text-align: right">编号：</div>
                         <div class="col-sm-2">
-                            <input style="margin: 0px;" class="form-control" type="text" placeholder="必填项">
+                            <input name="num" style="margin: 0px;" class="form-control" type="text" placeholder="必填项">
                         </div><br><br>
                     </div>
                     <div class="row">
                         <div class="col-sm-12">
 
-                            <form action="" method="post">
-                                {{ csrf_field() }}
+
                                 @if(count($errors)>0)
                                     <div class="callout callout-danger">
                                         @if(is_object($errors))
@@ -181,23 +185,23 @@
                                     <td colspan="2" width="20%">被征收人姓名：</td>
                                     <td colspan="2" ><input name="bzc_name" class="form-control" type="text" placeholder=""></td>
                                     <td colspan="2" width="20%" >被征收房屋地址</td>
-                                    <td colspan="2" ><input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td colspan="2" ><input name="bzc_addr" class="form-control" type="text" placeholder=""></td>
                                 </tr>
                                 <tr>
                                     <td colspan="2" width="20%">联系电话：</td>
-                                    <td colspan="2" ><input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td colspan="2" ><input name="bzc_tel" class="form-control" type="text" placeholder=""></td>
                                     <td colspan="2" width="20%" >被征收人身份证号码：</td>
-                                    <td colspan="2" ><input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td colspan="2" ><input name="bzc_id_card" class="form-control" type="text" placeholder=""></td>
                                 </tr>
                                 <tr>
                                     <td colspan="2" width="20%">产权性质：</td>
-                                    <td colspan="2" ><input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td colspan="2" ><input name="property" class="form-control" type="text" placeholder=""></td>
                                     <td colspan="2" width="20%" >用途：</td>
-                                    <td colspan="2" ><input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td colspan="2" ><input name="used" class="form-control" type="text" placeholder=""></td>
                                 </tr>
                                 <tr>
                                     <td width="10%">拆迁补偿总金额：</td>
-                                    <td colspan="7">￥ <input name="" class="form-control" type="text" placeholder="">（ 元 ）</td>
+                                    <td colspan="7">￥ <input name="total_money" class="form-control" type="text" placeholder="">（ 元 ）</td>
                                 </tr>
                                 <tr>
                                     <td rowspan="3" colspan="2">货币化安置</td>
@@ -210,23 +214,23 @@
                                 </tr>
                                 <tr>
                                     <td>住宅</td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_home_area" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_home_dprice" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_home_price" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_home_jchae" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_homr_tchae" class="form-control" type="text" placeholder=""></td>
                                 </tr>
                                 <tr>
                                     <td>商业</td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
-                                    <td><input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_bus_area" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_bus_dprice" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_bus_price" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_bus_jchae" class="form-control" type="text" placeholder=""></td>
+                                    <td><input name="money_bus_tchae" class="form-control" type="text" placeholder=""></td>
                                 </tr>
                                 <tr>
                                     <td>购买房屋位置</td>
-                                    <td colspan="7"><input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td colspan="7"><input name="home_addr" class="form-control" type="text" placeholder=""></td>
                                 </tr>
                                 <tr style="height: 5em">
                                     <td rowspan="2" colspan="2">征收实施单位（章）</td>
@@ -234,7 +238,7 @@
                                     <td colspan="2">代理人（签字）：</td>
                                 </tr>
                                 <tr>
-                                    <td colspan="6">签约时间：<input name="" class="form-control" type="text" placeholder=""></td>
+                                    <td colspan="6">签约时间：<input name="table_time" class="form-control" type="text" placeholder=""></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -258,10 +262,11 @@
                                     <a href="{{ url('/table') }}" class="btn btn-info">返回</a>
                                 </div>
                             </div>
-                            </form>
+
                         </div>
                     </div>
                 </div>
+    </form>
             </div>
             <!-- /.box-body -->
         </div>

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

@@ -86,98 +86,103 @@
     </section>
     <!-- /.sidebar -->
 </aside>
-        <!-- =============================================== -->
-        <!-- 内容 -->
-        <div class="content-wrapper">
-            <!-- Content Header (Page header) -->
-            <section class="content-header">
-                <h1>
-                    用户管理
-                    <small></small>
-                </h1>
-                <ol class="breadcrumb">
-                    <li><a href="{{ url('/ ')}}"><i class="fa fa-dashboard"></i> 主页</a></li>
-                    <li><a href="#">征拆局系统维护</a></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>
-                        <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 action="{{ url("/user/$data->id") }}" method="post">
-                            <input type="hidden" name="_method" value="put" >
-                            {{csrf_field()}}
-                            @if(count($errors)>0)
-                                <div class="callout callout-danger">
-                                    @if(is_object($errors))
-                                        @foreach($errors->all() as $error)
-                                            <p>{{ $error }}</p>
-                                        @endforeach
-                                    @else
-                                        <p>{{ $errors }}</p>
-                                    @endif
-                                </div>
-                            @endif
-                            <table id="example2" class="table table-bordered table-hover dataTable" role="grid" aria-describedby="example2_info">
-                                <tbody>
-                                <tr>
-                                    <td>ID</td>
-                                    <td><input name="id" class="form-control" value="{{ $data->id }}" ></td>
-                                </tr>
-                                <tr>
-                                    <td>登陆名</td>
-                                    <td><input name="name" class="form-control" value="{{ $data->name }}" ></td>
-                                </tr>
-                                <tr>
-                                    <td>新密码</td>
-                                    <td><input name="pswd" class="form-control"  value=" " ></td>
-                                </tr>
-                                <tr>
-                                    <td>权限</td>
-                                    <td><input name="role" class="form-control" value="{{ $data->role }}"  ></td>
-                                </tr>
-                                <tr>
-                                    <td>姓名</td>
-                                    <td><input name="surname" class="form-control" value="{{ $data->surname }}"  ></td>
-                                </tr>
-                                <tr>
-                                    <td>学历</td>
-                                    <td><input name="education" class="form-control" value="{{ $data->education }}"  ></td>
-                                </tr>
-                                <tr>
-                                    <td>证件名称</td>
-                                    <td><input name="cardname" class="form-control" value="{{ $data->cardname }}"  ></td>
-                                </tr>
-                                <tr>
-                                    <td>证件编号</td>
-                                    <td><input name="cardid" class="form-control" value="{{ $data->cardid }}"  ></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td>
-                                        <button class="btn btn-primary" type="submit">提交</button>
-                                        <a href="{{ url('/user_list') }}" class="btn">返回</a>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </form>
-                    </div>
-                    <!-- /.box-body -->
-                </div>
-                <!-- /.box -->
+<!-- =============================================== -->
+<!-- 内容 -->
+<div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+    <section class="content-header">
+        <h1>
+            用户管理
+            <small></small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ url('/ ')}}"><i class="fa fa-dashboard"></i> 主页</a></li>
+            <li><a href="#">征拆局系统维护</a></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>
 
-            </section>
-            <!-- /.content -->
+                <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 action="{{ url("/user/$data->id") }}" method="post">
+                    <input type="hidden" name="_method" value="put">
+                    {{csrf_field()}}
+                    @if(count($errors)>0)
+                        <div class="callout callout-danger">
+                            @if(is_object($errors))
+                                @foreach($errors->all() as $error)
+                                    <p>{{ $error }}</p>
+                                @endforeach
+                            @else
+                                <p>{{ $errors }}</p>
+                            @endif
+                        </div>
+                    @endif
+                    <table id="example2" class="table table-bordered table-hover dataTable" role="grid"
+                           aria-describedby="example2_info">
+                        <tbody>
+                        <tr>
+                            <td>ID</td>
+                            <td><input name="id" class="form-control" value="{{ $data->id }}"></td>
+                        </tr>
+                        <tr>
+                            <td>登陆名</td>
+                            <td><input name="name" class="form-control" value="{{ $data->name }}"></td>
+                        </tr>
+                        <tr>
+                            <td>新密码</td>
+                            <td><input name="pswd" class="form-control" value=""></td>
+                        </tr>
+                        <tr>
+                            <td>职位</td>
+                            <td>
+                                <select class="form-control" name="role">
+                                    @foreach($user_job as $value)
+                                        <option value="{{$value->id}}" @if($data->role == $value->id) selected @endif>{{$value->display_name}}</option>
+                                    @endforeach
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>姓名</td>
+                            <td><input name="surname" class="form-control" value="{{ $data->surname }}"></td>
+                        </tr>
+                        <tr>
+                            <td>证件名称</td>
+                            <td><input name="cardname" class="form-control" value="{{ $data->cardname }}"></td>
+                        </tr>
+                        <tr>
+                            <td>证件编号</td>
+                            <td><input name="cardid" class="form-control" value="{{ $data->cardid }}"></td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td>
+                                <button class="btn btn-primary" type="submit">提交</button>
+                                <a href="{{ url('/user_list') }}" class="btn">返回</a>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </form>
+            </div>
+            <!-- /.box-body -->
         </div>
-        <!-- /.content-wrapper -->
+        <!-- /.box -->
+
+    </section>
+    <!-- /.content -->
+</div>
+<!-- /.content-wrapper -->
 
 @endsection

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

@@ -134,7 +134,7 @@
                                     <tr role="row">
                                         <th>序号</th>
                                         <th>登录名</th>
-                                        <th>权限</th>
+                                        <th>职位</th>
                                         <th>单位</th>
                                         <th>操作</th>
 
@@ -145,7 +145,10 @@
                                     <tr role="row" class="odd">
                                         <td>{{ $list->id }}</td>
                                         <td>{{ $list->name }}</td>
-                                        <td>{{ $list->role }}</td>
+                                        <td>
+                                            @if($list->role == 1)初审@endif
+                                            @if($list->role == 2)复审@endif
+                                        </td>
                                         <td>{{ $list->department }}</td>
                                         <td>
                                             <a href="{{ url('/user/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">

resources/views/layouts/admin.blade.php

@@ -21,6 +21,7 @@
     <script src="{{asset('js/jQuery-2.2.0.min.js')}}"></script>
 
     <![endif]-->
+
 </head>
 <body class="hold-transition skin-blue sidebar-mini">
     <div style="height: 160px;width: 100%;">