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 @@
-
+
{{ getDictLabel(dict.yesNo, row.repeatt) }}
+ 合并历史
@@ -447,6 +455,12 @@
@close="mailboxShow = false"
/>
+
+
+
@@ -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