联合执法

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

@@ -118,9 +118,9 @@
                         <van-radio :model-value="formData.uniteCheck" :name="String(group.groupId)" class="union-radio" />
                         <div class="union-item-content">
                             <template v-if="group.items.length === 1">
-                                <!-- <div class="union-item-title">{{ group.items[0].bureauDeptName || '联合执法' }}</div> -->
+                                 <div class="union-item-title">{{ group.items[0].bureauDeptName || '联合执法' }}</div> 
                                 <div v-if="group.items[0].deptTexts || group.items[0].lawText"
-                                    class="union-item-desc">{{ group.items[0].deptTexts || group.items[0].lawText }}</div>
+                                    class="union-item-desc">{{ group.items[0].deptTexts || group.items[0].lawText||group.items[0].bureauDeptName }}</div>
                             </template>
                             <template v-else>
                                 <!-- <div class="union-item-title">{{ group.items[0].bureauDeptName || '联合执法' }}</div> -->
@@ -324,7 +324,7 @@ const groupedUnionList = computed(() => {
     });
     return groups;
 });
-
+console.log(groupedUnionList.value);
 const selectUnion = (group) => {
     if (props.formData.uniteCheck === group.groupId) {
         props.formData.unionNo = '';

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

@@ -280,7 +280,7 @@ const handleOutOfCityEnterprise = () => {
 const handleLinkNotice = (notice) => {
     formData.relatedNotice = `${notice.enforceContent}`;
     formData.noticeId = notice.id;
-    formData.lawEnforcementItemText = notice.checkItem || '';
+    formData.lawEnforcementItemText = notice.enforceRequirement || '';
     formData.lawEnforcementItem = notice.id || '';
     formData.enforce = notice.enforceContent || '';
     formData.enforceReason = notice.enforceRequirement || '';

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_edit.vue

@@ -690,7 +690,11 @@ const doSubmit = (isDraft) => {
             publishing.value = false;
             if (res.code === 200) {
                 showSuccessToast(isDraft ? '已保存草稿' : '发布成功');
-                setTimeout(() => router.back(), 800);
+                // 保存草稿返回草稿tab，提交预告返回待执法预告tab
+                setTimeout(() => router.replace({
+                    path: '/enforcement/notice',
+                    query: { tab: isDraft ? 'draft' : 'pending' }
+                }), 800);
             } else {
                 showToast(res.msg || '操作失败');
             }

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue

@@ -69,13 +69,17 @@
 </template>
 
 <script setup name="cpNoticeList">
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { showConfirmDialog, showToast } from 'vant';
 import { deleteNotice, editNotice } from '@/api/enforcement/notice';
 import NoticeTabContent from './cp_notice_tab_content.vue';
 
 const router = useRouter();
-const activeTab = ref('draft');
+const route = useRoute();
+// 根据返回参数定位tab：保存草稿返回'draft'，提交预告返回'pending'
+const validTabs = ['pending', 'history', 'draft'];
+const queryTab = route.query.tab;
+const activeTab = ref(validTabs.includes(queryTab) ? queryTab : 'pending');
 
 const draftRef = ref(null);
 const pendingRef = ref(null);