From f0a023559544bd718b4f31e3c5e41f89b391b4e5 Mon Sep 17 00:00:00 2001 From: "wangmingyong@163.com" Date: Thu, 13 Aug 2026 18:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enforce/enforcementRegister.vue | 5 ++- .../enforcement/enforcementEvaluate.vue | 38 +++++++++++++++---- .../enforcement/enforcementEvaluateDetail.vue | 37 ++++++++++-------- .../enforcementRegistrationList.vue | 31 +++++++++++++-- 4 files changed, 81 insertions(+), 30 deletions(-) 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 c973478c..3711ae3d 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 @@ -75,6 +75,7 @@ const isSignMode = ref(false); const isScanMode = ref(false); // 原因字段是否显示（仅扫码登记模式不显示） const showReason = computed(() => { + console.log(isScanMode.value,'isScanMode.value'); return !isScanMode.value; }); @@ -542,13 +543,13 @@ const onSubmit = () => { sessionStorage.removeItem('outOfCityEnterprise'); if (isNonEnforcement.value) { // 非行政执法模式跳转到历史活动页面 - showReason.value = true; router.replace({ path: '/enforcement/enterpriseScanPreview', query: { type: 'non-enforcement', enterpriseNumber: enterpriseData.value.enterpriseNumber, - tab: '1' + tab: '1', + isManualSearch:'true' } }); } else { diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue index 382f0678..ff7e812b 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue @@ -30,11 +30,13 @@
执法人员
-
- {{ item.lawEnforcer }}{{ item.lawEnforcerId }} +
+ {{ parseEnforcer(item.lawEnforcer).name }} + {{ parseEnforcer(item.lawEnforcer).phone }}
-
- {{ item.lawEnforcerTwo }}{{ item.lawEnforcerIdTwo }} +
+ {{ parseEnforcer(item.lawEnforcerTwo).name }} + {{ parseEnforcer(item.lawEnforcerTwo).phone }}
@@ -65,11 +67,13 @@
执法人员
-
- {{ item.lawEnforcer }} +
+ {{ parseEnforcer(item.lawEnforcer).name }} + {{ parseEnforcer(item.lawEnforcer).phone }}
-
- {{ enforcer }} +
+ {{ parseEnforcer(enforcer).name }} + {{ parseEnforcer(enforcer).phone }}
@@ -90,6 +94,7 @@ import { showToast } from 'vant'; import 'vant/es/toast/style'; import { queryEnforcementRegistrationPageList } from '@/api/enterprise'; +import { parseEnforcer } from '@/util/util'; const { useCommon } = $globalStore; const router = useRouter(); @@ -409,4 +414,21 @@ onMounted(() => { 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-id { + margin-left: 0.4em; +} 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 c6218c8c..34421865 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 @@ -28,8 +28,14 @@
执法人员
-
{{ detail.lawEnforcer }}
-
{{ enforcer }}
+
+ {{ parseEnforcer(detail.lawEnforcer).name }} + {{ parseEnforcer(detail.lawEnforcer).phone }} +
+
+ {{ parseEnforcer(enforcer).name }} + {{ parseEnforcer(enforcer).phone }} +
@@ -206,7 +212,7 @@ import { submitEvaluate, } from '@/api/enterprise'; import { loadDict, getDictText } from '@/util/dictUtil'; -import { alignNames } from '@/util/util'; +import { alignNames, parseEnforcer } from '@/util/util'; const router = useRouter(); const route = useRoute(); @@ -525,24 +531,23 @@ const onSubmit = () => { .enforcer-value { display: flex; flex-direction: column; - gap: 4px; } -.enforcer-item { +.enforcer-line { display: flex; - align-items: center; - gap: 8px; - font-size: 14px; - line-height: 1.6; + align-items: baseline; + white-space: nowrap; +} - .enforcer-name { - color: #999; - font-weight: 500; - } +.enforcer-name { + display: inline-block; + min-width: 3em; + text-align: justify; + text-align-last: justify; +} - .enforcer-phone { - color: #999; - } +.enforcer-id { + margin-left: 0.4em; } .result-row { 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 c7fbf8cf..336d680e 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 @@ -21,13 +21,19 @@
{{ item.lawEnforcementItemText || '-' }}
执法单位： - {{ item.lawEnforcement || '-' }} + {{ item.bureauDeptName || '-' }}
执法人员： -
{{ item.lawEnforcer }}
-
{{ enforcer }}
+
+ {{ parseEnforcer(item.lawEnforcer).name }} + {{ parseEnforcer(item.lawEnforcer).phone }} +
+
+ {{ parseEnforcer(enforcer).name }} + {{ parseEnforcer(enforcer).phone }} +
@@ -53,7 +59,7 @@ import { queryEnforcementRegistrationPageList } from '@/api/enterprise'; import { showToast } from 'vant'; import 'vant/es/toast/style'; import SearchFilterBar from '@/components/common/SearchFilterBar.vue'; -import { alignNames } from '@/util/util'; +import { alignNames, parseEnforcer } from '@/util/util'; const { useCommon } = $globalStore; const router = useRouter(); @@ -309,6 +315,23 @@ const toEvaluate = (id, checkItem) => { 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-id { + margin-left: 0.4em; +} + .card-actions { display: flex; justify-content: flex-end;