增加工作单位和所属街道

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

@@ -296,6 +296,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'          => '[]',
@@ -378,8 +380,6 @@ class BuyhouseController extends WebBaseController
             'marry'              => 'required',
             'household_register' => 'required',
             'work_prove'         => 'required',
-            'company'            => 'required',
-            'street'             => 'required',
             'house_condition'    => 'required',
             'house_policy'       => 'required',
         ];
@@ -388,8 +388,6 @@ class BuyhouseController extends WebBaseController
             'marry.required'              => '请选择婚姻状况',
             'household_register.required' => '请上传户口本',
             'work_prove.required'         => '请上传工作证明',
-            'company.required'            => '请填写工作单位',
-            'street.required'             => '请填写所属街道',
             'house_condition.required'    => '请填写家庭成员在晋江市行政区域内住房情况',
             'house_policy.required'       => '请填写在晋享受政策性住房或相关优惠情况',
         ];

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

@@ -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'}
                         ],