diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/NonEnforcementInfoSection.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/NonEnforcementInfoSection.vue index 805e322a..d8492d07 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/NonEnforcementInfoSection.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/NonEnforcementInfoSection.vue @@ -19,7 +19,7 @@ {{ person.name || '请选择' }} - {{ person.id }} + {{ person.phonenumber }} diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js index 0fdc7154..7c4a9a19 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js @@ -166,17 +166,18 @@ const getDeviceType = () =>{ * @returns {Array} - 格式化后的执法人员数组,每个元素为 "名字 - ID" 的格式 */ const formatEnforcer = (item) => { + console.log(item,'item') const enforcers = []; if (item.lawEnforcer) { const names = item.lawEnforcer.split(',').map(n => n.trim()).filter(n => n); - const ids = item.lawEnforcerId ? item.lawEnforcerId.split(',').map(id => id.trim()).filter(id => id) : []; + const ids = item.lawEnforcerTel ? item.lawEnforcerTel.split(',').map(id => id.trim()).filter(id => id) : []; names.forEach((name, index) => { const id = ids[index] || ''; enforcers.push({ name, id }); }); } const secondName = item.lawEnforcerTwo || item.lawEnforcerOther; - const secondId = item.lawEnforcerIdTwo || item.lawEnforcerIdOther; + const secondId = item.lawEnforcerTelTwo || item.lawEnforcerIdOther; if (secondName) { const names = secondName.split(',').map(n => n.trim()).filter(n => n); const ids = secondId ? secondId.split(',').map(id => id.trim()).filter(id => id) : []; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityList.vue index 2c0ee21f..5e6dcc9a 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityList.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityList.vue @@ -32,9 +32,14 @@
入企人员:
-
-
- {{ enforcer }} +
+
+ {{ parseEnforcer(item.lawEnforcer).name }} + {{ parseEnforcer(item.lawEnforcer).phone }} +
+
+ {{ parseEnforcer(enforcer).name }} + {{ parseEnforcer(enforcer).phone }}
@@ -57,6 +62,18 @@ import { formattedDate, formatEnforcer } from '@/util/util.js'; const router = useRouter(); +// 解析执法人员字符串,提取名字和电话 +// 输入: "白宁 19020811001" -> { name: "白宁", phone: "19020811001" } +// 输入: "白宁" -> { name: "白宁", phone: "" } +const parseEnforcer = (str) => { + if (!str) return { name: '', phone: '' }; + const match = String(str).match(/^(.+?)\s+(\d{7,15})$/); + if (match) { + return { name: match[1].trim(), phone: match[2] }; + } + return { name: String(str).trim(), phone: '' }; +}; + const props = defineProps({ enterpriseName: { type: String, @@ -264,6 +281,28 @@ fetchActivityList(); color: #323233; white-space: nowrap; } + + .enforcer-list { + display: flex; + flex-direction: column; + } + + .enforcer-line { + display: flex; + align-items: baseline; + white-space: nowrap; + } + + .enforcer-name { + display: inline-block; + min-width: 3em; + text-align: justify; + text-align-last: justify; + } + + .enforcer-phone { + margin-left: 0.4em; + } } } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceList.vue index cd464785..e36b1dfc 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceList.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceList.vue @@ -117,6 +117,7 @@ const fetchList = () => { const params = { pageNum: pageNum.value, pageSize: pageSize.value, + status: 2 }; if (searchText.value) { params.searchValue = searchText.value;