diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index d7578fac8..404e82f90 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -308,8 +308,8 @@ @@ -1222,6 +1222,8 @@ export default { label: '人群类别', itemType: "select1", formName: "specialCategoryCode", + multiple:true, + collapseTags:true, opction: [] },] }, @@ -1263,6 +1265,8 @@ export default { label: '岗位类型', itemType: "select1", formName: "jobPost", + multiple:true, + collapseTags:true, opction: [] }, ] @@ -1529,7 +1533,7 @@ export default { }, postDto: { hiredate: '',//入职时间 - jobPost: '',//岗位类型 + jobPost: [],//岗位类型 userId: '' }, birthRecordDTO: { @@ -1770,7 +1774,7 @@ export default { await this.getDictData('chronic_disease_code', 'chronicDiseaseCode') }, async getWelfareDict () { - await this.getDictData('welfare_post', 'jobPost') + await this.getDictData('public_welfare_post_type', 'jobPost') }, async getUnemployment () { await this.getDictData('unemployment_cause', 'unemploymentReason') @@ -2669,7 +2673,7 @@ export default { } else { this.form.postDto = res.data ? res.data : { hiredate: '',//入职时间 - jobPost: '', //岗位类型 + jobPost: [], //岗位类型 userId: id } diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue index a5bbc364e..45e85cd8f 100644 --- a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue +++ b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue @@ -155,8 +155,8 @@ {{ formData.postTypes }} - - + diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue b/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue index 828a04e28..71560b313 100644 --- a/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue +++ b/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue @@ -46,6 +46,7 @@ > + @@ -84,7 +84,7 @@ - + + + + @@ -458,10 +459,9 @@ this.$http.post("sys/dict/data/education", { formCode: "resi_base_info", }), - this.$http.post("sys/dict/data/education", { - formCode: "public_welfare_post_type", + this.$http.post("sys/dict/data/dictlist", { + dictType: "public_welfare_post_type", }), - ]; const dictKeys = ["nationList", "educationList",'public_welfare_post_type']; // 对应的键名