add user edit touxiang

app/Http/Controllers/Admin/TableController.php

@@ -248,65 +248,54 @@ class TableController extends CommonController
 //    $table_id表格自增id
     public function edit($table_id)
     {
-        $table = Tablelist::find($table_id);
-        $temp = [
-            'project_name' => $table->project_name,
-            'bzc_name' => $table->bzc_name,
-            'bzc_cardid' => $table->bzc_cardid,
-            'bzc_addr' => $table->bzc_addr,
-            'bzc_area' => $table->bzc_area,
-            'house_type' => $table->house_type,
-            'bzc_tel' => $table->bzc_tel,
-            'used' => $table->used,
-            'num' => $table->num,
-            'table_time' => $table->table_time,
-            'sub_description' => $table->sub_description
-        ];
-        $table_type_id = $table['table_id'];
-        $json = json_decode($table['json'],true);
-        $table = json_encode($table);
-        $table = json_decode($table,true);
-        $table = array_merge($table,$json);
+        $table_list = Tablelist::find($table_id);
+        $table_type_id = $table_list->table_id;
+        $child_table_id = $table_list->child_table_id;
         $user = session('user');
-        $table['judge']=$user->role;
-        $table['project_name'] = $temp['project_name'];
-        $table['bzc_name'] = $temp['bzc_name'];
-        $table['bzc_cardid'] = $temp['bzc_cardid'];
-        $table['bzc_addr'] = $temp['bzc_addr'];
-        $table['bzc_area'] = $temp['bzc_area'];
-        $table['house_type'] = $temp['house_type'];
-        $table['bzc_tel'] = $temp['bzc_tel'];
-        $table['used'] = $temp['used'];
-        $table['num'] = $temp['num'];
-        $table['table_time'] = $temp['table_time'];
-        $table['sub_description'] = $temp['sub_description'];
-        $table = (object)$table;
 
         if($table_type_id == 1){
+            $table = Table_one::find($child_table_id);
+            $table['judge']=$user->role;
             return view('admin.edit_table.table_one',compact('table_id','table'));
         }
         if($table_type_id == 2){
+            $table = Table_two::find($child_table_id);
+            $table['judge']=$user->role;
             return view('admin.edit_table.table_two',compact('table_id','table'));
         }
         if($table_type_id == 3){
+            $table = Table_three::find($child_table_id);
+            $table['judge']=$user->role;
             return view('admin.edit_table.table_three',compact('table_id','table'));
         }
         if($table_type_id == 4){
+            $table = Table_four::find($child_table_id);
+            $table['judge']=$user->role;
             return view('admin.edit_table.table_four',compact('table_id','table'));
         }
         if($table_type_id == 5){
+            $table = Table_five::find($child_table_id);
+            $table['judge']=$user->role;
             return view('admin.edit_table.table_five',compact('table_id','table'));
         }
         if($table_type_id == 6){
+            $table = Table_six::find($child_table_id);
+            $table['judge']=$user->role;
             return view('admin.edit_table.table_six',compact('table_id','table'));
         }
         if($table_type_id == 7){
+            $table = Table_seven::find($child_table_id);
+            $table['judge']=$user->role;
             return view('admin.edit_table.table_seven',compact('table_id','table'));
         }
         if($table_type_id == 8){
+            $table = Table_eight::find($child_table_id);
+            $table['judge']=$user->role;
             return view('admin.edit_table.table_eight',compact('table_id','table'));
         }
         if($table_type_id == 9){
+            $table = Table_nine::find($child_table_id);
+            $table->judge=$user->role;
             return view('admin.edit_table.table_nine',compact('table_id','table'));
         }
     }
@@ -329,16 +318,67 @@ class TableController extends CommonController
         }
     }
 
