Merge remote-tracking branch 'origin/main'

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"
 
 
 

collect_information/src/pages/projectManager/mine/index.vue

@@ -77,5 +77,4 @@ const onOk = ()=>{
     url: "/pages/login/login",
   });
 }
-
 </script>

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">

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: '',

collect_information/types/global.d.ts

@@ -156,3 +156,5 @@ interface Item {
   itemList: any[] // 根据实际情况调整类型
   snowFlakeId: string
 }
+
+

collect_information/types/subPages/projectManager/myProject/index.ts

@@ -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<number>
-
 }
+

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
+}