From c7b5d6eb8b93803cc89eb63e65e934b77e00945a Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Wed, 20 Nov 2024 10:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E4=BF=9D=E5=AE=89=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myProject/projectDetails/projectDetails.vue        |  2 +-
 .../securityUserForm/securityUserForm.vue              | 10 ++++++----
 collect_information/types/global.d.ts                  |  2 ++
 .../types/subPages/projectManager/myProject/index.ts   |  7 +++++--
 .../subPages/projectManager/securityUserForm/index.ts  |  9 +++++++--
 5 files changed, 21 insertions(+), 9 deletions(-)

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 @@
                 </view>
                 <view style="display: flex;justify-content: space-between">
                   <text>创建时间:{{ item.createTime }}</text>
-                  <text>身份证:{{ item.idCard }}</text>
+                  <text>身份证:{{ item.idCard?.desensitizedValue }}</text>
                 </view>
               </view>
               <view class="projectDetailsTableIndex">
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 4bbe728..09240b0 100644
--- a/collect_information/types/subPages/projectManager/myProject/index.ts
+++ b/collect_information/types/subPages/projectManager/myProject/index.ts
@@ -44,12 +44,14 @@ export interface ProgramUserInfo {
   name?: string
   telephone?: string
 }
-
 export interface ServiceProjectSecurityUserPagerVo {
   createTime?: string;
   dateOfBirth?: string;
   homeAddress?: string;
-  idCard?: string;
+  idCard?: {
+    desensitizedValue?:string
+    originalValue?:string
+  };
   name?: string;
   nativePlace?: string;
   remark?: string;
@@ -61,3 +63,4 @@ export interface ServiceProjectSecurityUserPagerVo {
   workPost?: string;
   sex: BaseEnum<number>
 }
+
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
+}