Merge branch 'master' of http://47.118.43.255:3000/jjhc/jucai

app/Admin/Controllers/Content/BuyHouseCheckLogController.php

@@ -0,0 +1,164 @@
+<?php
+
+namespace App\Admin\Controllers\Content;
+
+use App\Http\Controllers\Controller;
+use App\Models\TalentHouseCheckLog;
+use Encore\Admin\Controllers\HasResourceActions;
+use Encore\Admin\Grid;
+use Encore\Admin\Layout\Content;
+use Illuminate\Http\Request;
+
+class BuyHouseCheckLogController extends Controller
+{
+    use HasResourceActions;
+
+    private $marry = ['未知', '未婚', '已婚', '离异', '丧偶'];
+    private $status = ['未知', '待审核', '审核通过', '审核不通过'];
+
+    /**
+     * Index interface.
+     *
+     * @param Content $content
+     * @return Content
+     */
+    public function index(Content $content)
+    {
+        return $content
+            ->header('审核日志')
+            ->description(' ')
+            ->body(view('admin.content.buy_house_check_log')->with(['grid' => $this->grid()]));
+    }
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new TalentHouseCheckLog());
+
+        $grid->model()->orderBy('created_at', 'DESC');
+
+        $grid->id('ID');
+        $grid->house_name('房源');
+        $grid->user_name('用户');
+        $grid->check_name('审核人');
+        $status_text = $this->status;
+        $grid->check_status('审核结果')->display(function () use ($status_text) {
+            return $status_text[$this->check_status];
+        });
+        $grid->check_comment('审核备注');
+        $grid->created_at('审核时间');
+
+        $grid->actions(function ($actions) {
+            $actions->append("&nbsp;<button class='btn btn-primary btn-xs detail' data-id='{$actions->row['id']}'>数据</button>");
+        });
+
+        $grid->filter(function ($filter) {
+            $filter->disableIdFilter();
+            $filter->like('house_name', '房源');
+            $filter->like('user_name', '用户');
+        });
+        return $grid;
+    }
+
+    /**
+     * 详情
+     */
+    public function detail(Request $request)
+    {
+        $id   = $request->id;
+        $log                = TalentHouseCheckLog::find($id);
+        $info               = json_decode($log->data, true);
+        $info['family']     = json_decode($info['family']);
+        $info['marry_text'] = $this->marry[$info['marry']];
+
+        //layer相册层
+        $photos = [
+            'certificates'       => [],
+            'marry_prove'        => [],
+            'household_register' => [],
+            'work_prove'         => [],
+        ];
+        if (!empty(json_decode($info['certificates']))) {
+            $info['certificates'] = json_decode($info['certificates']);
+            $photo_data           = [];
+            foreach ($info['certificates'] as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['certificates'] = [
+                'title' => '证件信息',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info['certificates'] = [];
+        }
+        if (!empty(json_decode($info['marry_prove']))) {
+            $info['marry_prove'] = json_decode($info['marry_prove']);
+            $photo_data          = [];
+            foreach ($info['marry_prove'] as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['marry_prove'] = [
+                'title' => '婚姻证明',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info['marry_prove'] = [];
+        }
+        if (!empty(json_decode($info['household_register']))) {
+            $info['household_register'] = json_decode($info['household_register']);
+            $photo_data                 = [];
+            foreach ($info['household_register'] as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['household_register'] = [
+                'title' => '户口本',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info['household_register'] = [];
+        }
+        if (!empty(json_decode($info['work_prove']))) {
+            $info['work_prove'] = json_decode($info['work_prove']);
+            $photo_data         = [];
+            foreach ($info['work_prove'] as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['work_prove'] = [
+                'title' => '在职证明',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info['work_prove'] = [];
+        }
+        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos])->render();
+        return response()->json(['code' => 1, 'data' => $html]);
+    }
+}

app/Admin/Controllers/Content/BuyHouseLogController.php

@@ -0,0 +1,162 @@
+<?php
+
+namespace App\Admin\Controllers\Content;
+
+use App\Http\Controllers\Controller;
+use App\Models\TalentHouseLog;
+use App\Models\TalentHousePeople;
+use Encore\Admin\Controllers\HasResourceActions;
+use Encore\Admin\Grid;
+use Encore\Admin\Layout\Content;
+use Illuminate\Http\Request;
+
+class BuyHouseLogController extends Controller
+{
+    use HasResourceActions;
+
+    private $marry = ['未知', '未婚', '已婚', '离异', '丧偶'];
+
+    /**
+     * Index interface.
+     *
+     * @param Content $content
+     * @return Content
+     */
+    public function index(Content $content)
+    {
+        return $content
+            ->header('申报日志')
+            ->description(' ')
+            ->body(view('admin.content.buy_house_log')->with(['grid' => $this->grid()]));
+    }
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new TalentHouseLog());
+
+        $grid->model()->orderBy('created_at', 'DESC');
+
+        $grid->id('ID');
+        $grid->house_name('房源');
+        $grid->user_name('用户');
+        $grid->created_at('修改时间');
+
+        $grid->actions(function ($actions) {
+            if (!empty($actions->row['old'])) {
+                $actions->append("&nbsp;<button class='btn btn-primary btn-xs detail' data-id='{$actions->row['id']}' data-type='old'>修改前数据</button>");
+            }
+            $actions->append("&nbsp;<button class='btn btn-primary btn-xs detail' data-id='{$actions->row['id']}' data-type='new'>修改后数据</button>");
+        });
+
+        $grid->filter(function ($filter) {
+            $filter->disableIdFilter();
+            $filter->like('house_name', '房源');
+            $filter->like('user_name', '用户');
+        });
+        return $grid;
+    }
+
+    /**
+     * 详情
+     */
+    public function detail(Request $request)
+    {
+        $id   = $request->id;
+        $type = $request->type;
+        $log                = TalentHouseLog::find($id);
+        $info               = json_decode($log->$type, true);
+        $info['family']     = json_decode($info['family']);
+        $info['marry_text'] = $this->marry[$info['marry']];
+
+        //layer相册层
+        $photos = [
+            'certificates'       => [],
+            'marry_prove'        => [],
+            'household_register' => [],
+            'work_prove'         => [],
+        ];
+        if (!empty(json_decode($info['certificates']))) {
+            $info['certificates'] = json_decode($info['certificates']);
+            $photo_data           = [];
+            foreach ($info['certificates'] as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['certificates'] = [
+                'title' => '证件信息',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info['certificates'] = [];
+        }
+        if (!empty(json_decode($info['marry_prove']))) {
+            $info['marry_prove'] = json_decode($info['marry_prove']);
+            $photo_data          = [];
+            foreach ($info['marry_prove'] as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['marry_prove'] = [
+                'title' => '婚姻证明',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info['marry_prove'] = [];
+        }
+        if (!empty(json_decode($info['household_register']))) {
+            $info['household_register'] = json_decode($info['household_register']);
+            $photo_data                 = [];
+            foreach ($info['household_register'] as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['household_register'] = [
+                'title' => '户口本',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info['household_register'] = [];
+        }
+        if (!empty(json_decode($info['work_prove']))) {
+            $info['work_prove'] = json_decode($info['work_prove']);
+            $photo_data         = [];
+            foreach ($info['work_prove'] as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['work_prove'] = [
+                'title' => '在职证明',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info['work_prove'] = [];
+        }
+        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos])->render();
+        return response()->json(['code' => 1, 'data' => $html]);
+    }
+}

app/Admin/Controllers/Content/BuyHouseRsController.php

@@ -6,9 +6,11 @@ use App\Http\Controllers\Controller;
 use App\Models\TalentHouse;
 use App\Models\TalentHouseApply;
 use Encore\Admin\Controllers\HasResourceActions;
+use Encore\Admin\Facades\Admin;
 use Encore\Admin\Grid;
 use Encore\Admin\Layout\Content;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class BuyHouseRsController extends Controller
 {
@@ -40,7 +42,7 @@ class BuyHouseRsController extends Controller
     {
         $grid = new Grid(new TalentHouseApply());
 
-        $grid->model()->with('house')->where('type',1)->where('is_back',2)->where('is_draft',2)->orderBy('rs_check_status', 'ASC');
+        $grid->model()->with('house')->where('type', 1)->where('is_back', 2)->where('is_draft', 2)->orderBy('rs_check_status', 'ASC');
 
         $status_text = $this->status;
         $grid->id('ID');
@@ -95,6 +97,22 @@ class BuyHouseRsController extends Controller
                 'rs_check_time'    => date('Y-m-d H:i:s'),
                 'status'           => $status == 2 ? 1 : 3,
             ]);
+
+        //日志
+        $apply = TalentHouseApply::find($id);
+        $house = TalentHouse::find($apply['house_id']);
+        $admin = Admin::user();
+        $log   = [
+            'house_name'    => $house['name'],
+            'user_name'     => $apply['name'],
+            'check_name'    => $admin['name'],
+            'data'          => json_encode($apply),
+            'created_at'    => date('Y-m-d H:i:s'),
+            'check_status'  => $apply['rs_check_status'],
+            'check_comment' => $apply['rs_check_comment'],
+        ];
+        DB::table('talent_house_check_log')->insert($log);
+
         if ($result) {
             admin_toastr('审核成功', 'success');
         } else {

app/Admin/routes.php

@@ -335,6 +335,10 @@ Route::group([
         $router->resource('buy_house_news', BuyHouseNewsController::class)->names('content.buy_house_news');
         $router->any('buy_house_blacklist', 'BuyHouseBlacklistController@index')->name('content.buy_house_blacklist');
         $router->any('buy_house_blacklist/status', 'BuyHouseBlacklistController@status')->name('content.buy_house_blacklist.status');
+        $router->get('buy_house_log', 'BuyHouseLogController@index')->name('content.buy_house_log');
+        $router->get('buy_house_log/detail', 'BuyHouseLogController@detail')->name('content.buy_house_log.detail');
+        $router->get('buy_house_check_log', 'BuyHouseCheckLogController@index')->name('content.buy_house_log');
+        $router->get('buy_house_check_log/detail', 'BuyHouseCheckLogController@detail')->name('content.buy_house_check_log.detail');
     });
 
     //系统管理

app/Http/Controllers/Web/Content/BuyhouseController.php

@@ -283,7 +283,7 @@ class BuyhouseController extends WebBaseController
                 'talent_card_validity' => $talent['activeDate'],
                 'talent_tags'          => $talent['talentType'],
                 'talent_condition'     => $talent['identifyCondition'],
-                'family'               => json_encode([['relation' => '', 'realname' => '', 'idcard' => '']]),
+                'family'               => json_encode([['relation' => '配偶', 'realname' => '', 'idcard' => '']]),
                 'certificates'         => '[]',
                 'marry_prove'          => '[]',
                 'household_register'   => '[]',
@@ -359,12 +359,13 @@ class BuyhouseController extends WebBaseController
     public function listPost(Request $request)
     {
         //数据校验
-        $data      = $request->only(['id', 'certificates', 'marry', 'marry_prove', 'household_register', 'family', 'work_prove', 'street', 'house_condition', 'house_policy']);
+        $data      = $request->only(['id', 'certificates', 'marry', 'child_num', 'marry_prove', 'household_register', 'family', 'work_prove', 'company', 'street', 'house_condition', 'house_policy']);
         $rules     = [
             'certificates'       => 'required',
             'marry'              => 'required',
             'household_register' => 'required',
             'work_prove'         => 'required',
+            'company'            => 'required',
             'street'             => 'required',
             'house_condition'    => 'required',
             'house_policy'       => 'required',
@@ -373,7 +374,8 @@ class BuyhouseController extends WebBaseController
             'certificates.required'       => '请上传证件信息',
             'marry.required'              => '请选择婚姻状况',
             'household_register.required' => '请上传户口本',
-            'work_prove.required'         => '请上传人才工作单位',
+            'work_prove.required'         => '请上传工作证明',
+            'company.required'            => '请填写工作单位',
             'street.required'             => '请填写所属街道',
             'house_condition.required'    => '请填写家庭成员在晋江市行政区域内住房情况',
             'house_policy.required'       => '请填写在晋享受政策性住房或相关优惠情况',
@@ -406,6 +408,14 @@ class BuyhouseController extends WebBaseController
             return response()->json(['status' => 0, 'msg' => '已超过补件时间，无法修改']);
         }
 
+        //日志
+        $log = [
+            'house_name' => $house['name'],
+            'user_name'  => $info['name'],
+            'old'        => $info['is_draft'] == 1 ? '' : json_encode($info),
+            'created_at' => date('Y-m-d H:i:s'),
+        ];
+
         //图片
         $images = ['certificates', 'household_register', 'marry_prove', 'work_prove'];
         foreach ($images as $image) {
@@ -430,6 +440,8 @@ class BuyhouseController extends WebBaseController
         $info->family             = json_encode($data['family']);
         $info->work_prove         = json_encode($data['work_prove']);
         $info->street             = $data['street'];
+        $info->child_num          = $data['child_num'];
+        $info->company            = $data['company'];
         $info->house_condition    = $data['house_condition'];
         $info->house_policy       = $data['house_policy'];
         $info->status             = 1;
@@ -449,6 +461,10 @@ class BuyhouseController extends WebBaseController
         }
         $info->save();
 
+        //日志
+        $log['new'] = json_encode($info);
+        DB::table('talent_house_log')->insert($log);
+
         return response()->json(['status' => 1]);
     }
 

app/Models/TalentHouseCheckLog.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TalentHouseCheckLog extends Model
+{
+    protected $table = 'talent_house_check_log';
+    public $timestamps = FALSE;
+}

app/Models/TalentHouseLog.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TalentHouseLog extends Model
+{
+    protected $table = 'talent_house_log';
+    public $timestamps = FALSE;
+}

public/themes/default/views/app/content/buyhouse/detail.blade.php

@@ -31,6 +31,9 @@
             background-color: #409eff;
             border-color: #409eff;
         }
+        .newsshow .l .main .time {
+            height:auto;
+        }
     </style>
 @endpush
 
@@ -48,7 +51,7 @@
                     <div class="ntitle">{{$info->name}}</div>
                     <div class="time">
                         <span>报名时间：{{$info->apply_time_start}} 至 {{$info->apply_time_end}}</span>
-                        <span>补建截止时间：{{$info->supply_time}}</span>
+                        <span>补件截止时间：{{$info->supply_time}}</span>
                     </div>
                     <div class="time">
                         <el-tag :type="info.status_tag" effect="dark" size="mini">

public/themes/default/views/app/content/buyhouse/list.blade.php

@@ -181,7 +181,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="describe"
-                        label="项目介绍">
+                        label="项目简介">
                 </el-table-column>
                 <el-table-column
                         label="操作"
@@ -323,7 +323,7 @@
                 {{--家庭资料--}}
                 <table cellspacing="0">
                     <tr style="height:60px;page-break-inside:avoid">
-                        <td colspan="12">
+                        <td colspan="6">
                             <h1>家庭资料</h1>
                         </td>
                     </tr>
@@ -331,7 +331,7 @@
                         <td valign="center">
                             <span class="require">*</span>婚姻状况
                         </td>
-                        <td valign="center" colspan="5">
+                        <td valign="center" colspan="2">
                             <el-form-item prop="marry">
                                 <el-radio :label="1" v-model="user.marry">未婚</el-radio>
                                 <el-radio :label="2" v-model="user.marry">已婚</el-radio>
@@ -339,13 +339,21 @@
                                 <el-radio :label="4" v-model="user.marry">丧偶</el-radio>
                             </el-form-item>
                         </td>
+                        <td valign="center">
+                            <span class="require">*</span>未成年子女数
+                        </td>
+                        <td valign="center" colspan="2" style="padding:7px;">
+                            <el-form-item prop="child_num">
+                                <el-input v-model="user.child_num" type="number" placeholder="请输入未成年子女数"></el-input>
+                            </el-form-item>
+                        </td>
                     </tr>
                     <tr style="height:52px;page-break-inside:avoid" v-show="user.marry > 1">
                         <td valign="center">
                             <span class="require">*</span>婚姻证明<br/>
                             （结婚证，离婚证，离婚生效文书、丧偶证明等）
                         </td>
-                        <td valign="center" colspan="3">
+                        <td valign="center" colspan="5">
                             <el-form-item prop="marry_prove">
                                 <div style="padding: 10px 0">
                                     <el-upload
@@ -369,7 +377,7 @@
                             <span class="require">*</span>户口本<br/>
                             （上传家庭户口本）
                         </td>
-                        <td valign="center" colspan="3">
+                        <td valign="center" colspan="5">
                             <el-form-item prop="household_register">
                                 <div style="padding: 10px 0">
                                     <el-upload
@@ -407,7 +415,7 @@
                                 <span style=";font-family:宋体;font-size:14px">姓名</span>
                             </p>
                         </td>
-                        <td width="87" valign="center" style="width:600px;">
+                        <td width="87" valign="center" colspan="3" style="width:600px;">
                             <p style=";text-align:center">
                                 <span style=";font-family:宋体;font-size:14px">证件信息</span>
                             </p>
@@ -415,10 +423,14 @@
                     </tr>
                     <tr style="height:52px;page-break-inside:avoid" v-for="(item,index) in user.family">
                         <td valign="center">
-                            <el-form-item :prop="'family.'+index+'.relation'"
-                                          :rules="{required: true, message: '称谓不能为空', trigger: 'blur'}">
-                                <el-input v-model="item.relation" placeholder="称谓"></el-input>
-                            </el-form-item>
+                            <el-select v-model="item.relation" placeholder="请选择">
+                                <el-option
+                                        v-for="option in relation"
+                                        :key="option.value"
+                                        :label="option.label"
+                                        :value="option.value">
+                                </el-option>
+                            </el-select>
                         </td>
                         <td valign="center">
                             <el-form-item :prop="'family.'+index+'.realname'"
@@ -426,7 +438,7 @@
                                 <el-input v-model="item.realname" placeholder="真实姓名"></el-input>
                             </el-form-item>
                         </td>
-                        <td valign="center">
+                        <td valign="center" colspan="3">
                             <el-form-item :prop="'family.'+index+'.idcard'"
                                           :rules="{required: true, message: '证件信息不能为空', trigger: 'blur'}">
                                 <el-input v-model="item.idcard" placeholder="证件信息"></el-input>
@@ -443,8 +455,8 @@
                     </tr>
                     <tr style="height:52px;page-break-inside:avoid">
                         <td valign="center" style="width:200px;">
-                            <span class="require">*</span>人才工作单位<br/>
-                            （上传在职证明扫描件，格式PNG或JPEG）<br/>
+                            <span class="require">*</span>在职证明<br/>
+                            （上传在职证明扫描件，格式PNG或JPG）<br/>
                             <a href="{{ theme_asset('app/doc/任职证明（模板）.doc') }}" target="_blank" style="color:blue;">点击下载范本</a>
                         </td>
                         <td valign="center" style="width:1000px;">
@@ -466,6 +478,16 @@
                             </el-form-item>
                         </td>
                     </tr>
+                    <tr style="height:52px;page-break-inside:avoid">
+                        <td valign="center">
+                            <span class="require">*</span>工作单位
+                        </td>
+                        <td valign="center">
+                            <el-form-item prop="company">
+                                <el-input v-model="user.company" placeholder="请输入工作单位"></el-input>
+                            </el-form-item>
+                        </td>
+                    </tr>
                     <tr style="height:52px;page-break-inside:avoid">
                         <td valign="center">
                             <span class="require">*</span>所属街道
@@ -548,6 +570,14 @@
                     dialogImageUrl: '',
                     user: {!! $apply !!},
                     post_data: {},
+                    relation: [
+                        {value: '配偶', label: '配偶'},
+                        {value: '未成年子女1', label: '未成年子女1'},
+                        {value: '未成年子女2', label: '未成年子女2'},
+                        {value: '未成年子女3', label: '未成年子女3'},
+                        {value: '未成年子女4', label: '未成年子女4'},
+                        {value: '未成年子女5', label: '未成年子女5'},
+                    ],
                     rules: {
                         certificates: [
                             {validator: this.validCertificates, trigger: 'change'}
@@ -567,6 +597,9 @@
                         work_prove: [
                             {validator: this.validWork, trigger: 'change'}
                         ],
+                        company: [
+                            {required: true, message: '请填写所工作单位', trigger: 'blur'}
+                        ],
                         street: [
                             {required: true, message: '请填写所属街道', trigger: 'blur'}
                         ],
@@ -712,7 +745,7 @@
                 },
                 validWork(rule, value, callback){
                     if(this.user.work_prove.length == 0){
-                        callback(new Error('请上传人才工作单位'));
+                        callback(new Error('请上传在职证明'));
                     }else{
                         callback();
                     }
@@ -729,7 +762,7 @@
                 //家庭成员
                 addFamily() {
                     this.user.family.push({
-                        relation: '',
+                        relation: '配偶',
                         realname: '',
                         idcard: '',
                     });

resources/views/admin/ajax/buy_house_detail.blade.php

@@ -22,40 +22,40 @@
     <tr style="height:52px;page-break-inside:avoid">
         <td valign="center" style="width:100px;">姓名</td>
         <td valign="center" colspan="3" style="width:300px;">
-            {{$info->name}}
+            {{$info['name']}}
         </td>
         <td valign="center" style="width:100px;">联系电话</td>
         <td valign="center" colspan="3" style="width:300px;">
-            {{$info->mobile}}
+            {{$info['mobile']}}
         </td>
         <td valign="center" style="width:100px;">籍贯</td>
         <td valign="center" colspan="3" style="width:300px;">
-            {{$info->native}}
+            {{$info['native']}}
         </td>
     </tr>
     <tr style="height:52px;page-break-inside:avoid">
         <td valign="center">电子邮箱</td>
         <td valign="center" colspan="3">
-            {{$info->email}}
+            {{$info['email']}}
         </td>
         <td valign="center">人才层次</td>
         <td valign="center" colspan="3">
-            {{$info->talent_level}}
+            {{$info['talent_level']}}
         </td>
         <td valign="center">人才证有效期</td>
         <td valign="center" colspan="3">
-            {{$info->talent_card_validity}}
+            {{$info['talent_card_validity']}}
         </td>
     </tr>
     <tr style="height:52px;page-break-inside:avoid">
         <td valign="center">人才标签</td>
         <td valign="center" colspan="3">
-            {{$info->talent_tags}}
+            {{$info['talent_tags']}}
         </td>
 
         <td valign="center">人才认定条件</td>
         <td valign="center" colspan="6">
-            {{$info->talent_condition}}
+            {{$info['talent_condition']}}
         </td>
     </tr>
     <tr style="height:52px;page-break-inside:avoid">
@@ -64,7 +64,7 @@
         </td>
         <td valign="center" colspan="11">
             <div style="padding: 10px 0">
-                @foreach($info->certificates as $k => $v)
+                @foreach($info['certificates'] as $k => $v)
                     <img class="attchment" data-key="{{$k}}" data-name="certificates" src="{{ $v->response->path }}" />
                 @endforeach
             </div>
@@ -79,18 +79,22 @@
     </tr>
     <tr>
         <td valign="center">婚姻状况</td>
-        <td valign="center" colspan="5">
-            {{$info->marry_text}}
+        <td valign="center" colspan="2">
+            {{$info['marry_text']}}
+        </td>
+        <td valign="center">未成年子女数</td>
+        <td valign="center" colspan="2" style="width:200px;">
+            {{$info['child_num']}}
         </td>
     </tr>
-    @if($info->marry > 1)
+    @if($info['marry'] > 1)
         <tr style="height:52px;page-break-inside:avoid">
             <td valign="center">
                 婚姻证明<br/>
                 （结婚证，离婚证，离婚生效文书、丧偶证明等）
             </td>
-            <td valign="center" colspan="3">
-                @foreach($info->marry_prove as $k => $v)
+            <td valign="center" colspan="5">
+                @foreach($info['marry_prove'] as $k => $v)
                     <img class="attchment" data-key="{{$k}}" data-name="marry_prove" src="{{ $v->response->path }}" />
                 @endforeach
             </td>
@@ -100,14 +104,14 @@
         <td valign="center">
             户口本
         </td>
-        <td valign="center" colspan="3">
-            @foreach($info->household_register as $k => $v)
+        <td valign="center" colspan="5" style="padding:10px;">
+            @foreach($info['household_register'] as $k => $v)
                 <img class="attchment" data-key="{{$k}}" data-name="household_register" src="{{ $v->response->path }}" />
             @endforeach
         </td>
     </tr>
     <tr style="height:47px;page-break-inside:avoid">
-        <td valign="center" rowspan="{{ count($info->family)+1 }}">
+        <td valign="center" rowspan="{{ count($info['family'])+1 }}">
             家庭成员及其主要社会关系
         </td>
         <td valign="center" style="width:200px;">
@@ -120,13 +124,13 @@
                 <span style=";font-family:宋体;font-size:14px">姓名</span>
             </p>
         </td>
-        <td width="87" valign="center" style="width:600px;">
+        <td width="87" valign="center" colspan="3" style="width:600px;">
             <p style=";text-align:center">
                 <span style=";font-family:宋体;font-size:14px">证件信息</span>
             </p>
         </td>
     </tr>
-    @foreach($info->family as $k => $v)
+    @foreach($info['family'] as $k => $v)
         <tr style="height:52px;page-break-inside:avoid" >
             <td valign="center">
                 {{$v->relation}}
@@ -134,7 +138,7 @@
             <td valign="center">
                 {{$v->realname}}
             </td>
-            <td valign="center">
+            <td valign="center" colspan="3">
                 {{$v->idcard}}
             </td>
         </tr>
@@ -148,18 +152,24 @@
     </tr>
     <tr style="height:52px;page-break-inside:avoid">
         <td valign="center" style="width:200px;">
-            人才工作单位
+            工作证明
         </td>
-        <td valign="center" style="width:1000px;">
-            @foreach($info->work_prove as $k => $v)
+        <td valign="center" style="width:1000px;padding:10px;">
+            @foreach($info['work_prove'] as $k => $v)
                 <img class="attchment" data-key="{{$k}}" data-name="work_prove" src="{{ $v->response->path }}" />
             @endforeach
         </td>
     </tr>
+    <tr style="height:52px;page-break-inside:avoid">
+        <td valign="center">工作单位</td>
+        <td valign="center">
+            {{$info['company']}}
+        </td>
+    </tr>
     <tr style="height:52px;page-break-inside:avoid">
         <td valign="center">所属街道</td>
         <td valign="center">
-            {{$info->street}}
+            {{$info['street']}}
         </td>
     </tr>
 </table>
@@ -174,13 +184,13 @@
             <span class="require">*</span>家庭成员在晋江市行政区域内住房情况
         </td>
         <td valign="center">
-            {{$info->house_condition}}
+            {{$info['house_condition']}}
         </td>
         <td valign="center">
             <span class="require">*</span>在晋享受政策性住房或相关优惠情况
         </td>
         <td valign="center">
-            {{$info->house_policy}}
+            {{$info['house_policy']}}
         </td>
     </tr>
 </table>
@@ -191,7 +201,6 @@
         let key = $(this).data('key');
         let name = $(this).data('name');
         let photo = photos[name];
-        console.log(photo);
         photo.start = key;
         layer.photos({
             photos: photo,

resources/views/admin/content/buy_house_check_log.blade.php

@@ -0,0 +1,74 @@
+{!! $grid->render() !!}
+<style>
+    p#vtip { display: none; position: absolute; padding: 10px; left: 5px; font-size: 0.8em; background-color: white; border: 1px solid #a6c9e2; -moz-border-radius: 5px; -webkit-border-radius: 5px; z-index: 9999 }
+    p#vtip #vtipArrow { position: absolute; top: -10px; left: 5px }
+</style>
+<div class="modal fade" id="dialog" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
+    <div class="modal-dialog" role="document" style="width:1200px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel1">详情</h4>
+            </div>
+            <div class="modal-body">
+
+                <div class="contentfade" style="height: 700px;overflow: auto;">
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    this.vtip = function() {
+        this.xOffset = -10; // x distance from mouse
+        this.yOffset = 15; // y distance from mouse
+        $(".vtip").unbind().hover(
+            function(e) {
+                this.t = $(this).attr("title");
+                this.title = '';
+                this.top = (e.pageY + yOffset);
+                this.left = (e.pageX + xOffset);
+                $('body').css("cursor","help");
+                $('p#vtip').width()>450?$('p#vtip').width(450):'';
+                $('body').append( '<p id="vtip">' + this.t + '</p>' );
+                $('p#vtip').css("top", this.top+"px").css("left", this.left+"px").fadeIn(0);
+            },
+            function() {
+                this.title = this.t;
+                $('body').css("cursor","");
+                $("p#vtip").fadeOut("slow").remove();
+            }
+        ).mousemove(
+            function(e) {
+                this.top = (e.pageY + yOffset);
+                this.left = (e.pageX + xOffset);
+                $("p#vtip").css("top", this.top+"px").css("left", this.left+"px");
+            }
+        );
+
+    };
+    $(document).ready(function() {
+        vtip();
+    });
+    $(".close").off().on('click', function () {
+        $(this).closest(".modal").removeClass('in');
+        $(this).closest(".modal").hide();
+    });
+    $('.detail').on('click', function () {
+        $("#myModalLabel1").html('详情');
+        var id = $(this).data('id');
+        $('#dialog').addClass('in');
+        $('#dialog').css('display', 'block');
+        $('.contentfade').html('');
+        $.ajax({
+            url: "{{admin_base_path('/content/buy_house_check_log/detail')}}",
+            data:{'id':id,'_token':'{{csrf_token()}}'},
+            // dataType:'json',
+            success:function (res) {
+                $('.contentfade').html(res.data);
+            },
+        })
+    });
+</script>

resources/views/admin/content/buy_house_log.blade.php

@@ -0,0 +1,75 @@
+{!! $grid->render() !!}
+<style>
+    p#vtip { display: none; position: absolute; padding: 10px; left: 5px; font-size: 0.8em; background-color: white; border: 1px solid #a6c9e2; -moz-border-radius: 5px; -webkit-border-radius: 5px; z-index: 9999 }
+    p#vtip #vtipArrow { position: absolute; top: -10px; left: 5px }
+</style>
+<div class="modal fade" id="dialog" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
+    <div class="modal-dialog" role="document" style="width:1200px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel1">详情</h4>
+            </div>
+            <div class="modal-body">
+
+                <div class="contentfade" style="height: 700px;overflow: auto;">
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    this.vtip = function() {
+        this.xOffset = -10; // x distance from mouse
+        this.yOffset = 15; // y distance from mouse
+        $(".vtip").unbind().hover(
+            function(e) {
+                this.t = $(this).attr("title");
+                this.title = '';
+                this.top = (e.pageY + yOffset);
+                this.left = (e.pageX + xOffset);
+                $('body').css("cursor","help");
+                $('p#vtip').width()>450?$('p#vtip').width(450):'';
+                $('body').append( '<p id="vtip">' + this.t + '</p>' );
+                $('p#vtip').css("top", this.top+"px").css("left", this.left+"px").fadeIn(0);
+            },
+            function() {
+                this.title = this.t;
+                $('body').css("cursor","");
+                $("p#vtip").fadeOut("slow").remove();
+            }
+        ).mousemove(
+            function(e) {
+                this.top = (e.pageY + yOffset);
+                this.left = (e.pageX + xOffset);
+                $("p#vtip").css("top", this.top+"px").css("left", this.left+"px");
+            }
+        );
+
+    };
+    $(document).ready(function() {
+        vtip();
+    });
+    $(".close").off().on('click', function () {
+        $(this).closest(".modal").removeClass('in');
+        $(this).closest(".modal").hide();
+    });
+    $('.detail').on('click', function () {
+        $("#myModalLabel1").html('详情');
+        var id = $(this).data('id');
+        var type = $(this).data('type');
+        $('#dialog').addClass('in');
+        $('#dialog').css('display', 'block');
+        $('.contentfade').html('');
+        $.ajax({
+            url: "{{admin_base_path('/content/buy_house_log/detail')}}",
+            data:{'id':id,type:type,'_token':'{{csrf_token()}}'},
+            // dataType:'json',
+            success:function (res) {
+                $('.contentfade').html(res.data);
+            },
+        })
+    });
+</script>