修改

src/views/about/news/index.vue

@@ -2,21 +2,26 @@
     <div class="p-3">
         <div class="bg-fff flex1 ov-hd d-flex flex-cln" v-show="showSearch">
             <div class="pd-16 border-bottom">
-                <div class="f-s-20 c-333 f-w-7 mb-10">协会动态</div>
+                <div class="f-s-20 c-333 f-w-7 mb-10">{{ selectDictLabel(new_type, queryParams.newsType) }}</div>
                 <div class="d-flex">
                     <div class="flex1 ov-hd d-flex j-ed">
                         <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto">
                             <el-form-item label="标题" prop="newsTitle">
-                                <el-input v-model="queryParams.newsTitle" placeholder="请输入标题" clearable style="width: 180px" @keyup.enter="handleQuery" />
+                                <el-input v-model="queryParams.newsTitle" placeholder="请输入标题" clearable
+                                    style="width: 180px" @keyup.enter="handleQuery" />
                             </el-form-item>
                             <el-form-item label="创建时间" prop="dateRange">
                                 <div class="d-flex" style="width: 180px">
-                                    <DateRange v-model="queryParams.dateRange" v-model:start-date="queryParams.startDate" v-model:end-date="queryParams.endDate"></DateRange>
+                                    <DateRange v-model="queryParams.dateRange"
+                                        v-model:start-date="queryParams.startDate"
+                                        v-model:end-date="queryParams.endDate"></DateRange>
                                 </div>
                             </el-form-item>
                             <el-form-item label="状态" prop="newsStatus">
-                                <el-select style="width: 140px" v-model="queryParams.newsStatus" clearable placeholder="请选择状态">
-                                    <el-option v-for="item in news_status" :key="item.value" :label="item.label" :value="item.value" />
+                                <el-select style="width: 140px" v-model="queryParams.newsStatus" clearable
+                                    placeholder="请选择状态">
+                                    <el-option v-for="item in news_status" :key="item.value" :label="item.label"
+                                        :value="item.value" />
                                 </el-select>
                             </el-form-item>
                             <el-form-item>
@@ -33,7 +38,9 @@
                     <!-- <div>
                         <searchTabs v-model="queryParams.newsType" @change="handleQuery" :list="new_type" key-label="label" key-value="value" :isNum="false"></searchTabs>
                     </div> -->
-                    <el-button type="primary" @click="router.push({ path: 'news-input', query: { newsType: queryParams.newsType } })">新增{{ selectDictLabel(new_type, queryParams.newsType)}}</el-button>
+                    <el-button type="primary"
+                        @click="router.push({ path: queryParams.newsType == '14' ? 'news-input' : 'noticeannounceninput', query: { newsType: queryParams.newsType } })">新增{{
+                            selectDictLabel(new_type, queryParams.newsType) }}</el-button>
                 </div>
                 <div class="flex1 ov-hd">
                     <vxe-table :loading="loading" border :data="dataList" min-height="0" max-height="100%">
@@ -56,7 +63,8 @@
                         </vxe-column>
                         <vxe-column title="操作" width="250" align="center" fixed="right">
                             <template #default="{ row }">
-                                <el-button type="text" size="small" @click="row.newsStatus === '1' ? unpublishNews(row) : publishNews(row)">
+                                <el-button type="text" size="small"
+                                    @click="row.newsStatus === '1' ? unpublishNews(row) : publishNews(row)">
                                     {{ row.newsStatus === '1' ? '下架' : '上架' }}
                                 </el-button>
                                 <el-button type="text" size="small" @click="editNews(row)">编辑</el-button>
@@ -65,7 +73,8 @@
                         </vxe-column>
                     </vxe-table>
                 </div>
-                <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+                <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+                    @pagination="getList" />
             </div>
         </div>
     </div>
@@ -77,6 +86,7 @@ import { publishNews as publishNewsApi, unpublishNews as unpublishNewsApi, remov
 import { DateRange } from '@/views/models/index';
 import { searchTabs } from '@/views/models';
 const router = useRouter();
+const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { news_status, new_type } = toRefs<any>(proxy?.useDict('news_status', 'new_type'));
 const loading = ref(true);
@@ -122,7 +132,7 @@ const resetQuery = () => {
 
 /** 编辑新闻 */
 const editNews = (row) => {
-    router.push({ path: `news-input`, query: { id: row.id, newsType: row?.newsType, newsStatus: row.newsStatus } });
+    router.push({ path: row?.newsType == '14' ? 'news-input' : 'noticeannounceninput', query: { id: row.id, newsType: row?.newsType, newsStatus: row.newsStatus } });
 };
 
 
@@ -168,6 +178,7 @@ const unpublishNews = async (row) => {
 };
 
 onMounted(() => {
+    queryParams.value.newsType = route.query?.newsType;
     getList();
 });
 </script>