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

app/Admin/Controllers/Content/BuyHouseNewsController.php

@@ -99,7 +99,7 @@ class BuyHouseNewsController extends Controller
                 $style .='font-weight:bold;';
             }
             return '<span style="'.$style.'">'.$this->title.'</span>';
-        })->width(200);
+        })->style('max-width:200px');
         $grid->small_img('缩略图')->display(function () {
             if ($this->small_img) {
                 return '<span class="vtip" title="<img src=\''.upload_asset($this->small_img).'\'  height=120>">

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

@@ -297,6 +297,8 @@ class BuyhouseController extends WebBaseController
                 'talent_card_validity' => $talent['activeDate'],
                 'talent_tags'          => $talent['talentType'],
                 'talent_condition'     => $talent['identifyCondition'],
+                'company'              => $talent['company'],
+                'street'               => $talent['street'],
                 'family'               => json_encode([['relation' => '配偶', 'realname' => '', 'idcard' => '']]),
                 'certificates'         => '[]',
                 'marry_prove'          => '[]',
@@ -379,8 +381,6 @@ class BuyhouseController extends WebBaseController
             'marry'              => 'required',
             'household_register' => 'required',
             'work_prove'         => 'required',
-            'company'            => 'required',
-            'street'             => 'required',
             'house_condition'    => 'required',
             'house_policy'       => 'required',
         ];
@@ -389,8 +389,6 @@ class BuyhouseController extends WebBaseController
             'marry.required'              => '请选择婚姻状况',
             'household_register.required' => '请上传户口本',
             'work_prove.required'         => '请上传工作证明',
-            'company.required'            => '请填写工作单位',
-            'street.required'             => '请填写所属街道',
             'house_condition.required'    => '请填写家庭成员在晋江市行政区域内住房情况',
             'house_policy.required'       => '请填写在晋享受政策性住房或相关优惠情况',
         ];
@@ -413,8 +411,9 @@ class BuyhouseController extends WebBaseController
         }
 
         //房源消息
-        $house = TalentHouse::find($info['house_id']);
-        $time  = time();
+        $house           = TalentHouse::find($info['house_id']);
+        $house['status'] = $this->_get_status($house);
+        $time            = time();
         if ($house['status'] != 2) {
             return response()->json(['status' => 0, 'msg' => '申报未开始或已结束，无法修改']);
         }

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

@@ -297,7 +297,7 @@
                     <tr style="height:52px;page-break-inside:avoid">
                         <td valign="center">
                             <span class="require">*</span>证件信息<br/>
-                            （身份证或护照，本人手持证件正、反面照片）
+                            （优秀人才手持身份证件正、反面照片；配偶身份证正、反面照片）
                         </td>
                         <td valign="center" colspan="11">
                             <el-form-item prop="certificates">
@@ -350,7 +350,7 @@
                     </tr>
                     <tr style="height:52px;page-break-inside:avoid" v-show="user.marry > 1">
                         <td valign="center">
-                            <span class="require">*</span>婚姻证明<br/>
+                            <span class="require">*</span>婚姻关系证明<br/>
                             （结婚证，离婚证，离婚生效文书、丧偶证明等）
                         </td>
                         <td valign="center" colspan="5">
@@ -374,8 +374,8 @@
                     </tr>
                     <tr style="height:52px;page-break-inside:avoid">
                         <td valign="center">
-                            <span class="require">*</span>户口本<br/>
-                            （上传家庭户口本）
+                            <span class="require">*</span>优秀人才家庭成员的户口簿<br/>
+                            （或公安部门出具的户籍证明）
                         </td>
                         <td valign="center" colspan="5">
                             <el-form-item prop="household_register">
@@ -455,7 +455,7 @@
                     </tr>
                     <tr style="height:52px;page-break-inside:avoid">
                         <td valign="center" style="width:200px;">
-                            <span class="require">*</span>在职证明<br/>
+                            <span class="require">*</span>优秀人才在职证明<br/>
                             （上传在职证明扫描件，格式PNG或JPG）<br/>
                             <a href="{{ theme_asset('app/doc/任职证明（模板）.doc') }}" target="_blank" style="color:blue;">点击下载范本</a>
                         </td>
@@ -484,7 +484,7 @@
                         </td>
                         <td valign="center">
                             <el-form-item prop="company">
-                                <el-input v-model="user.company" placeholder="请输入工作单位"></el-input>
+                                <el-input v-model="user.company" :disabled="true" placeholder="请输入工作单位"></el-input>
                             </el-form-item>
                         </td>
                     </tr>
@@ -494,7 +494,7 @@
                         </td>
                         <td valign="center">
                             <el-form-item prop="street">
