From 1f9f754e02b2413d7bde0dabc7d1a90110f62bd7 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Thu, 11 Jun 2026 12:09:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:tab=E8=A1=A8=E6=A0=BC=E4=B8=AD=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E5=90=88=E5=B9=B6=E5=8E=86=E5=8F=B2=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/ComplaintCollection.vue | 36 ++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/views/data/ComplaintCollection.vue b/src/views/data/ComplaintCollection.vue
index b322f1b..2932334 100644
--- a/src/views/data/ComplaintCollection.vue
+++ b/src/views/data/ComplaintCollection.vue
@@ -296,9 +296,17 @@
         </el-table-column>
         <el-table-column label="来信内容" width="100" prop="thingDesc" show-overflow-tooltip/>
         <el-table-column label="涉嫌问题" width="100" prop="involveProblemStr" show-overflow-tooltip/>
-        <el-table-column label="是否重复件" width="100">
+        <el-table-column label="是否重复件" width="120">
           <template #default="{ row }">
             {{ getDictLabel(dict.yesNo, row.repeatt) }}
+            <el-button
+                v-if="row.mergeHistory"
+                type="primary"
+                size="small"
+                link
+                style="margin-left: 4px; padding: 0;"
+                @click="showMergeHistory(row)"
+            >合并历史</el-button>
           </template>
         </el-table-column>
 
@@ -447,6 +455,12 @@
         @close="mailboxShow = false"
     />
 
+    <!-- 合并历史弹窗 -->
+    <MergeHistoryDialog
+        v-model="mergeHistoryDialogVisible"
+        :mergeHistory="mergeHistoryData"
+    />
+
 </template>
 
 
@@ -458,8 +472,10 @@ import {
   addComplaintCollection,
   delComplaintCollection, exportData,
   getComplaintCollectionPage, saveInvolveJson,
-  updateComplaintCollection
+  updateComplaintCollection,
+  getMergeHistory
 } from "@/api/data/complaintCollection.ts";
+import MergeHistoryDialog from "@/components/data/MergeHistoryDialog.vue";
 import useUserStore from "@/stores/modules/user.ts";
 
 const route = useRoute()
@@ -869,6 +885,22 @@ const handleExport = async () => {
   await exportData(body);
 }
 // endregion
+
+// region 合并历史相关
+const mergeHistoryDialogVisible = ref(false)
+const mergeHistoryData = ref(null)
+
+const showMergeHistory = async (row) => {
+  try {
+    const res = await getMergeHistory({ id: row.id })
+    const data = res?.data || res
+    mergeHistoryData.value = typeof data === 'string' ? JSON.parse(data) : data
+  } catch (e) {
+    mergeHistoryData.value = null
+  }
+  mergeHistoryDialogVisible.value = true
+}
+// endregion
 </script>