diff --git a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue index a01a944..914fe64 100644 --- a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue +++ b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue @@ -71,7 +71,7 @@ - 姓名:{{ securityNumberByIdCard?.name ? securityNumberByIdCard?.name : '无' }} + 姓名:{{ securityNumberByIdCard.name ? securityNumberByIdCard.name : '无' }} 保安证件号:{{ securityNumberByIdCard?.bayzh ? securityNumberByIdCard?.bayzh : '无' }} 身份证:{{ securityNumberByIdCard?.sfzhm ? securityNumberByIdCard?.sfzhm : '无' }} @@ -90,17 +90,17 @@ import dayjs from 'dayjs' import { SecurityUserFormParams, securityNumberByIdCard } from '@/types/subPages/projectManager/securityUserForm' import { FormInstance } from '@nutui/nutui-taro' import { generateSimpleObjectName, getResignedObjectUrl } from '@/utils' -import {IconFont} from "@nutui/icons-vue-taro"; -const SEX = enumSelectNodes('Sex') +const SEX:any = enumSelectNodes('Sex') const minioBaseUrl = process.env.TARO_APP_MINIO_URL +const BUCKET = process.env.TARO_APP_MINIO_BUCKET const showPicker = ref(false) const Url = ref('') const type = ref<'formInput' | 'QcCodeInput'>(null!) const formData = ref({} as any) const formRef = ref(null!) const visible = ref(false) -const securityNumberByIdCard = ref() +const securityNumberByIdCard = ref() const uploadRef = ref(null) const modelValue = ref('') @@ -144,27 +144,32 @@ useLoad((options) => { const idCardBlur = async (e: any, num: number) => { const value = e.idCard if (value) { - Taro.request({ - url: 'https://www.hnjinglian.cn:5678/common/querySecurityNumberByIdCard', - data: { - idCard: value, - }, - method: 'GET', - success: ({ data }) => { - visible.value = true - securityNumberByIdCard.value = data.data - }, - }) - return + if(BUCKET === 'police-security-dev'){ + Taro.request({ + url: 'https://www.hnjinglian.cn:5678/common/querySecurityNumberByIdCard', + data: { + idCard: value, + }, + method: 'GET', + success: ({ data }) => { + console.log(data.data) + visible.value = true + securityNumberByIdCard.value = data.data + }, + }) + }else{ + const resp = await api.get('/common/querySecurityNumberByIdCard',{ idCard: value}) + visible.value = true + securityNumberByIdCard.value = resp?.data + } } else { visible.value = false - console.log(value) } cardBlur(value, num) } -const cardBlur = (e, num) => { - let value = '' +const cardBlur = (e:any, num:number) => { + let value: string if (num === 0) { value = e } else { diff --git a/collect_information/types/subPages/projectManager/securityUserForm/index.ts b/collect_information/types/subPages/projectManager/securityUserForm/index.ts index a86cb44..970fe07 100644 --- a/collect_information/types/subPages/projectManager/securityUserForm/index.ts +++ b/collect_information/types/subPages/projectManager/securityUserForm/index.ts @@ -4,10 +4,10 @@ export interface SecurityUserFormParams { serviceProjectId: string; name: string | undefined; workPost?: string; - telephone: value | null; - sex: number; + telephone: value | any; + sex: number | any; nativePlace?: string; - idCard: value | null; + idCard: value | any; dateOfBirth?: Date | null; securityNumber?: string; photo?:string; @@ -21,8 +21,8 @@ export interface value{ originalValue?:string } -export interface securityNumberByIdCard{ +export interface securityNumberByIdCard { name: string | undefined - bayzh?: string - sfzhm?: string + bayzh?: string | undefined + sfzhm?: string | undefined } 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/login.vue b/policeManagement/src/views/login.vue index 66f9cda..e9515fd 100644 --- a/policeManagement/src/views/login.vue +++ b/policeManagement/src/views/login.vue @@ -2,12 +2,12 @@
Logo -
超级后台
+
公安后台