diff --git a/collect_information/.env.development b/collect_information/.env.development index d7a068a..4e393f7 100644 --- a/collect_information/.env.development +++ b/collect_information/.env.development @@ -1,7 +1,7 @@ # 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config TARO_APP_ID="wx0acd1c4fcf94bdd3" -TARO_APP_BASE_API="http://172.10.10.93:8765" -# TARO_APP_BASE_API="https://www.hnjinglian.cn:5678" +# TARO_APP_BASE_API="http://172.10.10.93:8765" +TARO_APP_BASE_API="https://www.hnjinglian.cn:5678" diff --git a/collect_information/src/pages/projectManager/mine/index.vue b/collect_information/src/pages/projectManager/mine/index.vue index b85b668..f73c3d6 100644 --- a/collect_information/src/pages/projectManager/mine/index.vue +++ b/collect_information/src/pages/projectManager/mine/index.vue @@ -77,5 +77,4 @@ const onOk = ()=>{ url: "/pages/login/login", }); } - diff --git a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue index b70a065..865a921 100644 --- a/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue +++ b/collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue @@ -67,7 +67,7 @@ 创建时间:{{ item.createTime }} - 身份证:{{ item.idCard }} + 身份证:{{ item.idCard?.desensitizedValue }} diff --git a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue index 98dadd5..438325f 100644 --- a/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue +++ b/collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue @@ -101,11 +101,13 @@ useLoad((options) => { serviceProjectId: options.pid, securityUnitId: options.uid, sex: 0, - idCard: '', + idCard:null, + telephone:null, dateOfBirth: null } } else { - formData.value = JSON.parse(options.securityUser) + const form = JSON.parse(options.securityUser) + formData.value = Object.assign({}, form, {idCard: form.idCard.originalValue, telephone: form.telephone.originalValue}) } }) @@ -144,10 +146,10 @@ const submit = () => { securityUnitId: formData.value.securityUnitId, name: '', workPost: '', - telephone: '', + telephone: null , sex: 0, nativePlace: '', - idCard: '', + idCard: null, dateOfBirth: null, securityNumber: '', remark: '', diff --git a/collect_information/types/global.d.ts b/collect_information/types/global.d.ts index c5cf58f..541699b 100644 --- a/collect_information/types/global.d.ts +++ b/collect_information/types/global.d.ts @@ -156,3 +156,5 @@ interface Item { itemList: any[] // 根据实际情况调整类型 snowFlakeId: string } + + diff --git a/collect_information/types/subPages/projectManager/myProject/index.ts b/collect_information/types/subPages/projectManager/myProject/index.ts index ab35b32..09240b0 100644 --- a/collect_information/types/subPages/projectManager/myProject/index.ts +++ b/collect_information/types/subPages/projectManager/myProject/index.ts @@ -15,7 +15,7 @@ export interface MyProjectList { securityUnitId: string; street?: string; streetName?: string; - type?: any + type?:any } export interface ContactPersonInfo { @@ -31,7 +31,7 @@ export interface ServiceProjectList { name?: string; remark?: string; securityUserTotal?: number; - securityUnitName?: string; + securityUnitName?:string; serviceArea?: number; snowFlakeId?: string; staffTotal?: number; @@ -44,16 +44,13 @@ export interface ProgramUserInfo { name?: string telephone?: string } - - - export interface ServiceProjectSecurityUserPagerVo { createTime?: string; dateOfBirth?: string; homeAddress?: string; idCard?: { - originalValue: string; - desensitizedValue: string; + desensitizedValue?:string + originalValue?:string }; name?: string; nativePlace?: string; @@ -65,5 +62,5 @@ export interface ServiceProjectSecurityUserPagerVo { snowFlakeId: string; workPost?: string; sex: BaseEnum - } + diff --git a/collect_information/types/subPages/projectManager/securityUserForm/index.ts b/collect_information/types/subPages/projectManager/securityUserForm/index.ts index e02bb69..11484dd 100644 --- a/collect_information/types/subPages/projectManager/securityUserForm/index.ts +++ b/collect_information/types/subPages/projectManager/securityUserForm/index.ts @@ -4,12 +4,17 @@ export interface SecurityUserFormParams { serviceProjectId: string; name?: string; workPost?: string; - telephone?: string; + telephone: value | null; sex: number; nativePlace?: string; - idCard: string; + idCard: value | null; dateOfBirth?: Date | null; securityNumber?: string; remark?: string; homeAddress?: string } + +export interface value{ + desensitizedValue?:string + originalValue?:string +}