From 8133d9a055f08979cba7883d6316b94599e3609a Mon Sep 17 00:00:00 2001 From: "wangmingyong@163.com" Date: Thu, 6 Aug 2026 11:43:42 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../register/EnforcementInfoSection.vue | 5 ++-- .../register/NonEnforcementInfoSection.vue | 5 ++-- .../components/EnforcementRecordList.vue | 5 +++- .../enforce/enforcementEvaluateDetail.vue | 6 ++++- .../enforce/enforcementRegister.vue | 26 ++++++++++++++----- .../enforcement/home/enforcementHome.vue | 2 +- 6 files changed, 35 insertions(+), 14 deletions(-) diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue index e2692bff..4fc4fa11 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue @@ -66,6 +66,7 @@ @@ -75,7 +76,7 @@ - @@ -293,7 +294,7 @@ const selectReason = ({ selectedOptions }) => { props.formData.reason = selectedOptions[0]?.text || ''; const selectedValue = selectedOptions[0]?.value || ''; if (selectedValue !== '其他' && selectedOptions[0]?.text !== '其他') { - props.formData.other_reasons = ''; + props.formData.otherReasons = ''; } showReasonPicker.value = false; }; 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 13f55d4a..0d89c3b2 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 @@ -61,6 +61,7 @@ @@ -70,7 +71,7 @@ - @@ -127,7 +128,7 @@ const selectReason = ({ selectedOptions }) => { props.formData.reason = selectedOptions[0]?.text || ''; const selectedValue = selectedOptions[0]?.value || ''; if (selectedValue !== '其他' && selectedOptions[0]?.text !== '其他') { - props.formData.other_reasons = ''; + props.formData.otherReasons = ''; } showReasonPicker.value = false; }; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnforcementRecordList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnforcementRecordList.vue index 56091efa..d31e5d89 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnforcementRecordList.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnforcementRecordList.vue @@ -19,7 +19,7 @@
{{ cityRecords[0].createTime }}
{{ enterpriseName }}
-
被执法次数：{{ cityRecords.length }}次
+
被执法次数：{{ listCount }}次
@@ -73,6 +73,7 @@ const props = defineProps({ // ========== 数据 ========== const recordTab = ref(0); const cityRecords = ref([]); +const listCount = ref(0); const loading = ref(false); const isExpanded = ref(true); @@ -115,6 +116,7 @@ const fetchEnfRegistrationList = (isLoadMore = false) => { } if (res.code === 200) { const payload = res.data || {}; + listCount.value = payload.listCount || payload.total || 0; const rows = payload.list || payload.rows || (Array.isArray(payload) ? payload : []); const pageData = (Array.isArray(rows) ? rows : []).filter( item => item !== null && item !== undefined @@ -163,6 +165,7 @@ const handleRecordTabChange = (tabIndex) => { recordTab.value = tabIndex; pageNum.value = 1; hasMore.value = true; + listCount.value = 0; cityRecords.value = []; fetchEnfRegistrationList(); }; 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 bea16b24..4e6e7821 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 @@ -53,10 +53,14 @@ {{ basis.trim() }}
-
+
原因 {{ detail.enforceReason }}
+
+ 原因描述 + {{ detail.otherReasons }} +
执法时间 {{ formatTime(detail.enforcementTime) }} 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 75e9e655..7f4fb42d 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 @@ -102,6 +102,7 @@ const formData = reactive({ enforcementBases: [''], enforcementBasesIds: [''], reason: '', + otherReasons: '', enforcementTime: '', jointEnforcement: '0', isNewJoint: false, @@ -376,6 +377,7 @@ const getCurrentDateTime = () => { fileList: buildFileList(), userId: useCommon.userId || '', enforceReason: formData.reason || '', + otherReasons: formData.otherReasons || '', checkCss: formData.checkCss || '0', }; } @@ -418,6 +420,7 @@ const getCurrentDateTime = () => { enforce: formData.enforce || '', checkCss: formData.checkCss || '', enforceReason: formData.reason || '', + otherReasons: formData.otherReasons || '', lawField: formData.lawField || '', lawFieldText: formData.lawFieldText || '', checkCategory: checkCategory, @@ -594,7 +597,8 @@ const fetchDetail = (id) => { formData.taskSource = checkCategoryItem?.text || data.checkCategoryText || ''; formData.lawEnforcementItemText = data.lawEnforcementItemText || ''; formData.enforcementTime = data.enforcementTime || ''; - formData.enforceReason = data.enforceReason || ''; + formData.reason = data.enforceReason || ''; + formData.otherReasons = data.otherReasons || ''; formData.jointEnforcement = data.uniteCheck ? '1' : '0'; formData.entrustedEnforcement = data.hasAuto === 1 ? '1' : '0'; formData.entrustedAgency = data.entrustDeptName || ''; @@ -614,13 +618,21 @@ const fetchDetail = (id) => { }]; } - // 回填额外执法人员 + // 回填额外执法人员（行政：lawEnforcerTwo/lawEnforcerIdTwo；非行政：lawEnforcerOther/lawEnforcerIdOther/lawEnforcerTelOther） additionalPersons.value = []; - if (data.lawEnforcerTwo) { - additionalPersons.value.push({ - name: data.lawEnforcerTwo, - id: data.lawEnforcerIdTwo || '', - phonenumber: data.lawEnforcerIdTwo || '' + const extraNames = data.lawEnforcerTwo || data.lawEnforcerOther || ''; + const extraIds = data.lawEnforcerIdTwo || data.lawEnforcerIdOther || ''; + const extraTels = data.lawEnforcerTelOther || ''; + if (extraNames) { + const nameArr = extraNames.split(',').map(s => s.trim()).filter(Boolean); + const idArr = extraIds ? extraIds.split(',').map(s => s.trim()).filter(Boolean) : []; + const telArr = extraTels ? extraTels.split(',').map(s => s.trim()).filter(Boolean) : []; + nameArr.forEach((name, i) => { + additionalPersons.value.push({ + name: name, + id: idArr[i] || '', + phonenumber: telArr[i] || idArr[i] || '' + }); }); } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue index 91b940a9..13345c3e 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue @@ -102,7 +102,7 @@ const { useCommon } = $globalStore; const hasLaw = computed(() => !!useCommon.hasLaw); // ========== 全局 Loading ========== -const isLoading = ref(true); +const isLoading = ref(!useCommon.token); // 非执法人员点击受限模块时的提示 const checkLawPermission = () => {