人才刚需购房，按人社要求更改功能

app/Admin/Controllers/Content/BuyHouseCheckLogController.php

@@ -49,7 +49,7 @@ class BuyHouseCheckLogController extends Controller
         $grid->check_status('审核结果')->display(function () use ($status_text) {
             return $status_text[$this->check_status];
         });
-        $grid->check_comment('审核备注');
+        $grid->check_comment('审核备注')->style('max-width:400px');
         $grid->created_at('审核时间');
 
         $grid->actions(function ($actions) {

app/Admin/Controllers/Content/BuyHouseJcController.php

@@ -44,7 +44,7 @@ class BuyHouseJcController extends Controller
     {
         $grid = new Grid(new TalentHouseApply());
 
-        $grid->model()->with(['house','idcard'])->where('type', 2)->where('is_back', 2)->where('is_draft', 2)->orderBy('rs_check_status', 'ASC');
+        $grid->model()->with(['house', 'idcard'])->where('type', 2)->where('is_back', 2)->where('is_draft', 2)->orderBy('rs_check_status', 'ASC');
 
         $status_text = $this->status;
         $grid->id('ID');
@@ -121,7 +121,7 @@ class BuyHouseJcController extends Controller
 
         //审核不通过发送短信
         if ($status == 3) {
-            $time  = strtotime($house['supply_time']);
+            $time = strtotime($house['supply_time']);
             $smsService->sendSms($apply['mobile'], 'sms_buyhouse_supply', ['name' => $apply['name'], 'month' => date('m', $time), 'day' => date('d', $time)]);
         }
 
@@ -227,7 +227,7 @@ class BuyHouseJcController extends Controller
         } else {
             $info->work_prove = [];
         }
-        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos])->render();
+        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos, 'status' => $this->status])->render();
         return response()->json(['code' => 1, 'data' => $html]);
     }
 }

app/Admin/Controllers/Content/BuyHouseRsController.php

@@ -227,7 +227,7 @@ class BuyHouseRsController extends Controller
         } else {
             $info->work_prove = [];
         }
-        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos])->render();
+        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos, 'status' => $this->status])->render();
         return response()->json(['code' => 1, 'data' => $html]);
     }
 }

app/Admin/Controllers/Content/BuyHouseZjController.php

@@ -227,7 +227,7 @@ class BuyHouseZjController extends Controller
         } else {
             $info->work_prove = [];
         }
-        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos])->render();
+        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos, 'status' => $this->status])->render();
         return response()->json(['code' => 1, 'data' => $html]);
     }
 }

app/Admin/Controllers/Content/BuyHouseZrController.php

@@ -227,7 +227,7 @@ class BuyHouseZrController extends Controller
         } else {
             $info->work_prove = [];
         }
-        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos])->render();
+        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos, 'status' => $this->status])->render();
         return response()->json(['code' => 1, 'data' => $html]);
     }
 }

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

@@ -187,7 +187,7 @@ class BuyhouseController extends WebBaseController
         $people = TalentHousePeople::where('user_id', $user_id)->first();
         if (!empty($people) && $people['status'] == 2) {
             $back_url = \Illuminate\Support\Facades\URL::previous();
-            return $this->showMessage('由于您不遵守规则，已被拉黑，具体情况请联系有关部门', $back_url, true, '上一页', '3');
+            return $this->showMessage('无法进入申报系统，请联系相关单位', $back_url, true, '上一页', '3');
         }
 
         $id = $request->get('id');

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

@@ -435,13 +435,13 @@
                         <td valign="center">
                             <el-form-item :prop="'family.'+index+'.realname'"
                                           :rules="{required: true, message: '真实姓名不能为空', trigger: 'blur'}">
-                                <el-input v-model="item.realname" placeholder="真实姓名"></el-input>
+                                <el-input v-model="item.realname" placeholder="没有请填无"></el-input>
                             </el-form-item>
                         </td>
                         <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>
+                                <el-input v-model="item.idcard" placeholder="没有请填无"></el-input>
                             </el-form-item>
                         </td>
                     </tr>

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

@@ -8,8 +8,8 @@
         display: block;
     }
     .attchment{
-        width: 200px;
-        height: 200px;
+        width: 100px;
+        height: 100px;
     }
 </style>
 <script src="{{ theme_asset('statistics/js/layer/layer.js') }}"></script>
@@ -71,9 +71,12 @@
             证件信息
         </td>
         <td valign="center" colspan="11">
