kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-04-28 16:25:47 +08:00
parent 38f3ecc288 ec29f1dc11
commit 86a1128d9a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/jianping/AppHelpedResident/AppHelpedResident.vue
View File

@@ -26,8 +26,8 @@ export default {
} }
}, },
created() { created() {
this.dict.load("sex", "fpNation", "fpPrtpStatus", "fpHealth", "fpStudentsInSchool", 'fpYesOrNo', "fpRelationship", this.dict.load("fpYear", "sex", "fpNation", "fpPrtpStatus", "fpHealth", "fpStudentsInSchool", 'fpYesOrNo', "fpRelationship",
"yesOrNo", "fpLaborSkills", "fpEducation", "fpType", "fpPoliticalOutlook","fpType", "fpRiskType", "fpAssistanceMeasures", "yesOrNo", "fpLaborSkills", "fpEducation", "fpPoliticalOutlook","fpType", "fpRiskType", "fpAssistanceMeasures",
"fpPublicWelfarePostAssistance","fpHealthAssistance","fpFnancialAssistance","fpEmploymentAssistance","fpEducationalAssistance", "fpPublicWelfarePostAssistance","fpHealthAssistance","fpFnancialAssistance","fpEmploymentAssistance","fpEducationalAssistance",
"fpIndustrialAssistance","fpSocialAssistance", "fpRiskEliminationMethod", "fpNaturalDisaster", "fpHouseType", "fpHouseRoadType", "fpIndustrialAssistance","fpSocialAssistance", "fpRiskEliminationMethod", "fpNaturalDisaster", "fpHouseType", "fpHouseRoadType",
"fpFuelType", "fpDisabilityType", "fpEmploymentChannels") "fpFuelType", "fpDisabilityType", "fpEmploymentChannels")

2
packages/jianping/AppHelpedResident/hrAdd.vue
View File

@@ -114,7 +114,7 @@
<el-input v-model="form.houseArea" placeholder="请输入" :maxlength="8"/> <el-input v-model="form.houseArea" placeholder="请输入" :maxlength="8"/>
</el-form-item> </el-form-item>
<el-form-item label="户类型"> <el-form-item label="户类型">
<ai-select v-model="form.houseType" :selectList="dict.getDict('fpYesOrNo')"/> <ai-select v-model="form.houseType" :selectList="dict.getDict('fpHouseType')"/>
</el-form-item> </el-form-item>
<el-form-item label="与村主干路距离(公里)"> <el-form-item label="与村主干路距离(公里)">
<el-input v-model="form.trunkRoadDistance" placeholder="请输入" :maxlength="8"/> <el-input v-model="form.trunkRoadDistance" placeholder="请输入" :maxlength="8"/>