diff --git a/collect_information/src/enums/index.ts b/collect_information/src/enums/index.ts index efdc1ef..a4da952 100644 --- a/collect_information/src/enums/index.ts +++ b/collect_information/src/enums/index.ts @@ -9,6 +9,7 @@ type EnumType = | 'Sex' | 'ServiceProjectType' | 'MiniProgramUserIdentity' + | 'EducationLevel' export const initEnum = () => { api.get[]>>('/common/enums').then(resp => { diff --git a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue index cabc5fa..bbc7cbf 100644 --- a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue +++ b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue @@ -96,10 +96,11 @@ - 籍贯:{{ securityUserDetail.nativePlace }} - 公司:{{ securityUserDetail.securityUnitName }} - 家庭地址:{{ securityUserDetail.homeAddress }} - 备注:{{ securityUserDetail.remark }} + 籍贯:{{ securityUserDetail?.nativePlace }} + 公司:{{ securityUserDetail?.securityUnitName }} + 家庭地址:{{ securityUserDetail?.homeAddress }} + 文化程度:{{ securityUserDetail.educationLevel?.label }} + 备注:{{ securityUserDetail?.remark }} @@ -240,7 +241,7 @@ const detail = (item: ServiceProjectSecurityUserPagerVo) => { } const securityUserEdit = (item: ServiceProjectSecurityUserPagerVo) => { console.log(item) - const params = {...item, sex: item.sex.value} + const params = {...item, sex: item.sex.value,educationLevel:item.educationLevel} Taro.navigateTo({url: `/subPages/projectManager/securityUserForm/securityUserForm?securityUser=${JSON.stringify(params)}&type=formInput`}) } diff --git a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue index 914fe64..1a2ca65 100644 --- a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue +++ b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue @@ -1,13 +1,13 @@