diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue index cdfdfd41..4ad8c2a5 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/HistoryActivityDetail.vue @@ -29,11 +29,17 @@
入企人员
-
-
{{ activityDetail.lawEnforcer }}{{ activityDetail.lawEnforcerId - }}
-
{{ activityDetail.lawEnforcerOther }}{{ - activityDetail.lawEnforcerIdOther }}
+
+
+ {{ parseEnforcer(activityDetail.lawEnforcer).name }} + {{ parseEnforcer(activityDetail.lawEnforcer).phone }} +
+
@@ -83,7 +89,16 @@ import { baseUrl } from '@/config/env'; const router = useRouter(); const route = useRoute(); -// 活动详情数据 +// 解析执法人员字符串,提取名字和电话 +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 activityDetail = ref({}); // 返回上一页 @@ -166,6 +181,29 @@ onMounted(() => { padding-bottom: 10px; } + .enforcer-list { + display: flex; + flex-direction: column; + } + + .enforcer-line { + display: flex; + align-items: baseline; + white-space: nowrap; + padding-bottom: 10px; + } + + .enforcer-name { + display: inline-block; + min-width: 3em; + text-align: justify; + text-align-last: justify; + } + + .enforcer-phone { + margin-left: 0.4em; + } + :deep(.van-cell-group--inset) { margin: 0; } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue index 4a1da6de..8cc3ee7b 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue @@ -27,10 +27,15 @@
执法人员 +
-
- {{ enforcer.name }} - {{ enforcer.id }} +
+ {{ detail.lawEnforcer }} + {{ detail.lawEnforcerTel }} +
+
+ {{ name.trim() }} + {{ detail.lawEnforcerTelTwo.split(',')[index].trim() }}
@@ -209,6 +214,16 @@ import { formatEnforcer, formatTime } from '@/util/util'; const router = useRouter(); const route = useRoute(); +// 解析执法人员字符串,提取名字和电话 +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 id = route.query.id; // 只读标识:hasEvaluate=1 已反馈只能查看,0 为待反馈可提交,默认为已反馈(只读) const readonly = computed(() => { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue index ab5b20d5..f5589fd5 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue @@ -35,7 +35,7 @@
- 保存 + 保存 提交 提交并转办案
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue index 8106d92b..6800ed58 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue @@ -32,14 +32,15 @@
执法单位 - {{ item.lawEnforcement || item.bureauDeptName }} + {{ item.bureauDeptName }}
执法人员:
- {{ enforcer }} + {{ enforcer.name }} + {{ enforcer.id }}
@@ -286,9 +287,23 @@ onMounted(() => { } .enforcer-item { + display: flex; + align-items: baseline; + white-space: nowrap; padding: 4px 0px; } + .enforcer-name { + display: inline-block; + min-width: 3em; + text-align: justify; + text-align-last: justify; + } + + .enforcer-id { + margin-left: 0.4em; + } + .value { flex: 1; color: #333; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue index 1b8482d2..357190bd 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue @@ -31,6 +31,10 @@
执法要求 {{ detail.enforceRequirement || '-' }} +
+
+ 执法单位 + {{ detail.organName || '-' }}
执法人员