-            <div style="padding: 10px 0">
+            <div style="padding: 10px 0;display:flex">
                 @foreach($info['certificates'] as $k => $v)
-                    <img class="attchment" data-key="{{$k}}" data-name="certificates" src="{{ $v->response->path }}" />
+                    <div style="padding:10px;">
+                        <img class="attchment" data-key="{{$k}}" data-name="certificates" src="{{ $v->response->path }}" />
+                        <p>{{$v->response->filename}}</p>
+                    </div>
                 @endforeach
             </div>
         </td>
@@ -202,6 +205,73 @@
         </td>
     </tr>
 </table>
+<table cellspacing="0" width="100%" class="table_form">
+    <tr style="height:60px;page-break-inside:avoid">
+        <td colspan='6'>
+            <h1>审核状况</h1>
+        </td>
+    </tr>
+    <tr style="height:52px;page-break-inside:avoid">
+        <td valign="center">
+            {{$info['type'] == 1 ? '人社局' : '集成电路'}}审核状态
+        </td>
+        <td valign="center">
+            {{$status[$info['rs_check_status']]}}
+        </td>
+        <td valign="center">
+            审核时间
+        </td>
+        <td valign="center">
+            {{$info['rs_check_time']}}
+        </td>
+        <td valign="center">
+            审核备注
+        </td>
+        <td valign="center" style="max-width:400px;">
+            {{$info['rs_check_comment']}}
+        </td>
+    </tr>
+    <tr style="height:52px;page-break-inside:avoid">
+        <td valign="center">
+            住建局审核状态
+        </td>
+        <td valign="center">
+            {{$status[$info['zj_check_status']]}}
+        </td>
+        <td valign="center">
+            审核时间
+        </td>
+        <td valign="center">
+            {{$info['zj_check_time']}}
+        </td>
+        <td valign="center">
+            审核备注
+        </td>
+        <td valign="center" style="max-width:400px;">
+            {{$info['zj_check_comment']}}
+        </td>
+    </tr>
+    <tr style="height:52px;page-break-inside:avoid">
+        <td valign="center">
+            自然资源审核状态
+        </td>
+        <td valign="center">
+            {{$status[$info['zr_check_status']]}}
+        </td>
+        <td valign="center">
+            审核时间
+        </td>
+        <td valign="center">
+            {{$info['zr_check_time']}}
+        </td>
+        <td valign="center">
+            审核备注
+        </td>
+        <td valign="center" style="max-width:400px;">
+            {{$info['zr_check_comment']}}
+        </td>
+    </tr>
+</table>
 
 <script>
     let photos = {!!json_encode($photos)!!};

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

@@ -2,6 +2,7 @@
 <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 }
+    .layui-layer-shade {opacity:0.2 !important;}
 </style>
 <div class="modal fade" id="audit" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
     <div class="modal-dialog" role="document">
@@ -59,7 +60,7 @@
             </div>
             <div class="modal-body">
 
-                <div class="contentfade" style="height: 700px;overflow: auto;">
+                <div class="contentfade" style="height: 600px;overflow: auto;">
 
                 </div>
             </div>

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

@@ -2,6 +2,7 @@
 <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 }
+    .layui-layer-shade {opacity:0.2 !important;}
 </style>
 <div class="modal fade" id="audit" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
     <div class="modal-dialog" role="document">
@@ -59,7 +60,7 @@
             </div>
             <div class="modal-body">
 
-                <div class="contentfade" style="height: 700px;overflow: auto;">
+                <div class="contentfade" style="height: 600px;overflow: auto;">
 
                 </div>
             </div>

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

@@ -2,6 +2,7 @@
 <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 }
+    .layui-layer-shade {opacity:0.2 !important;}
 </style>
 <div class="modal fade" id="audit" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
     <div class="modal-dialog" role="document">
@@ -59,7 +60,7 @@
             </div>
             <div class="modal-body">
 
-                <div class="contentfade" style="height: 700px;overflow: auto;">
+                <div class="contentfade" style="height: 600px;overflow: auto;">
 
                 </div>
             </div>

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

@@ -2,6 +2,7 @@
 <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 }
+    .layui-layer-shade {opacity:0.2 !important;}
 </style>
 <div class="modal fade" id="audit" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
     <div class="modal-dialog" role="document">
@@ -59,7 +60,7 @@
             </div>
             <div class="modal-body">
 
-                <div class="contentfade" style="height: 700px;overflow: auto;">
+                <div class="contentfade" style="height: 600px;overflow: auto;">
 
                 </div>
             </div>