非现场执法的人员执法号

zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue

@@ -17,11 +17,11 @@
       <div class="form-label"><span class="required-mark" :class="{ 'required-mark--placeholder': formData.taskTypeId == 5 }">*</span>{{ formData.taskTypeId == 1 ? '执法人员' : '参与人员' }}</div>
       <div class="form-value person-select">
         <div class="person-item default-person">
-          <span>{{ defaultPerson?.lawEnforcerName }} {{ defaultPerson?.lawEnforcerIdCard ?? defaultPerson?.lawEnforcerPhone }}</span>
+          <span>{{ defaultPerson?.lawEnforcerName }} {{ defaultPerson?.lawEnforcerIdCard || defaultPerson?.lawEnforcerPhone }}</span>
         </div>
         <div v-for="(person, index) in additionalPersons" :key="index" class="person-item-add">
           <span @click="$emit('openPersonPicker', index)" :class="{ placeholder: !person.lawEnforcerName }">
-            {{ person.lawEnforcerName || "请选择" }} {{ person.lawEnforcerIdCard ?? person.lawEnforcerPhone }}
+            {{ person.lawEnforcerName || "请选择" }} {{ person.lawEnforcerIdCard || person.lawEnforcerPhone }}
           </span>
           <van-icon name="close" class="remove-icon" @click="$emit('removePerson', index)" />
         </div>

zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue

@@ -298,10 +298,10 @@ const loadPersonList = () => {
           userId: item.userId,
           userName: item.userName,
           phonenumber: item.phonenumber,
-          lawEnforcerIdCard: item.mobileNumber,
+          lawEnforcerIdCard: item.lawCertificateNum,
           lawEnforcerId: item.userId,
           lawEnforcerName: item.userName,
-          lawEnforcerPhone: item.phonenumber,
+          lawEnforcerPhone: item.mobileNumber,
           lawCertificateNum: item.lawCertificateNum,
           mobileNumber: item.mobileNumber,
         }))

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosAdd.vue

@@ -75,7 +75,7 @@ import RegisterPopups from '@/components/enforcement/nos/RegisterPopups.vue';
 import AttachmentTaskSource from '@/components/enforcement/nos/AttachmentTaskSource.vue';
 import { nosAddApi, nosTaskSourceListApi } from '@/api/nos/index';
 import { toFullFileUrl, toRelativeFilePath } from '@/util/fileUrl';
-
+import { maskPhone } from '@/util/util';
 const router = useRouter();
 const route = useRoute();
 
@@ -110,9 +110,9 @@ const formData = reactive({
 const lawEnforcer = ref([
   {
     lawEnforcerName: $globalStore.useCommon.userName,
-    lawEnforcerPhone: $globalStore.useCommon.phonenumber,
+    lawEnforcerPhone: maskPhone($globalStore.useCommon.phonenumber),
     lawEnforcerId: $globalStore.useCommon.userId,
-    lawEnforcerIdCard: null
+    lawEnforcerIdCard: $globalStore.useCommon.lawCertificateNum,
   }
 ]);
 
@@ -390,14 +390,16 @@ const handleSelectPerson = (person) => {
       lawEnforcerName: person.lawEnforcerName,
       lawEnforcerId: person.lawEnforcerId,
       lawEnforcerPhone: person.lawEnforcerPhone,
-      lawEnforcerIdCard: person.lawEnforcerIdCard
+      lawEnforcerIdCard: person.lawEnforcerIdCard,
+      lawCertificateNum: person.lawCertificateNum || ''
     });
   } else {
     additionalLawEnforcers.value[currentEditIndex.value] = {
       lawEnforcerName: person.lawEnforcerName,
       lawEnforcerId: person.lawEnforcerId,
       lawEnforcerPhone: person.lawEnforcerPhone,
-      lawEnforcerIdCard: person.lawEnforcerIdCard
+      lawEnforcerIdCard: person.lawEnforcerIdCard,
+      lawCertificateNum: person.lawCertificateNum || ''
     };
   }
   showPopups.person = false;
@@ -497,7 +499,8 @@ const buildLawEnforcerList = () => {
       lawEnforcerId: item.lawEnforcerId,
       lawEnforcerName: item.lawEnforcerName,
       lawEnforcerPhone: item.lawEnforcerPhone,
-      lawEnforcerIdCard: item.lawEnforcerIdCard
+      lawEnforcerIdCard: item.lawEnforcerIdCard,
+      lawCertificateNum: item.lawCertificateNum || ''
     }));
   return list;
 };

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosDetail.vue

@@ -90,7 +90,7 @@ const applyDetailData = (data) => {
     })),
     taskSource: data.taskSourceName || '',
     enforcementUnit: data.lawEnforcementAgency || '',
-    enforcementPerson: (data.lawEnforcer || []).map((e) => `${e.lawEnforcerName || ''} ${e.lawEnforcerPhone || ''}`.trim()).filter(Boolean),
+    enforcementPerson: (data.lawEnforcer || []).map((e) => `${e.lawEnforcerName || ''} ${e.lawEnforcerIdCard || e.lawEnforcerPhone || ''}`.trim()).filter(Boolean),
     enforcementPersonNames: (data.lawEnforcer || []).map((e) => e.lawEnforcerName || '').filter(Boolean),
     enterpriseName: data.enterpriseName || '',
     enterpriseNumber: data.usciCode || '',