diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue index 2d122263..7e6258e3 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue @@ -29,10 +29,10 @@ 执法人员
- {{ detail.lawEnforcer }}{{ detail.lawEnforcerId }} + {{ detail.lawEnforcer }} {{ detail.lawEnforcerId }}
- {{ detail.lawEnforcerTwo }}{{ detail.lawEnforcerIdTwo }} + {{ detail.lawEnforcerTwo }} {{ detail.lawEnforcerIdTwo }}
@@ -77,7 +77,7 @@
- 受委托执法 + 受委托执法 是 @@ -86,7 +86,7 @@
- 委托行政机关 + 委托行政机关 {{ detail.entrustDeptName }}
@@ -486,7 +486,10 @@ const onSubmit = () => { font-size: 14px; width: 60px; } - + .has-auto-label { + width: 90px; + margin-right: 20px; + } .info-value { color: #999; flex: 1; @@ -508,7 +511,10 @@ const onSubmit = () => { font-size: 14px; width: 60px; } - + .has-auto-label { + width: 70px; + margin-right: 20px; + } .info-value { color: #999; flex: 1; diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue index 770f85e2..c55d1875 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue @@ -26,7 +26,7 @@
执法人员: - {{ getEnforcerDisplay(item) }} +
{{ enforcer }}
@@ -84,14 +84,28 @@ const formatDate = (dateStr) => { return `${y}-${m}-${day}`; }; -// ========== 执法人员展示 ========== -const getEnforcerDisplay = (item) => { - if (item.lawEnforcerDisplay) return item.lawEnforcerDisplay; - const names = []; - if (item.lawEnforcer) names.push(item.lawEnforcer); - if (item.lawEnforcerTwo) names.push(item.lawEnforcerTwo); - if (Array.isArray(item.lawEnforcer2List)) names.push(...item.lawEnforcer2List); - return names.length ? names.join('、') : '-'; +// ========== 执法人员展示(与详情页格式一致:姓名 + 空格 + 手机号/编号)========== +const getEnforcers = (item) => { + const list = []; + if (item.lawEnforcer) { + list.push(`${item.lawEnforcer} ${item.lawEnforcerId || ''}`); + } + if (item.lawEnforcerTwo) { + list.push(`${item.lawEnforcerTwo} ${item.lawEnforcerIdTwo || ''}`); + } + const raw = item.lawEnforcer2List || item.enforcers || item.enforcerList || []; + if (Array.isArray(raw) && raw.length) { + raw.forEach(p => { + if (typeof p === 'string') { + list.push(p); + } else { + const name = p.name || p.userName || p.realName || ''; + const phone = p.phone || p.mobile || p.tel || p.id || ''; + if (name) list.push(`${name} ${phone}`); + } + }); + } + return list.length ? list : ['-']; }; // ========== 加载数据 ==========