guanyongjie 1 week ago
parent
commit
0463333fc2
2 changed files with 7 additions and 11 deletions
  1. 6 4
      src/views/news/NewsList.vue
  2. 1 7
      src/views/report/ReportDetail.vue

+ 6 - 4
src/views/news/NewsList.vue

@@ -393,8 +393,8 @@ const fetchNews = async () => {
     newsList.value = response.data.data.map((news) => ({
       ...news,
       isEditing: false,
-      categoryIds: news.categoryIds || [news.categoryId], // 初始化categoryIds数组
-      categoryNames: news.categoryNames || [news.categoryName], // 初始化categoryNames数组
+      categoryIds: news.categoryIds || [], // 初始化categoryIds数组
+      categoryNames: news.categoryNames || [], // 初始化categoryNames数组
     }))
     pagination.value.total = response.data.total
     // 下一帧恢复选中状态(确保表格渲染完成)
@@ -457,6 +457,10 @@ const fetchReports = async () => {
 }
 
 const saveNewsField = async (news: EditableNewsItem, field?: string) => {
+  if (news.categoryIds && news.categoryIds.length === 0) {
+    ElMessage.warning('请选择分类')
+    return
+  }
   try {
     // 如果没有指定字段,保存所有字段
     const updates: Partial<NewsItem> = field
@@ -483,8 +487,6 @@ const saveNewsField = async (news: EditableNewsItem, field?: string) => {
           categories.value.find(c => c.id === id)?.name
         ).filter(Boolean)
         news.categoryNames = categoryNames
-        news.categoryName = categoryNames[0] || news.categoryName
-        news.categoryId = news.categoryIds[0] || news.categoryId
       }
       // 清除原始数据
       news.originalData = undefined

+ 1 - 7
src/views/report/ReportDetail.vue

@@ -197,13 +197,7 @@ const fetchReportNews = async () => {
           }
           grouped[categoryName].push(news)
         })
-      } else if (news.categoryName) {
-        // 如果没有categoryNames数组但有categoryName,则使用单个分类名称
-        if (!grouped[news.categoryName]) {
-          grouped[news.categoryName] = []
-        }
-        grouped[news.categoryName].push(news)
-      }
+      } 
     })
     const arr = []
     for (const key in grouped) {