diff --git a/policeManagement/src/config/dict.ts b/policeManagement/src/config/dict.ts index e27fe55..0a2a2fb 100644 --- a/policeManagement/src/config/dict.ts +++ b/policeManagement/src/config/dict.ts @@ -6,6 +6,7 @@ type DictType = | 'IsEnable' | 'IsOrNot' | 'Sex' + | 'EducationLevel' export const initEnums = () => { api.get[]>>('/common/enums').then(resp => { diff --git a/policeManagement/src/types/views/unitManage/police/policeUnit.ts b/policeManagement/src/types/views/unitManage/police/policeUnit.ts index 0804615..e5d6271 100644 --- a/policeManagement/src/types/views/unitManage/police/policeUnit.ts +++ b/policeManagement/src/types/views/unitManage/police/policeUnit.ts @@ -131,6 +131,7 @@ export interface securityUnitIdListParams { securityNumber?: string; noSecurityNumberDesc?: string; homeAddress?: string; + educationLevel?: string; } export interface securityUnitIdListPagerVo { snowFlakeId?: string; diff --git a/policeManagement/src/views/query/index.tsx b/policeManagement/src/views/query/index.tsx index 329827c..8ef725b 100644 --- a/policeManagement/src/views/query/index.tsx +++ b/policeManagement/src/views/query/index.tsx @@ -34,6 +34,7 @@ const _formParams = reactive({ noSecurityNumberDesc: '', homeAddress: '', remark: '', + educationLevel: '', }) const cardBlur = () => { let value = _formParams.idCard @@ -87,6 +88,7 @@ const saveOrUpdateEnterprisesUnit = (callback: Function, params, type: string) = _formParams.telephone = params.telephone.originalValue _formParams.workPost = params.workPost _formParams.sex = params.sex.value + _formParams.educationLevel = params.educationLevel.value _formParams.nativePlace = params.nativePlace _formParams.idCard = params.idCard.originalValue _formParams.dateOfBirth = params.dateOfBirth @@ -135,10 +137,18 @@ const saveOrUpdateEnterprisesUnit = (callback: Function, params, type: string) = required: true, options: [...dictSelectNodes('Sex')], }, + + educationLevel: { + type: 'radioGroup', + label: '文化程度', + required: true, + options: [...dictSelectNodes('EducationLevel')], + }, + securityNumber: { type: 'input', label: '保安证号', - required: true, + // required: true, }, dateOfBirth: { type: 'datePicker', @@ -207,6 +217,8 @@ const clearForm = () => { _formParams.noSecurityNumberDesc = '' _formParams.homeAddress = '' _formParams.remark = '' + _formParams.educationLevel = '' + } export const showEnterprisesUnit = (record_) => { // console.log('🚀 ~ showEnterprisesUnit ~ record_:', record_)