From 30047204e1c35d269c1d1ff5234d905d0c63b7d0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 28 Mar 2022 16:57:25 +0800
Subject: [PATCH] BUG 28581

---
 packages/jianping/AppHelpedResident/hrAdd.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index e945fb58..bdc1f41d 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -78,7 +78,7 @@
                 <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
               </el-form-item>
               <el-form-item label="现住址" prop="currentAreaId">
-                <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea"/>
+                <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea" valueLevel="5"/>
                 <el-form-item prop="currentAddress">
                   <el-input v-model="form.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/>
                 </el-form-item>
@@ -153,16 +153,19 @@
               <template slot="content">
                 <div flex class="half wrap">
                   <el-form-item label="产业帮扶">
-                    <ai-select v-model="form.industrialAssistance" :selectList="dict.getDict('fpIndustrialAssistance')"/>
+                    <ai-select v-model="form.industrialAssistance"
+                               :selectList="dict.getDict('fpIndustrialAssistance')"/>
                   </el-form-item>
                   <el-form-item label="健康帮扶">
                     <ai-select v-model="form.healthAssistance" :selectList="dict.getDict('fpHealthAssistance')"/>
                   </el-form-item>
                   <el-form-item label="就业帮扶">
-                    <ai-select v-model="form.employmentAssistance" :selectList="dict.getDict('fpEmploymentAssistance')"/>
+                    <ai-select v-model="form.employmentAssistance"
+                               :selectList="dict.getDict('fpEmploymentAssistance')"/>
                   </el-form-item>
                   <el-form-item label="教育帮扶">
-                    <ai-select v-model="form.educationalAssistance" :selectList="dict.getDict('fpEducationalAssistance')"/>
+                    <ai-select v-model="form.educationalAssistance"
+                               :selectList="dict.getDict('fpEducationalAssistance')"/>
                   </el-form-item>
                   <el-form-item label="金融帮扶">
                     <ai-select v-model="form.financialAssistance" :selectList="dict.getDict('fpFnancialAssistance')"/>
@@ -171,7 +174,8 @@
                     <ai-select v-model="form.socialAssistance" :selectList="dict.getDict('fpSocialAssistance')"/>
                   </el-form-item>
                   <el-form-item label="公益岗帮扶">
-                    <ai-select v-model="form.publicWelfarePostAssistance" :selectList="dict.getDict('fpPublicWelfarePostAssistance')"/>
+                    <ai-select v-model="form.publicWelfarePostAssistance"
+                               :selectList="dict.getDict('fpPublicWelfarePostAssistance')"/>
                   </el-form-item>
                   <el-form-item label="是否风险消除">
                     <ai-select disabled v-model="form.riskEliminated" :selectList="dict.getDict('fpYesOrNo')"/>
@@ -212,7 +216,10 @@ export default {
         idNumber: [{required: true, message: "请输入身份证号"}],
         name: [{required: true, message: "请输入姓名"}],
         sex: [{required: true, message: "请选择性别"}],
-        currentAreaId: [{required: true, message: "请选择户籍地"}],
+        currentAreaId: [
+          {required: true, message: "请选择户籍地"},
+          {pattern: /[^0]0{0,2}$/, message: "请选择到村/街道"},
+        ],
         isHousehold: [{required: true, message: "请选择是否户主"}],
         householdRelation: [{required: true, message: "请选择与户主关系"}],
         householdIdNumber: [{required: true, message: "请选择户主身份证号"}],