+    //跳转统计页面
+    public function show_sta($table_type_id)
+    {
+        $table = [];
+        $th = [];
+        switch($table_type_id){
+            case 1:
+                $table = [];
+                $th = [
+                    ''=>''
+                ];
+                $table_name= '安置单(货币化安置)';
+                return view('admin.sta.sta_one',compact('th','table_name','table','table_type_id'));
+                break;
+            case 2:
+                $table_name= '违章建筑自行拆除费用申领表';
+                return view('admin.sta.sta_tow',compact('th','table_name','table'));
+                break;
+            case 3:
+                $table_name= '残疾人房征补贴审批确认单';
+                return view('admin.sta.sta_three',compact('th','table_name','table'));
+                break;
+            case 4:
+                $table_name= '房屋征收提前搬迁奖励单';
+                return view('admin.sta.sta_four',compact('th','table_name','table'));
+                break;
+            case 5:
+                $table_name= '逾期过渡安置补助费发放单';
+                return view('admin.sta.sta_five',compact('th','table_name','table'));
+                break;
+            case 6:
+                $table_name= '房屋征收安置补贴单';
+                return view('admin.sta.sta_six',compact('th','table_name','table'));
+                break;
+            case 7:
+                $table_name= '核算单（货币化安置）';
+                return view('admin.sta.sta_seven',compact('th','th1','th2','th3','table_name','table'));
+                break;
+            case 8:
+                $table_name= '核算单（产权调换）';
+                return view('admin.sta.sta_eight',compact('th','th1','th2','th3','th4','table_name','table'));
+                break;
+            case 9:
+                $table_name= '核算单（货币补偿）';
+                return view('admin.sta.sta_nine',compact('th','th1','th2','table_name','table'));
+                break;
+        }
+    }
 //    处理统计数据，返回到页面
     public function sta_table(Request $request,$table_type_id)
     {
         if(isset($table_type_id)){
             switch($table_type_id){
                 case 1:
-                    $table = DB::select('SELECT bzc_name ,SUM(home_area+money_bus_area) as area,SUM(total_money) as total_money,SUM(money_home_price+money_bus_price) as price,
+                    if($request->all()['search'] != ''){
+                        $table = Table_one::where('status','>','5')->where('bzc_name','like','%'.$request->all()['search'].'%')->get();
+                    }else{
+                        $table = DB::select('SELECT bzc_name ,SUM(home_area+money_bus_area) as area,SUM(total_money) as total_money,SUM(money_home_price+money_bus_price) as price,
 SUM(money_home_jchae+money_bus_jchae) as jchae ,SUM(money_home_tchae+money_bus_tchae) as tchae
 FROM table_one WHERE status > 5 GROUP BY bzc_name');
-
+                    }
                     $table_name = '国有土地房屋征收与补偿安置单（货币化安置）';
                     $th = [
                         '1'=>'姓名',
@@ -348,7 +388,7 @@ FROM table_one WHERE status > 5 GROUP BY bzc_name');
                         '5'=>'应交总差额',
                         '6'=>'应退总差额'
                     ];
-                    return view('admin.sta.sta_one',compact('table_name','table','th'));
+                    return view('admin.sta.sta_one',compact('table_name','table','th','table_type_id'));
                     break;
 
                 case 2:
@@ -388,7 +428,7 @@ FROM table_three WHERE status > 5 GROUP BY bzc_name');
                     ];
                     $table = DB::select('SELECT bzc_name ,SUM(quanj) as quanj,SUM(chaj)as chaj,SUM(tongj) as tongj,SUM(zongj) as zongj
 FROM table_four WHERE status > 5 GROUP BY bzc_name');
-                    return view('admin.sta.sta_one',compact('table_name','table','th'));
+                    return view('admin.sta.sta_four',compact('table_name','table','th'));
                     break;
 
                 case 5:
@@ -416,8 +456,9 @@ FROM table_five WHERE status > 5 GROUP BY bzc_name');
                     ];
                     $table = DB::select('SELECT bzc_name ,SUM(anzhi) as anzhi,SUM(banqian)as banqian,SUM(dibu) as dibu,SUM(other) as other,SUM(totalj) as totalj
 FROM table_six WHERE status > 5 GROUP BY bzc_name');
-                    return view('admin.sta.sta_one',compact('table_name','table','th'));
+                    return view('admin.sta.sta_six',compact('table_name','table','th'));
                     break;
+
                 case 7:
                     $table_name = '核算单（货币化安置）';
                     $th = [
@@ -531,6 +572,7 @@ SUM(data62) as data62,SUM(data59) as data59,SUM(data60) as data60
 FROM  table_eight  WHERE status > 5 GROUP BY bzc_name');
                     return view('admin.sta.sta_eight',compact('table_name','th','th1','th2','th3','th4','th5','table'));
                     break;
+
                 case 9:
                     $table_name = '核算单（货币补偿）';
                     $th=[

app/Http/routes.php

@@ -35,6 +35,7 @@ Route::group(['namespace'=>'Admin','middleware'=>['admin.login']],function() {
     Route::post('/table/sub/{id}/create','TableController@create');
     Route::delete('/table/del/{id}','TableController@delete');
     Route::get('/table/statistics/{table_type_id}','TableController@sta_table');
+    Route::get('/table/statistics/show/{table_type_id}','TableController@show_sta');
 
     Route::resource('user', 'UserController');
     Route::resource('video', 'VideoController');

resources/views/admin/edit_table/table_eight.blade.php

@@ -268,13 +268,12 @@
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-4"></div>
-                                    <div class="col-sm-4"></div>
+                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-8"> <textarea name="sub_description">{{ $table->sub_description }}</textarea></div>
+                            <div class="col-sm-8"></div>
                             <div class="col-sm-4">
                                 @if($table->judge > 5)
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">

resources/views/admin/edit_table/table_five.blade.php

@@ -152,13 +152,12 @@
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-4"></div>
-                                    <div class="col-sm-4"></div>
+                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-8"> <textarea name="sub_description">{{ $table->sub_description }}</textarea></div>
+                            <div class="col-sm-8"></div>
                             <div class="col-sm-4">
                                 @if($table->judge > 5)
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">

resources/views/admin/edit_table/table_four.blade.php

@@ -132,13 +132,12 @@
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-4"></div>
-                                    <div class="col-sm-4"></div>
+                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-8"> <textarea name="sub_description">{{ $table->sub_description }}</textarea></div>
+                            <div class="col-sm-8"></div>
                             <div class="col-sm-4">
                                 @if($table->judge > 5)
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">

resources/views/admin/edit_table/table_nine.blade.php

@@ -228,15 +228,14 @@
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-4"></div>
-                                    <div class="col-sm-4"></div>
+                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-8"> <textarea name="sub_description">{{ $table->sub_description }}</textarea></div>
+                            <div class="col-sm-8"></div>
                             <div class="col-sm-4">
-                                @if($table->judge > 5)
+                                @if($table->judge > 6)
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">
                                         保存</button>
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">

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

@@ -171,15 +171,12 @@
                             </div>
                             <div class="row">
                                 <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                <div class="col-sm-4"></div>
-                                <div class="col-sm-4"></div>
+                                <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                             </div>
                             <div class="row">
-                                <div class="col-sm-8">
-                                    <textarea name="sub_description">{{ $table->sub_description }}</textarea>
-                                </div>
+                                <div class="col-sm-8"></div>
                                 <div class="col-sm-4">
-                                    @if($table->judge > 5)
+                                    @if($table->judge > 6)
                                         <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">
                                             保存</button>
                                         <button type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">

resources/views/admin/edit_table/table_seven.blade.php

@@ -223,13 +223,12 @@
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-4"></div>
-                                    <div class="col-sm-4"></div>
+                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-8"> <textarea name="sub_description">{{ $table->sub_description }}</textarea></div>
+                            <div class="col-sm-8"></div>
                             <div class="col-sm-4">
                                 @if($table->judge > 5)
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">

resources/views/admin/edit_table/table_six.blade.php

@@ -138,13 +138,12 @@
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-4"></div>
-                                    <div class="col-sm-4"></div>
+                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-8"> <textarea name="sub_description">{{ $table->sub_description }}</textarea></div>
+                            <div class="col-sm-8"></div>
                             <div class="col-sm-4">
                                 @if($table->judge > 5)
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">

resources/views/admin/edit_table/table_three.blade.php

@@ -146,13 +146,12 @@
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-4"></div>
-                                    <div class="col-sm-4"></div>
+                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-8"> <textarea name="sub_description">{{ $table->sub_description }}</textarea></div>
+                            <div class="col-sm-8"></div>
                             <div class="col-sm-4">
                                 @if($table->judge > 5)
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">

resources/views/admin/edit_table/table_two.blade.php

@@ -144,13 +144,12 @@
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-4">复核：<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-4"></div>
-                                    <div class="col-sm-4"></div>
+                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-8"> <textarea name="sub_description">{{ $table->sub_description }}</textarea></div>
+                            <div class="col-sm-8"></div>
                             <div class="col-sm-4">
                                 @if($table->judge > 5)
                                     <button type="submit" onclick="javascript:this.form.action='{{ url('/table/save/'.$table_id.'/update') }}'" class="btn btn-success">

resources/views/admin/index.blade.php

@@ -15,34 +15,47 @@
                 <li><a href="#">信息统计</a></li>
             </ol>
         </section>
-        <div class="row">
-            <div class="col-md-3"></div>
-            <form action="{{ url('/search_where') }}">
-                <div class="col-md-6 input-group">
-                    <input name="name" class="form-control" placeholder="请输入搜索姓名，不输入则显示全部">
-                    <select class="form-control" name="project_name">
-                        <option value="">选择项目，未选则显示全部</option>
-                    @foreach($project as $pro)
-                        <option value="{{ $pro->project_name }}">{{ $pro->project_name }}</option>
-                        @endforeach
-                    </select>
-                    <input name="start_time" class="form-control" placeholder="开始日期，不输入则显示全部  输入格式：20160802">
-                    <input name="end_time" class="form-control" placeholder="结束日期，不输入则显示全部  输入格式：20160802">
-                    <div style="text-align: center">
-                        <button type="submit" class="btn btn-primary">搜索</button>
-                    </div>
-                        {{--<span class="input-group-btn">--}}
-                            {{--<button type="submit"  id="search-btn" class="btn btn-flat">--}}
-                                {{--<i class="fa fa-search"></i>--}}
-                            {{--</button>--}}
-                        {{--</span>--}}
-                </div>
-                <div class="col-md-3"></div>
-            </form>
-            <div class="col-md-2"></div>
-        </div>
+
+
+
+
         <!-- Main content -->
         <section class="content">
+
+
+            <div class='box'>
+                <div class="box-header">
+                    <h3 class="box-title">案件搜索</h3>
+                </div>
+                <div class="box-body">
+                    <div class="row">
+                        <form action="{{ url('/search_where') }}">
+                            <div class="col-sm-3">
+                                <input name="name" class="form-control" placeholder="请输入搜索姓名，不输入则显示全部">
+                            </div>
+                            <div class="col-sm-3">
+                                <select class="form-control" name="project_name">
+                                    <option value="">选择项目，未选则显示全部</option>
+                                    @foreach($project as $pro)
+                                        <option value="{{ $pro->project_name }}">{{ $pro->project_name }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                            <div class="col-sm-3">
+                                <input name="start_time" class="form-control" placeholder="开始日期，不输入则显示全部  输入格式：20160802">
+                            </div>
+                            <div class="col-sm-3" style="margin-bottom: 1%">
+                                <input name="end_time" class="form-control" placeholder="结束日期，不输入则显示全部  输入格式：20160802">
+                            </div>
+                            <div style="text-align: center">
+                                <button type="submit" class="btn btn-primary">搜索</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+
+
             <!-- Default box -->
             <div class="box">
                 <div class="box-header">

resources/views/admin/left-sidebar.blade.php

@@ -27,18 +27,18 @@
                     active
                     @endif
             ">
-                <a href="{{ url('/') }}">
+                <a href="#">
                     <i class="fa fa-home"></i>
                     <span>信息统计</span>
                     <i class="fa fa-angle-left pull-right"></i>
                 </a>
                 <ul class="treeview-menu">
                     <li class="
-                    @if(Request::url()==url('table/statistics/1'))
+                    @if(Request::url()==url('table/statistics/show/1'))
                             active
                             @endif
                     ">
-                        <a href="{{ url('/table/statistics/1') }}"><i class="fa fa-circle-o"></i>安置单(货币化安置)</a>
+                        <a href="{{ url('/table/statistics/show/1') }}"><i class="fa fa-circle-o"></i>安置单(货币化安置)</a>
                     </li>
                     <li class="
                     @if(Request::url()==url('table/statistics/2'))

resources/views/admin/sta/sta_one.blade.php

@@ -1,6 +1,25 @@
 
 @extends('layouts.datatable')
     @section('table')
+
+        <div class='box'>
+            <div class="box-header">
+                <h3 class="box-title">案件搜索</h3>
+            </div>
+            <div class="box-body">
+                <div class="row">
+                    <form action="{{ url('/table/statistics/'.$table_type_id) }}">
+                        <div class="col-sm-12">
+                            <input name="search" class="form-control" placeholder="空搜索即搜索所有">
+                        </div>
+                        <div style="text-align: center">
+                            <button type="submit" class="btn btn-primary">搜索</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+
         <div class="row">
             <div class="col-md-12">
                 <div class="box box-primary">
@@ -18,7 +37,7 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                @foreach($table as $num=>$data)
+                                @foreach($table as $data)
                                     <tr>
                                         <td>{{ $data->bzc_name }}</td>
                                         <td>{{ $data->area }}</td>

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

@@ -63,7 +63,7 @@
                                 <input hidden name="thumb" class="form-control">
                                 <input id="file_upload" name="file_upload" type="file" multiple="true">
                                 <script src="{{ asset('uploadify/jquery.uploadify.min.js') }}" type="text/javascript"></script>
-                                <link rel="stylesheet" type="text/css" href="{{ asset('uploadify/uploadify.css') }}">
+                                {{--<link rel="stylesheet" type="text/css" href="{{ asset('uploadify/uploadify.css') }}">--}}
                                 <script type="text/javascript">
                                     <?php $timestamp = time();?>
                                     $(function() {

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

@@ -70,6 +70,33 @@
                             <td>姓名</td>
                             <td><input name="surname" class="form-control" value="{{ $data->surname }}"></td>
                         </tr>
+                        <tr>
+                            <td>头像</td>
+                            <td>
+                                <input hidden name="thumb" class="form-control">
+                                <input id="file_upload" name="file_upload" type="file" multiple="true">
+                                <script src="{{ asset('uploadify/jquery.uploadify.min.js') }}" type="text/javascript"></script>
+                                {{--<link rel="stylesheet" type="text/css" href="{{ asset('uploadify/uploadify.css') }}">--}}
+                                <script type="text/javascript">
+                                    <?php $timestamp = time();?>
+                                    $(function() {
+                                        $('#file_upload').uploadify({
+                                            'buttonText' : '头像上传',
+                                            'formData'     : {
+                                                'timestamp' : '<?php echo $timestamp;?>',
+                                                '_token'     : '{{ csrf_token() }}'
+                                            },
+                                            'swf'      : "{{asset('uploadify/uploadify.swf')}}",
+                                            'uploader' : "{{url('/upload')}}",
+                                            'onUploadSuccess' : function(file,data,response){
+                                                $('input[name=thumb]').val(data);
+//                                                $('#art_thumb_img').attr('src','/'+data);
+                                            }
+                                        });
+                                    });
+                                </script>
+                            </td>
+                        </tr>
                         <tr>
                             <td>证件名称</td>
                             <td><input name="cardname" class="form-control" value="{{ $data->cardname }}"></td>