数据字段调整

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 {

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue

@@ -30,11 +30,13 @@
                                 <div class="card-row">
                                     <span class="row-label">执法人员</span>
                                     <div class="row-value enforcer-list">
-                                        <div>
-                                            {{ item.lawEnforcer }}{{ item.lawEnforcerId }}
+                                        <div class="enforcer-line">
+                                            <span class="enforcer-name">{{ parseEnforcer(item.lawEnforcer).name }}</span>
+                                            <span v-if="parseEnforcer(item.lawEnforcer).phone" class="enforcer-id">{{ parseEnforcer(item.lawEnforcer).phone }}</span>
                                         </div>
-                                        <div>
-                                            {{ item.lawEnforcerTwo }}{{ item.lawEnforcerIdTwo }}
+                                        <div class="enforcer-line" v-if="item.lawEnforcerTwo">
+                                            <span class="enforcer-name">{{ parseEnforcer(item.lawEnforcerTwo).name }}</span>
+                                            <span v-if="parseEnforcer(item.lawEnforcerTwo).phone" class="enforcer-id">{{ parseEnforcer(item.lawEnforcerTwo).phone }}</span>
                                         </div>
                                     </div>
                                 </div>
@@ -65,11 +67,13 @@
                                 <div class="card-row">
                                     <span class="row-label">执法人员</span>
                                     <div class="row-value enforcer-list">
-                                        <div>
-                                            {{ item.lawEnforcer }}
+                                        <div class="enforcer-line">
+                                            <span class="enforcer-name">{{ parseEnforcer(item.lawEnforcer).name }}</span>
+                                            <span v-if="parseEnforcer(item.lawEnforcer).phone" class="enforcer-id">{{ parseEnforcer(item.lawEnforcer).phone }}</span>
                                         </div>
-                                        <div v-for="(enforcer, idx) in item.lawEnforcer2List" :key="idx">
-                                            {{ enforcer }}
+                                        <div v-for="(enforcer, idx) in item.lawEnforcer2Show ? item.lawEnforcer2Show.split(','): item.lawEnforcer2List" :key="idx" class="enforcer-line">
+                                            <span class="enforcer-name">{{ parseEnforcer(enforcer).name }}</span>
+                                            <span v-if="parseEnforcer(enforcer).phone" class="enforcer-id">{{ parseEnforcer(enforcer).phone }}</span>
                                         </div>
                                     </div>
                                 </div>
@@ -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;
+}
 </style>

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue

@@ -28,8 +28,14 @@
                 <div class="info-row">
                     <span class="info-label">执法人员</span>
                     <div class="info-value enforcer-value">
-                      <div>{{ detail.lawEnforcer }}</div>
-                      <div v-for="(enforcer, idx) in detail.lawEnforcer2List" :key="idx">{{ enforcer }}</div>
+                        <div class="enforcer-line">
+                            <span class="enforcer-name">{{ parseEnforcer(detail.lawEnforcer).name }}</span>
+                            <span v-if="parseEnforcer(detail.lawEnforcer).phone" class="enforcer-id">{{ parseEnforcer(detail.lawEnforcer).phone }}</span>
+                        </div>
+                        <div v-for="(enforcer, index) in detail.lawEnforcer2Show ? detail.lawEnforcer2Show.split(','): detail.lawEnforcer2List" :key="index" class="enforcer-line">
+                            <span class="enforcer-name">{{ parseEnforcer(enforcer).name }}</span>
+                            <span v-if="parseEnforcer(enforcer).phone" class="enforcer-id">{{ parseEnforcer(enforcer).phone }}</span>
+                        </div>
                     </div>
                 </div>
                 <div class="info-row">
@@ -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;
+    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 {

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue

@@ -21,13 +21,19 @@
                             <div class="card-title">{{ item.lawEnforcementItemText || '-' }}</div>
                             <div class="card-row">
                                 <span class="card-label">执法单位：</span>
-                                <span>{{ item.lawEnforcement || '-' }}</span>
+                                <span>{{ item.bureauDeptName || '-' }}</span>
                             </div>
                             <div class="card-row">
                                 <span class="card-label">执法人员：</span>
                                 <span class="enforcer-block">
-                                    <div>{{ item.lawEnforcer }}</div>
-                                    <div v-for="(enforcer, idx) in item.lawEnforcer2List" :key="idx">{{ enforcer }}</div>
+                                    <div class="enforcer-line">
+                                        <span class="enforcer-name">{{ parseEnforcer(item.lawEnforcer).name }}</span>
+                                        <span v-if="parseEnforcer(item.lawEnforcer).phone" class="enforcer-id">{{ parseEnforcer(item.lawEnforcer).phone }}</span>
+                                    </div>
+                                    <div v-for="(enforcer, idx) in item.lawEnforcer2Show ? item.lawEnforcer2Show.split(','): item.lawEnforcer2List" :key="idx" class="enforcer-line">
+                                        <span class="enforcer-name">{{ parseEnforcer(enforcer).name }}</span>
+                                        <span v-if="parseEnforcer(enforcer).phone" class="enforcer-id">{{ parseEnforcer(enforcer).phone }}</span>
+                                    </div>
                                 </span>
                             </div>
                             <div class="card-row">
@@ -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;