Merge remote-tracking branch 'origin/dev' into dev

zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue

@@ -74,6 +74,11 @@
                 @cancel="showReasonPicker = false" />
         </van-popup>
 
+        <!-- 其他原因输入框（选择"其他"时显示） -->
+        <van-field v-if="formData.reason === '其他'" v-model="formData.other_reasons" name="other_reasons" label="其他原因"
+            placeholder="请输入其他原因" type="textarea" rows="3" maxlength="500" show-word-limit
+            :rules="[{ required: true, message: '请填写其他原因' }]" required />
+
         <!-- 执法时间（可选，近10天内） -->
         <van-field v-model="formData.enforcementTime" name="enforcementTime" label="执法时间" placeholder="请选择执法时间" readonly
             :is-link="canEditTime" :clearable="canEditTime" @click="canEditTime && openTimePicker()" />
@@ -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;
 };
 

zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/NonEnforcementInfoSection.vue

@@ -59,7 +59,20 @@
         </div>
 
         <!-- 原因 -->
-        <van-field v-model="formData.reason" name="reason" label="原因" placeholder="请输入原因" readonly />
+        <van-field v-model="formData.reason" name="reason" label="原因" :placeholder="formData.reason || '请选择'" readonly
+            :clickable="canSelectReason" :is-link="canSelectReason"
+            @click="canSelectReason && (showReasonPicker = true)" />
+
+        <!-- 原因选择弹窗 -->
+        <van-popup v-model:show="showReasonPicker" round position="bottom">
+            <van-picker :columns="reasonOptions" title="选择原因" @confirm="selectReason"
+                @cancel="showReasonPicker = false" />
+        </van-popup>
+
+        <!-- 其他原因输入框（选择"其他"时显示） -->
+        <van-field v-if="formData.reason === '其他'" v-model="formData.other_reasons" name="other_reasons" label="其他原因"
+            placeholder="请输入其他原因" type="textarea" rows="3" maxlength="500" show-word-limit
+            :rules="[{ required: true, message: '请填写其他原因' }]" required />
 
         <!-- 入企时间（可选，近10天内） -->
         <van-field v-model="formData.enforcementTime" name="enforcementTime" label="入企时间" placeholder="请选择入企时间"
@@ -95,6 +108,14 @@ const matterOptions = ref([]);
 // 弹窗显示状态
 const showMatterPicker = ref(false);
 const showTimePicker = ref(false);
+const showReasonPicker = ref(false);
+
+const reasonOptions = [
+    { text: '企业原因', value: '企业原因' },
+    { text: '系统原因', value: '系统原因' },
+    { text: '扫码未能显示企业信息', value: '扫码未能显示企业信息' },
+    { text: '其他', value: '其他' }
+];
 const datePickerValue = ref([]);
 const minDate = ref(new Date());
 const maxDate = ref(new Date());
@@ -106,6 +127,15 @@ const selectMatter = ({ selectedOptions }) => {
     showMatterPicker.value = false;
 };
 
+// 选择原因
+const selectReason = ({ selectedOptions }) => {
+    props.formData.reason = selectedOptions[0]?.text || '';
+    if (props.formData.reason !== '其他') {
+        props.formData.other_reasons = '';
+    }
+    showReasonPicker.value = false;
+};
+
 // 初始化加载入企事由字典、时间选择范围
 onMounted(() => {
     const range = getEnforcementTimeDateRange(10);
@@ -145,6 +175,10 @@ const props = defineProps({
     additionalPersons: {
         type: Array,
         default: () => []
+    },
+    canSelectReason: {
+        type: Boolean,
+        default: false
     }
 });
 

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;
 };
 

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue

@@ -25,7 +25,8 @@
 
             <!-- 活动信息组件（非行政执法模式） -->
             <NonEnforcementInfoSection v-else :form-data="formData" :default-person="enforcementPersons[0]"
-                :additional-persons="additionalPersons" @open-person-picker="handleOpenPersonPicker"
+                :additional-persons="additionalPersons" :can-select-reason="canSelectReason"
+                @open-person-picker="handleOpenPersonPicker"
                 @remove-person="handleRemovePerson" @open-basis-picker="handleOpenBasisPicker"
                 @add-basis="handleAddBasis" @remove-basis="handleRemoveBasis" @add-person="handleAddPerson" />
 

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();
 });

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 = [
-    '企业拒绝出示监管码',
-    '系统未能有效生成监管码',
+    '企业原因',
+    '系统原因',
     '扫码未能显示企业信息',
     '其他'
 ];