@@ -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 = () => {