BUG 28581
This commit is contained in:
		| @@ -78,7 +78,7 @@ | |||||||
|                 <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/> |                 <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/> | ||||||
|               </el-form-item> |               </el-form-item> | ||||||
|               <el-form-item label="现住址" prop="currentAreaId"> |               <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-form-item prop="currentAddress"> | ||||||
|                   <el-input v-model="form.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/> |                   <el-input v-model="form.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/> | ||||||
|                 </el-form-item> |                 </el-form-item> | ||||||
| @@ -153,16 +153,19 @@ | |||||||
|               <template slot="content"> |               <template slot="content"> | ||||||
|                 <div flex class="half wrap"> |                 <div flex class="half wrap"> | ||||||
|                   <el-form-item label="产业帮扶"> |                   <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> | ||||||
|                   <el-form-item label="健康帮扶"> |                   <el-form-item label="健康帮扶"> | ||||||
|                     <ai-select v-model="form.healthAssistance" :selectList="dict.getDict('fpHealthAssistance')"/> |                     <ai-select v-model="form.healthAssistance" :selectList="dict.getDict('fpHealthAssistance')"/> | ||||||
|                   </el-form-item> |                   </el-form-item> | ||||||
|                   <el-form-item label="就业帮扶"> |                   <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> | ||||||
|                   <el-form-item label="教育帮扶"> |                   <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> | ||||||
|                   <el-form-item label="金融帮扶"> |                   <el-form-item label="金融帮扶"> | ||||||
|                     <ai-select v-model="form.financialAssistance" :selectList="dict.getDict('fpFnancialAssistance')"/> |                     <ai-select v-model="form.financialAssistance" :selectList="dict.getDict('fpFnancialAssistance')"/> | ||||||
| @@ -171,7 +174,8 @@ | |||||||
|                     <ai-select v-model="form.socialAssistance" :selectList="dict.getDict('fpSocialAssistance')"/> |                     <ai-select v-model="form.socialAssistance" :selectList="dict.getDict('fpSocialAssistance')"/> | ||||||
|                   </el-form-item> |                   </el-form-item> | ||||||
|                   <el-form-item label="公益岗帮扶"> |                   <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> | ||||||
|                   <el-form-item label="是否风险消除"> |                   <el-form-item label="是否风险消除"> | ||||||
|                     <ai-select disabled v-model="form.riskEliminated" :selectList="dict.getDict('fpYesOrNo')"/> |                     <ai-select disabled v-model="form.riskEliminated" :selectList="dict.getDict('fpYesOrNo')"/> | ||||||
| @@ -212,7 +216,10 @@ export default { | |||||||
|         idNumber: [{required: true, message: "请输入身份证号"}], |         idNumber: [{required: true, message: "请输入身份证号"}], | ||||||
|         name: [{required: true, message: "请输入姓名"}], |         name: [{required: true, message: "请输入姓名"}], | ||||||
|         sex: [{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: "请选择是否户主"}], |         isHousehold: [{required: true, message: "请选择是否户主"}], | ||||||
|         householdRelation: [{required: true, message: "请选择与户主关系"}], |         householdRelation: [{required: true, message: "请选择与户主关系"}], | ||||||
|         householdIdNumber: [{required: true, message: "请选择户主身份证号"}], |         householdIdNumber: [{required: true, message: "请选择户主身份证号"}], | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user