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 5af5a957..3d74865f 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 @@ -74,6 +74,11 @@ @cancel="showReasonPicker = false" /> + + + @@ -212,8 +217,8 @@ const unionLoading = ref(false); const showReasonPicker = ref(false); const reasonOptions = [ - { text: '企业拒绝出示监管码', value: '企业拒绝出示监管码' }, - { text: '系统未能有效生成监管码', value: '系统未能有效生成监管码' }, + { text: '企业原因', value: '企业原因' }, + { text: '系统原因', value: '系统原因' }, { text: '扫码未能显示企业信息', value: '扫码未能显示企业信息' }, { text: '其他', value: '其他' } ]; @@ -286,6 +291,9 @@ const onTimeConfirm = ({ selectedValues }) => { const selectReason = ({ selectedOptions }) => { props.formData.reason = selectedOptions[0]?.text || ''; + if (props.formData.reason !== '其他') { + props.formData.other_reasons = ''; + } showReasonPicker.value = false; }; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/messageState.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/messageState.js index 363b0d65..32cf4a6b 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/messageState.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/messageState.js @@ -10,8 +10,8 @@ export const pffwCount = ref(0); // 普法服务未读数量 export const zfpjcount = ref(0); // 执法反馈未读数量 export const zfygCount = ref(0); // 执法预告未读数量 export const jhtzcount = ref(0); // 计划通知未读数量 -export const zfywCount = ref(0); // 执法任务未读数量 -export const zfyyCount = ref(0); // 执法预约未读数量 +export const zfrwCount = ref(0); // 执法任务未读数量 +export const zfyqCount = ref(0); // 执法预约未读数量 /** 格式化为角标展示值(0 显示空) */ export const messageUnreadBadge = computed(() => (messageUnread.value > 0 ? messageUnread.value : '')); @@ -27,8 +27,8 @@ export const setMessageStats = (data) => { zfpjcount.value = Number(data.zfpjcount) || 0; zfygCount.value = Number(data.zfygCount) || 0; jhtzcount.value = Number(data.jhtzcount) || 0; - zfywCount.value = Number(data.zfywCount) || 0; - zfyyCount.value = Number(data.zfyyCount) || 0; + zfrwCount.value = Number(data.zfrwCount) || 0; + zfyqCount.value = Number(data.zfyqCount) || 0; messageUnread.value = Number(data.totalCount) || 0; }; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue index 1f72760a..b157cc1c 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue @@ -77,7 +77,7 @@ import { showToast } from 'vant'; import 'vant/es/toast/style'; import FooterBar from '@/components/FooterBar.vue'; import { getMessageUnreadCount } from '@/api/enforcement/index'; -import { pffwCount, zfpjcount, zfygCount, jhtzcount, zfywCount, zfyyCount, setMessageStats } from '@/store/messageState'; +import { pffwCount, zfpjcount, zfygCount, jhtzcount, zfrwCount, zfyqCount, setMessageStats } from '@/store/messageState'; const router = useRouter(); const route = useRoute(); @@ -172,7 +172,7 @@ const initTodoList = () => { time: '', icon: 'check', iconBg: 'icon-red', - unreadCount: zfywCount.value, + unreadCount: zfrwCount.value, }, { id: 103, @@ -181,7 +181,7 @@ const initTodoList = () => { time: '', icon: 'check', iconBg: 'icon-red', - unreadCount: zfyyCount.value, + unreadCount: zfyqCount.value, }, ]; }; @@ -252,20 +252,20 @@ const fetchTodoList = () => { { id: 102, title: '执法任务', - desc: zfywCount.value > 0 ? `您有${zfywCount.value}条执法任务,请及时查看` : '暂无执法任务', + desc: zfrwCount.value > 0 ? `您有${zfrwCount.value}条执法任务,请及时查看` : '暂无执法任务', time: '2026-04-15 09:30', icon: 'check', iconBg: 'icon-red', - unreadCount: zfywCount.value, + unreadCount: zfrwCount.value, }, { id: 103, title: '联合执法预约', - desc: zfyyCount.value > 0 ? `您有${zfyyCount.value}条联合执法预约,请及时查看` : '暂无联合执法预约', + desc: zfyqCount.value > 0 ? `您有${zfyqCount.value}条联合执法预约,请及时查看` : '暂无联合执法预约', time: '2026-04-15 09:30', icon: 'check', iconBg: 'icon-red', - unreadCount: zfyyCount.value, + unreadCount: zfyqCount.value, }, ]; todoRefreshing.value = false; @@ -361,7 +361,7 @@ const onTodoClick = (item) => { } }; -watch([pffwCount, zfpjcount, zfygCount, jhtzcount, zfywCount, zfyyCount], () => { +watch([pffwCount, zfpjcount, zfygCount, jhtzcount, zfrwCount, zfyqCount], () => { initMessageList(); initTodoList(); }); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue index cbde9ad8..48407bf4 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue @@ -334,8 +334,8 @@ const finished = ref(false); const error = ref(false); const reasonOptions = [ - '企业拒绝出示监管码', - '系统未能有效生成监管码', + '企业原因', + '系统原因', '扫码未能显示企业信息', '其他' ];