-                                <el-input v-model="user.street" placeholder="请输入所属街道"></el-input>
+                                <el-input v-model="user.street" :disabled="true" placeholder="请输入所属街道"></el-input>
                             </el-form-item>
                         </td>
                     </tr>
@@ -597,12 +597,6 @@
                         work_prove: [
                             {validator: this.validWork, trigger: 'change'}
                         ],
-                        company: [
-                            {required: true, message: '请填写所工作单位', trigger: 'blur'}
-                        ],
-                        street: [
-                            {required: true, message: '请填写所属街道', trigger: 'blur'}
-                        ],
                         house_condition: [
                             {required: true, message: '请填写家庭成员在晋江市行政区域内住房情况', trigger: 'blur'}
                         ],

public/themes/default/views/app/index.blade.php

@@ -116,7 +116,7 @@
         <div class="wide">
             <div class="logobox">
                 <a href="/">
-                    <img src="{{upload_asset(subsite_config('aix.system.site.site.logo'))}}" border="0"/>
+                    <img src="{{theme_asset('app/images/index_logo.png')}}" border="0"/>
                 </a>
             </div>
             <!-- 导航 -->

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

@@ -68,7 +68,8 @@
     </tr>
     <tr style="height:52px;page-break-inside:avoid">
         <td valign="center" >
-            证件信息
+            证件信息<br/>
+            （优秀人才手持身份证件正、反面照片；配偶身份证正、反面照片）
         </td>
         <td valign="center" colspan="11">
             <div style="padding: 10px 0;display:flex">
@@ -101,30 +102,35 @@
     @if($info['marry'] > 1)
         <tr style="height:52px;page-break-inside:avoid">
             <td valign="center">
-                婚姻证明<br/>
+                婚姻关系证明<br/>
                 （结婚证，离婚证，离婚生效文书、丧偶证明等）
             </td>
             <td valign="center" colspan="5" style="padding:10px;">
-                @foreach($info['marry_prove'] as $k => $v)
-                    <div style="padding:10px;">
-                        <img class="attchment" data-key="{{$k}}" data-name="marry_prove" src="{{ $v->response->path }}" />
-                        <p>{{$v->response->filename}}</p>
-                    </div>
-                @endforeach
+                <div style="padding: 10px 0;display:flex">
+                    @foreach($info['marry_prove'] as $k => $v)
+                        <div style="padding:10px;">
+                            <img class="attchment" data-key="{{$k}}" data-name="marry_prove" src="{{ $v->response->path }}" />
+                            <p>{{$v->response->filename}}</p>
+                        </div>
+                    @endforeach
+                </div>
             </td>
         </tr>
     @endif
     <tr style="height:52px;page-break-inside:avoid">
         <td valign="center">
-            户口本
+            优秀人才家庭成员的户口簿<br/>
+            （或公安部门出具的户籍证明）
         </td>
         <td valign="center" colspan="5" style="padding:10px;">
-            @foreach($info['household_register'] as $k => $v)
-                <div style="padding:10px;">
-                    <img class="attchment" data-key="{{$k}}" data-name="household_register" src="{{ $v->response->path }}" />
-                    <p>{{$v->response->filename}}</p>
-                </div>
-            @endforeach
+            <div style="padding: 10px 0;display:flex">
+                @foreach($info['household_register'] as $k => $v)
+                    <div style="padding:10px;">
+                        <img class="attchment" data-key="{{$k}}" data-name="household_register" src="{{ $v->response->path }}" />
+                        <p>{{$v->response->filename}}</p>
+                    </div>
+                @endforeach
+            </div>
         </td>
     </tr>
     <tr style="height:47px;page-break-inside:avoid">
@@ -181,15 +187,18 @@
     </tr>
     <tr style="height:52px;page-break-inside:avoid">
         <td valign="center" style="width:200px;">
-            工作证明
+            优秀人才在职证明<br/>
+            （上传在职证明扫描件，格式PNG或JPG）
         </td>
         <td valign="center" style="width:1000px;padding:10px;">
-            @foreach($info['work_prove'] as $k => $v)
-                <div style="padding:10px;">
-                    <img class="attchment" data-key="{{$k}}" data-name="work_prove" src="{{ $v->response->path }}" />
-                    <p>{{$v->response->filename}}</p>
-                </div>
-            @endforeach
+            <div style="padding: 10px 0;display:flex">
+                @foreach($info['work_prove'] as $k => $v)
+                    <div style="padding:10px;">
+                        <img class="attchment" data-key="{{$k}}" data-name="work_prove" src="{{ $v->response->path }}" />
+                        <p>{{$v->response->filename}}</p>
+                    </div>
+                @endforeach
+            </div>
         </td>
     </tr>
 </table>