diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue index 6b949499..7cf60be6 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue @@ -17,11 +17,11 @@
*{{ formData.taskTypeId == 1 ? '执法人员' : '参与人员' }}
- {{ defaultPerson?.lawEnforcerName }} {{ defaultPerson?.lawEnforcerIdCard ?? defaultPerson?.lawEnforcerPhone }} + {{ defaultPerson?.lawEnforcerName }} {{ defaultPerson?.lawEnforcerIdCard || defaultPerson?.lawEnforcerPhone }}
- {{ person.lawEnforcerName || "请选择" }} {{ person.lawEnforcerIdCard ?? person.lawEnforcerPhone }} + {{ person.lawEnforcerName || "请选择" }} {{ person.lawEnforcerIdCard || person.lawEnforcerPhone }}
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue index 2f6bc8f8..78bfc918 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue +++ b/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, })) diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosAdd.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosAdd.vue index f0c96e57..dddc4a5a 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosAdd.vue +++ b/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; }; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosDetail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosDetail.vue index 6d25fd90..fbcafbe7 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosDetail.vue +++ b/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 || '',