From 653834fcc1efaef8d9c2a1969d0bd147605a1a1f Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Tue, 26 May 2026 11:10:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=95=E8=AF=89=E4=B8=BE=E6=8A=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E4=BF=A1=E4=BB=B6=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data/complaintCollection.ts         |  20 +
 src/components/data/MergeHistoryDialog.vue  | 236 +++++
 src/components/data/complaintformdialog.vue | 898 ++++++++++++++++----
 src/components/negative/description.vue     |  39 +-
 4 files changed, 1009 insertions(+), 184 deletions(-)
 create mode 100644 src/components/data/MergeHistoryDialog.vue

diff --git a/src/api/data/complaintCollection.ts b/src/api/data/complaintCollection.ts
index 5700887..d5a7783 100644
--- a/src/api/data/complaintCollection.ts
+++ b/src/api/data/complaintCollection.ts
@@ -114,3 +114,23 @@ export function initialReview(body) {
     });
 }
 
+/**
+ * 合并投诉记录
+ */
+export function mergeComplaintCollection(body) {
+    return request.post({
+        url: `/data/complaintCollection/mergeComplaintCollection`,
+        body
+    });
+}
+
+/**
+ * 查询合并历史
+ */
+export function getMergeHistory(body) {
+    return request.post({
+        url: `/data/complaintCollection/getMergeHistory`,
+        body
+    });
+}
+
diff --git a/src/components/data/MergeHistoryDialog.vue b/src/components/data/MergeHistoryDialog.vue
new file mode 100644
index 0000000..938a08f
--- /dev/null
+++ b/src/components/data/MergeHistoryDialog.vue
@@ -0,0 +1,236 @@
+<template>
+  <el-dialog
+      title="合并历史"
+      v-model="visibleProxy"
+      width="1400px"
+      top="8vh"
+      append-to-body
+      destroy-on-close
+  >
+    <div class="merge-history-container">
+      <el-empty v-if="!mergeHistory || !mergeHistory.merges || mergeHistory.merges.length === 0" description="暂无合并记录" />
+
+      <div v-else class="merge-list">
+        <div v-for="(item, index) in mergeHistory.merges" :key="index" class="merge-item">
+          <div class="merge-header">
+            <div class="source-tag">{{ formatSource(item) }}</div>
+            <div class="merge-time">合并时间：{{ item.mergeTime || '-' }}</div>
+          </div>
+          <div class="merge-content">
+            <div class="merge-row">
+              <span class="label">编号：</span>
+              <span class="value">{{ item.originId || '-' }}</span>
+            </div>
+            <div class="merge-row">
+              <span class="label">受理时间：</span>
+              <span class="value">{{ formatTime(item.discoveryTime) }}</span>
+            </div>
+            <div class="merge-row">
+              <span class="label">业务类别：</span>
+              <span class="value">{{ getDictLabel('businessType', item.businessTypeCode) }}</span>
+            </div>
+            <div class="merge-row">
+              <span class="label">被投诉机构：</span>
+              <span class="value">{{ item.secondDepartName || '-' }}</span>
+            </div>
+            <div class="merge-row">
+              <span class="label">举报人：</span>
+              <span class="value">{{ item.responderName || '-' }}</span>
+            </div>
+            <div class="merge-row">
+              <span class="label">身份证：</span>
+              <span class="value">{{ item.responderIdCode || '-' }}</span>
+            </div>
+            <div class="merge-row">
+              <span class="label">电话：</span>
+              <span class="value">{{ item.responderPhone || '-' }}</span>
+            </div>
+            <div class="merge-row">
+              <span class="label">附件：</span>
+              <span class="value">
+                <template v-if="item.files && item.files.length > 0">
+                  <span
+                      v-for="(file, fi) in item.files"
+                      :key="fi"
+                      class="file-link"
+                      @click="previewFile(file)"
+                  >
+                    {{ file.fileName || '附件' + (fi + 1) }}
+                  </span>
+                </template>
+                <template v-else>-</template>
+              </span>
+            </div>
+            <div class="merge-row full-width">
+              <span class="label">内容：</span>
+              <el-tooltip :content="item.thingDesc || '-'" placement="top" :disabled="!item.thingDesc">
+                <span class="value thing-desc">{{ item.thingDesc || '-' }}</span>
+              </el-tooltip>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import feedback from "@/utils/feedback";
+import useCatchStore from "@/stores/modules/catch";
+
+const catchStore = useCatchStore()
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  mergeHistory: {
+    type: Object,
+    default: null
+  }
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const visibleProxy = computed({
+  get: () => props.modelValue,
+  set: (v) => emit('update:modelValue', v)
+})
+
+const dict = catchStore.getDicts(['sfssSourceTable', 'businessType'])
+
+// 字典翻译
+const getDictLabel = (dictType, value) => {
+  if (!value) return '-'
+  const dictList = dict[dictType] || []
+  const item = dictList.find(d => d.dictValue === value || d.dictValue == value)
+  return item ? item.dictLabel : value
+}
+
+const formatSource = (item) => {
+  const source = getDictLabel('sfssSourceTable', item.sourceTable)
+  const subOne = getDictLabel('sfssSourceTable', item.sourceTableSubOne)
+  if (!item.sourceTable) return '未知来源'
+  if (item.sourceTableSubOne) {
+    return `${source} / ${subOne}`
+  }
+  return source
+}
+
+const previewFile = (file) => {
+  if (!file.filePath) {
+    feedback.msgWarning('文件路径不存在')
+    return
+  }
+  const link = document.createElement('a')
+  link.href = file.filePath
+  link.download = file.fileName || '附件'
+  link.target = '_blank'
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+}
+
+const formatTime = (time) => {
+  if (!time) return '-'
+  // 处理 ISO 格式或普通格式
+  try {
+    const date = new Date(time)
+    const pad = n => n.toString().padStart(2, '0')
+    return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`
+  } catch {
+    return time
+  }
+}
+</script>
+
+<style scoped>
+.merge-history-container {
+  min-height: 500px;
+  max-height: 75vh;
+  overflow-y: auto;
+}
+
+.merge-list {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 12px;
+}
+
+.merge-item {
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  overflow: hidden;
+}
+
+.merge-header {
+  background: linear-gradient(135deg, #f5f7fa 0%, #e8ecf1 100%);
+  padding: 12px 16px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1px solid #e4e7ed;
+}
+
+.source-tag {
+  font-weight: bold;
+  font-size: 13px;
+  color: #409eff;
+}
+
+.merge-time {
+  font-size: 12px;
+  color: #909399;
+}
+
+.merge-content {
+  padding: 14px 16px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px 0;
+}
+
+.merge-row {
+  display: flex;
+  width: 50%;
+}
+
+.merge-row.full-width {
+  width: 100%;
+}
+
+.merge-row .label {
+  color: #606266;
+  flex-shrink: 0;
+  min-width: 70px;
+  font-weight: 500;
+}
+
+.merge-row .value {
+  color: #303133;
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: normal;
+  word-break: break-all;
+}
+
+.file-link {
+  color: #409eff;
+  cursor: pointer;
+  margin-right: 8px;
+}
+
+.file-link:hover {
+  text-decoration: underline;
+}
+
+.thing-desc {
+  color: #606266;
+  font-size: 13px;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+</style>
diff --git a/src/components/data/complaintformdialog.vue b/src/components/data/complaintformdialog.vue
index 9b8e972..d7fb088 100644
--- a/src/components/data/complaintformdialog.vue
+++ b/src/components/data/complaintformdialog.vue
@@ -2,38 +2,47 @@
   <el-dialog
       :title="mode === 'add' ? '添加登记来件' : '修改登记来件'"
       v-model="visibleProxy"
-      width="70vw"
+       width="75vw"
       top="2vh"
       style="margin-bottom: 0"
   >
-    <el-scrollbar max-height="76vh">
+    <!-- 步骤指示器（仅添加模式显示） -->
+    <el-steps v-if="mode === 'add'" :active="currentStep" finish-status="success" align-center class="mb-20">
+      <el-step title="填写投诉信息" />
+      <el-step title="查重结果" />
+      <el-step title="完善信息" />
+    </el-steps>
+
+    <el-scrollbar max-height="72vh">
       <el-form
           ref="formRef"
           :model="formData"
           :label-width="150"
           class="form-layout"
-          style="min-height: 66vh"
+          style="min-height: 60vh"
           :rules="rules"
       >
-        <!-- 投诉信息 -->
-        <h2>投诉信息</h2>
-        <div class="add-negation-container">
-          <!-- 来源 -->
-          <el-row>
-          <el-col :span="12">
-            <el-form-item label="来源" prop="sourcePath">
-              <el-cascader
-                  v-model="formData.sourcePath"
-                  :options="dict.sourceTableAndLevel"
-                  :props="{ emitPath: true, checkStrictly: false }"
-                  clearable
-                  filterable
-                  show-all-levels
-                  style="width: 100%"
-                  placeholder="请选择来源（一级/二级）"
-              />
-            </el-form-item>
-          </el-col>
+
+        <!-- ==================== 步骤1：投诉信息 ==================== -->
+        <div v-show="mode === 'add' ? currentStep === 0 : true">
+          <h2>投诉信息</h2>
+          <div class="add-negation-container">
+            <!-- 来源 -->
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="来源" prop="sourcePath">
+                  <el-cascader
+                      v-model="formData.sourcePath"
+                      :options="dict.sourceTableAndLevel"
+                      :props="{ emitPath: true, checkStrictly: false }"
+                      clearable
+                      filterable
+                      show-all-levels
+                      style="width: 100%"
+                      placeholder="请选择来源（一级/二级）"
+                  />
+                </el-form-item>
+              </el-col>
 
           <el-col :span="12">
             <el-form-item label="业务类别" prop="handleMethod">
@@ -113,44 +122,22 @@
           </el-col>
 
           <el-col :span="12">
-            <div style="display: flex; align-items: flex-start; gap: 8px;">
-              <el-form-item label="身份证号码" prop="responderIdCode" style="flex: 1; margin-bottom: 0;">
-                <el-input
-                    v-model="formData.responderIdCode"
-                    :placeholder="formData.responderIdCodeSkip ? '无' : '请输入身份证号码'"
-                    :disabled="formData.responderIdCodeSkip"
-                    @blur="onAutoCheckDuplicate"
-                >
-                  <template #append>
-                    <el-checkbox
-                        v-model="formData.responderIdCodeSkip"
-                        @change="(v) => v && (formData.responderIdCode = '')"
-                    >
-                      无
-                    </el-checkbox>
-                  </template>
-                </el-input>
-              </el-form-item>
-
-              <el-button
-                  type="primary"
-                  :loading="duplicateLoading"
-                  @click="onCheckDuplicate"
-              >
-                查看
-              </el-button>
-
-              <span
-                  v-if="duplicateHintVisible"
-                  style="margin-left: 8px; font-size: 12px;"
-                  :style="{ color: duplicateCount > 0 ? '#fa541c' : '#8c8c8c' }"
+            <el-form-item label="身份证号码" prop="responderIdCode">
+              <el-input
+                  v-model="formData.responderIdCode"
+                  :placeholder="formData.responderIdCodeSkip ? '无' : '请输入身份证号码'"
+                  :disabled="formData.responderIdCodeSkip"
               >
-          <template v-if="autoDuplicateLoading">查重中…</template>
-          <template v-else-if="duplicateCount > 0">疑似重复 {{ duplicateCount }} 条</template>
-          <template v-else>未发现重复</template>
-</span>
-
-            </div>
+                <template #append>
+                  <el-checkbox
+                      v-model="formData.responderIdCodeSkip"
+                      @change="(v) => v && (formData.responderIdCode = '')"
+                  >
+                    无
+                  </el-checkbox>
+                </template>
+              </el-input>
+            </el-form-item>
           </el-col>
         </el-row>
 
@@ -162,22 +149,18 @@
                   v-model="formData.responderPhone"
                   :placeholder="formData.responderPhoneSkip ? '无' : '请输入联系电话'"
                   :disabled="formData.responderPhoneSkip"
-                  @blur="onAutoCheckDuplicate"
               >
                 <template #append>
                   <el-checkbox
                       v-model="formData.responderPhoneSkip"
                       @change="(v) => v && (formData.responderPhone = '')"
-                  >
-                    无
-                  </el-checkbox>
+                  >无</el-checkbox>
                 </template>
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="被投诉二级机构" prop="secondDepartId" >
+            <el-form-item label="被投诉二级机构" prop="secondDepartId">
               <depart-tree-select
                   v-model="formData.secondDepartId"
                   :check-strictly="true"
@@ -196,63 +179,6 @@
           </el-col>
         </el-row>
 
-        <!-- 涉嫌问题 + 是否重复件 -->
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="涉嫌问题" prop="involveProblemIdList">
-              <el-select v-model="formData.involveProblemIdList" multiple clearable style="width: 100%">
-                <el-option
-                    v-for="item in dict.suspectProblem"
-                    :key="item.dictValue"
-                    :value="item.dictValue"
-                    :label="item.dictLabel"
-                >
-                  <!-- 复选框展示 -->
-                  <el-checkbox :model-value="(formData.involveProblemIdList || []).includes(item.dictValue)">
-                    {{ item.dictLabel }}
-                  </el-checkbox>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="是否重复件" prop="repeatt">
-              <el-radio-group v-model="formData.repeatt" clearable>
-                <el-radio v-for="item in dict.yesNo" :key="item.id" :label="item.dictValue">
-                  {{ item.dictLabel }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- 标签 -->
-        <el-row>
-          <el-col :span="18">
-            <el-form-item label="标签" prop="tags">
-              <el-checkbox-group v-model="formData.tags">
-                <el-checkbox v-for="item in dict.sfssTags" :key="item.id" :label="item.dictValue">
-                  {{ item.dictLabel }}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- 办理方式 -->
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="办理方式" prop="handleMethod">
-              <el-radio-group v-model="formData.handleMethod" clearable>
-                <el-radio v-for="item in dict.handleMethodType" :key="item.id" :label="item.dictValue">
-                  {{ item.dictLabel }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         <el-form-item v-if="mode === 'add'" label="附件" prop="thingFiles">
           <file-upload
               v-model:files="formData.thingFiles"
@@ -260,77 +186,397 @@
           />
         </el-form-item>
         </div>
+      </div>
 
-        <!-- 办理单位 -->
-        <el-divider v-if="mode === 'add'" />
-        <h2 v-if="mode === 'add'">办理单位</h2>
-        <div v-if="mode === 'add'" class="add-negation-container">
-          <el-form-item label="主办层级" prop="hostLevel" :rules="{ required: true, message: '请选择主办层级', trigger: ['blur'] }">
-            <el-select style="width: 280px" v-model="formData.hostLevel" @change="handleChangeHostLevel">
-              <el-option v-for="item in dict.hostLevel" :key="item.id" :label="item.dictLabel" :value="item.dictValue" />
-            </el-select>
-            <div class="tips mt-10">
-              <p>如主办层级 为 市局主办， 则由<span :data-active="formData.hostLevel === HostLevel.FIRST">督察支队</span>办理；</p>
-              <p>如主办层级为 二级机构主办，则由<span :data-active="formData.hostLevel === HostLevel.SECOND">督察部门</span>办理，可进一步下发；</p>
-              <p>如主办层级为 三级机构主办，则由<span :data-active="formData.hostLevel === HostLevel.THREE">所队</span>办理。</p>
-            </div>
-          </el-form-item>
-          <el-form-item label="指定办理单位" prop="departId" :rules="{ required: true, message: '请选择办理单位', trigger: ['blur'] }">
-            <div class="flex gap">
-              <div style="width: 280px">
-                <template v-if="formData.hostLevel === HostLevel.THREE">
-                  <depart-tree-select v-model="formData.departId" v-loading="departLoading" />
-                </template>
-                <el-tree-select v-else :data="departs" :props="{ label: 'shortName', value: 'id' }" node-key="id" clearable filterable v-model="formData.departId" @node-click="handleSelectDepart" check-strictly style="width: 280px" v-loading="departLoading" />
+      <!-- ==================== 步骤2：查重结果 ==================== -->
+      <div v-if="mode === 'add' && currentStep === 1" class="step2-container">
+        <h2>查重结果</h2>
+
+        <!-- 当前填写信息摘要 -->
+        <div class="current-info-bar">
+          <el-alert type="info" :closable="false" show-icon>
+            <template #title>
+              <span class="info-label">当前填写信息：</span>
+              <span v-if="formData.responderName">姓名: <strong>{{ formData.responderName }}</strong></span>
+              <span v-if="formData.responderIdCode"> | 身份证: <strong>{{ formData.responderIdCode }}</strong></span>
+              <span v-if="formData.responderPhone"> | 电话: <strong>{{ formData.responderPhone }}</strong></span>
+            </template>
+          </el-alert>
+        </div>
+
+          <!-- 重复记录列表 -->
+          <div class="duplicate-list" v-loading="duplicateLoading">
+            <el-empty v-if="duplicateList.length === 0 && !duplicateLoading" description="未发现重复记录，您可以继续添加" />
+            <el-result v-else-if="duplicateList.length > 0 && !selectedCardId" icon="warning" title="发现疑似重复记录">
+              <template #sub-title>
+                <p style="color: #909399;">请从下方列表选择一条记录进行合并，或选择"不合并，继续添加"</p>
+              </template>
+            </el-result>
+
+            <div v-if="duplicateList.length > 0" class="card-grid">
+              <div
+                  v-for="item in duplicateList"
+                  :key="item.complaintId || item.negativeId"
+                  class="merge-card"
+                  :class="{ 'is-selected': selectedCardId === (item.complaintId || item.negativeId) }"
+                  @click="handleSelectCard(item)"
+              >
+                <!-- 卡片头部 -->
+                <div class="card-header">
+                  <el-tag size="small" :type="getSourceTagType(item.sourceTable)">
+                    {{ item.sourceTable || '未知来源' }}
+                  </el-tag>
+                  <span class="origin-id">{{ item.originId || '无编号' }}</span>
+                  <div class="card-checkbox">
+                    <el-checkbox
+                        :model-value="selectedCardId === (item.complaintId || item.negativeId)"
+                        @click.stop
+                        @change="handleSelectCard(item)"
+                    />
+                  </div>
+                </div>
+
+                <!-- 举报人信息 -->
+                <div class="card-info">
+                  <div v-if="item.responderName" class="info-row">
+                    <span class="label">举报人</span>
+                    <span class="value">{{ item.responderName }}</span>
+                  </div>
+                  <div v-if="item.responderIdCode" class="info-row">
+                    <span class="label">身份证</span>
+                    <span class="value">{{ item.responderIdCode }}</span>
+                  </div>
+                  <div v-if="item.responderPhone" class="info-row">
+                    <span class="label">联系电话</span>
+                    <span class="value">{{ item.responderPhone }}</span>
+                  </div>
+                </div>
+
+                <!-- 投诉内容 -->
+                <div class="card-content">
+                  <div class="content-label">投诉内容</div>
+                  <div class="content-text">{{ item.thingDesc || '无内容' }}</div>
+                </div>
+
+                <!-- 卡片底部 -->
+                <div class="card-footer">
+                  <span class="time">{{ formatTime(item.discoveryTime) }}</span>
+                  <el-button type="primary" link @click.stop="handleViewDetail(item)">
+                    <el-icon><View /></el-icon> 查看详情
+                  </el-button>
+                </div>
+
+                <!-- 选中标记 -->
+                <div v-if="selectedCardId === (item.complaintId || item.negativeId)" class="selected-badge">
+                  <el-icon><Check /></el-icon> 已选择
+                </div>
               </div>
-              <el-button type="primary" @click="handleLinkDepart" text v-if="formData.hostLevel !== HostLevel.FIRST">关联问题涉及单位</el-button>
             </div>
-            <div class="tips mt-10">
-              <p>问题涉及单位 指与该问题相关的单位；</p>
-              <p>指定办理单位 指将问题分派给哪个单位办理。</p>
-            </div>
-          </el-form-item>
+          </div>
         </div>
 
-        <!-- 初核时限 -->
-        <h2 v-if="mode === 'add'">初核时限</h2>
-        <p v-if="mode === 'add'" style="color: #909399; font-size: 14px; line-height: 1.6; padding-left: 200px;">
-          该信件的初核时限需在<span style="color: var(--el-color-danger); font-weight: 600;"> 4个工作日 </span>之内完成初核。
-        </p>
-
-        <!-- 办理时限 -->
-        <h2 v-if="mode === 'add'">办理时限</h2>
-        <div v-if="mode === 'add'" class="add-negation-container">
-          <el-form-item label="办理时限" prop="timeLimit" :rules="{ required: true, message: '请选择办理时限', trigger: ['blur'] }">
-            <time-limit-select :key="timeLimitKey" v-model="formData.timeLimit" v-model:maxSignDuration="formData.maxSignDuration" v-model:maxHandleDuration="formData.maxHandleDuration" v-model:maxExtensionDuration="formData.maxExtensionDuration" />
-          </el-form-item>
-        </div>
+        <!-- ==================== 步骤3：完善信息 ==================== -->
+        <div v-if="mode === 'add' && currentStep === 2 && !isMerging">
+          <!-- 来源 + 业务类别 -->
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="来源" prop="sourcePath">
+                <el-cascader
+                    v-model="formData.sourcePath"
+                    :options="dict.sourceTableAndLevel"
+                    :props="{ emitPath: true, checkStrictly: false }"
+                    clearable
+                    filterable
+                    show-all-levels
+                    style="width: 100%"
+                    placeholder="请选择来源（一级/二级）"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="业务类别" prop="businessTypeCode">
+                <el-select v-model="formData.businessTypeCode" placeholder="业务类别" clearable style="width: 100%">
+                  <el-option
+                      v-for="item in dict.businessType"
+                      :key="item.id"
+                      :label="item.dictLabel"
+                      :value="item.dictValue"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <!-- 审批流程 -->
-        <h2 v-if="mode === 'add'">审批流程</h2>
-        <div v-if="mode === 'add'" class="add-negation-container">
-          <el-form-item label="审批流程" prop="approvalFlow" :rules="{ required: true, message: '请选择审批流程', trigger: ['blur'] }">
-            <el-radio-group v-model="formData.approvalFlow" v-if="userStore.user.roleCodes.includes('admin_1')">
-              <el-radio v-for="item in dict.approvalFlow" :key="item.dictCode" :value="item.dictValue">{{ item.dictLabel }}{{ item.remark ? `(${item.remark})` : "" }}</el-radio>
-            </el-radio-group>
-            <el-radio-group v-model="formData.approvalFlow" v-else>
-              <el-radio value="2">二级审批(所队一>二级机构)</el-radio>
-            </el-radio-group>
-            <div class="tips mt-10">
-              <p v-if="userStore.user.roleCodes.includes('admin_1')">三级审核　问题提交办结时，需经过"所队—>二级机构—>市局"三级审核，通过后方可办结；</p>
-              <p>二级审核　问题提交办结时，仅需经过"所队—>二级机构"两级审核，通过后即可办结；</p>
-            </div>
+          <!-- 编号 + 登记时间 -->
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="编号" prop="originId">
+                <el-input
+                    v-model="formData.originId"
+                    :placeholder="formData.originIdSkip ? '无' : '请输入编号'"
+                    :disabled="mode === 'edit' || formData.originIdSkip"
+                >
+                  <template #append>
+                    <el-checkbox
+                        v-model="formData.originIdSkip"
+                        @change="(v) => v && (formData.originId = '')"
+                        :disabled="mode === 'edit'"
+                    >无</el-checkbox>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="登记/受理时间" prop="discoveryTime">
+                <el-date-picker
+                    v-model="formData.discoveryTime"
+                    type="datetime"
+                    placeholder="请选择"
+                    value-format="YYYY-MM-DDTHH:mm:ss"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 来件人姓名 + 身份证号码 -->
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="来件人姓名" prop="responderName">
+                <el-input
+                    v-model="formData.responderName"
+                    :placeholder="formData.responderNameSkip ? '无' : '请输入来件人姓名'"
+                    :disabled="formData.responderNameSkip"
+                >
+                  <template #append>
+                    <el-checkbox
+                        v-model="formData.responderNameSkip"
+                        @change="(v) => v && (formData.responderName = '')"
+                    >无</el-checkbox>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="身份证号码" prop="responderIdCode">
+                <el-input
+                    v-model="formData.responderIdCode"
+                    :placeholder="formData.responderIdCodeSkip ? '无' : '请输入身份证号码'"
+                    :disabled="formData.responderIdCodeSkip"
+                >
+                  <template #append>
+                    <el-checkbox
+                        v-model="formData.responderIdCodeSkip"
+                        @change="(v) => v && (formData.responderIdCode = '')"
+                    >无</el-checkbox>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 联系电话 + 被投诉二级机构 -->
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="responderPhone">
+                <el-input
+                    v-model="formData.responderPhone"
+                    :placeholder="formData.responderPhoneSkip ? '无' : '请输入联系电话'"
+                    :disabled="formData.responderPhoneSkip"
+                >
+                  <template #append>
+                    <el-checkbox
+                        v-model="formData.responderPhoneSkip"
+                        @change="(v) => v && (formData.responderPhone = '')"
+                    >无</el-checkbox>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="被投诉二级机构" prop="secondDepartId">
+                <depart-tree-select
+                    v-model="formData.secondDepartId"
+                    :check-strictly="true"
+                    @node-click="(row) => (formData.secondDepartName = row.shortName)"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 来件内容 -->
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="来件内容" prop="thingDesc">
+                <el-input v-model="formData.thingDesc" type="textarea" :autosize="{ minRows: 4 }" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 涉嫌问题 + 是否重复件 -->
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="涉嫌问题" prop="involveProblemIdList">
+                <el-select v-model="formData.involveProblemIdList" multiple clearable style="width: 100%">
+                  <el-option
+                      v-for="item in dict.suspectProblem"
+                      :key="item.dictValue"
+                      :value="item.dictValue"
+                      :label="item.dictLabel"
+                  >
+                    <el-checkbox :model-value="(formData.involveProblemIdList || []).includes(item.dictValue)">
+                      {{ item.dictLabel }}
+                    </el-checkbox>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否重复件" prop="repeatt">
+                <el-radio-group v-model="formData.repeatt" clearable>
+                  <el-radio v-for="item in dict.yesNo" :key="item.id" :label="item.dictValue">
+                    {{ item.dictLabel }}
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 标签 -->
+          <el-row>
+            <el-col :span="18">
+              <el-form-item label="标签" prop="tags">
+                <el-checkbox-group v-model="formData.tags">
+                  <el-checkbox v-for="item in dict.sfssTags" :key="item.id" :label="item.dictValue">
+                    {{ item.dictLabel }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 办理方式 -->
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="办理方式" prop="handleMethod">
+                <el-radio-group v-model="formData.handleMethod" clearable>
+                  <el-radio v-for="item in dict.handleMethodType" :key="item.id" :label="item.dictValue">
+                    {{ item.dictLabel }}
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 附件 -->
+          <el-form-item label="附件" prop="thingFiles">
+            <file-upload
+                v-model:files="formData.thingFiles"
+                tips="为便于「办理单位」更全面了解问题详情，请上传相关附件，如现场督察、数字督察等相关照片、视频及其他佐证材料。"
+            />
           </el-form-item>
+
+          <!-- 办理单位 -->
+          <h2>办理单位</h2>
+          <div class="add-negation-container">
+            <el-form-item label="主办层级" prop="hostLevel" :rules="{ required: true, message: '请选择主办层级', trigger: ['blur'] }">
+              <el-select style="width: 280px" v-model="formData.hostLevel" @change="handleChangeHostLevel">
+                <el-option v-for="item in dict.hostLevel" :key="item.id" :label="item.dictLabel" :value="item.dictValue" />
+              </el-select>
+              <div class="tips mt-10">
+                <p>如主办层级 为 市局主办， 则由<span :data-active="formData.hostLevel === HostLevel.FIRST">督察支队</span>办理；</p>
+                <p>如主办层级为 二级机构主办，则由<span :data-active="formData.hostLevel === HostLevel.SECOND">督察部门</span>办理，可进一步下发；</p>
+                <p>如主办层级为 三级机构主办，则由<span :data-active="formData.hostLevel === HostLevel.THREE">所队</span>办理。</p>
+              </div>
+            </el-form-item>
+            <el-form-item label="指定办理单位" prop="departId" :rules="{ required: true, message: '请选择办理单位', trigger: ['blur'] }">
+              <div class="flex gap">
+                <div style="width: 280px">
+                  <template v-if="formData.hostLevel === HostLevel.THREE">
+                    <depart-tree-select v-model="formData.departId" v-loading="departLoading" />
+                  </template>
+                  <el-tree-select v-else :data="departs" :props="{ label: 'shortName', value: 'id' }" node-key="id" clearable filterable v-model="formData.departId" @node-click="handleSelectDepart" check-strictly style="width: 280px" v-loading="departLoading" />
+                </div>
+                <el-button type="primary" @click="handleLinkDepart" text v-if="formData.hostLevel !== HostLevel.FIRST">关联问题涉及单位</el-button>
+              </div>
+              <div class="tips mt-10">
+                <p>问题涉及单位 指与该问题相关的单位；</p>
+                <p>指定办理单位 指将问题分派给哪个单位办理。</p>
+              </div>
+            </el-form-item>
+          </div>
+
+          <h2>初核时限</h2>
+          <p style="color: #909399; font-size: 14px; line-height: 1.6; padding-left: 200px;">
+            该信件的初核时限需在<span style="color: var(--el-color-danger); font-weight: 600;"> 4个工作日 </span>之内完成初核。
+          </p>
+
+          <h2>办理时限</h2>
+          <div class="add-negation-container">
+            <el-form-item label="办理时限" prop="timeLimit" :rules="{ required: true, message: '请选择办理时限', trigger: ['blur'] }">
+              <time-limit-select :key="timeLimitKey" v-model="formData.timeLimit" v-model:maxSignDuration="formData.maxSignDuration" v-model:maxHandleDuration="formData.maxHandleDuration" v-model:maxExtensionDuration="formData.maxExtensionDuration" />
+            </el-form-item>
+          </div>
+
+          <h2>审批流程</h2>
+          <div class="add-negation-container">
+            <el-form-item label="审批流程" prop="approvalFlow" :rules="{ required: true, message: '请选择审批流程', trigger: ['blur'] }">
+              <el-radio-group v-model="formData.approvalFlow" v-if="userStore.user.roleCodes.includes('admin_1')">
+                <el-radio v-for="item in dict.approvalFlow" :key="item.dictCode" :value="item.dictValue">{{ item.dictLabel }}{{ item.remark ? `(${item.remark})` : "" }}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="formData.approvalFlow" v-else>
+                <el-radio value="2">二级审批(所队一>二级机构)</el-radio>
+              </el-radio-group>
+              <div class="tips mt-10">
+                <p v-if="userStore.user.roleCodes.includes('admin_1')">三级审核　问题提交办结时，需经过"所队—>二级机构—>市局"三级审核，通过后方可办结；</p>
+                <p>二级审核　问题提交办结时，仅需经过"所队—>二级机构"两级审核，通过后即可办结；</p>
+              </div>
+            </el-form-item>
+          </div>
         </div>
       </el-form>
     </el-scrollbar>
 
+    <!-- 底部按钮（根据步骤显示不同按钮） -->
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="visibleProxy = false" size="large">取消</el-button>
-        <el-button type="primary" @click="onSubmit" size="large" :loading="loading || submitLoading">
-          {{ mode === 'add' ? '添加' : '修改' }}
-        </el-button>
+        <!-- 修改模式：保持原有按钮 -->
+        <template v-if="mode === 'edit'">
+          <el-button @click="visibleProxy = false" size="large">取消</el-button>
+          <el-button type="primary" @click="onSubmit" size="large" :loading="loading || submitLoading">修改</el-button>
+        </template>
+
+        <!-- 添加模式步骤1 -->
+        <template v-else-if="currentStep === 0">
+          <el-button @click="visibleProxy = false" size="large">取消</el-button>
+          <el-button type="primary" @click="handleNextStep" size="large" :loading="duplicateLoading">
+            下一步 查重
+          </el-button>
+        </template>
+
+        <!-- 添加模式步骤2：查重结果 -->
+        <template v-else-if="currentStep === 1">
+          <el-button @click="handlePrevStep" size="large">上一步</el-button>
+          <el-button type="info" @click="handleSkipMerge" size="large" :loading="submitLoading">
+            不合并，继续添加
+          </el-button>
+          <el-button
+              type="primary"
+              @click="handleConfirmMerge"
+              size="large"
+              :disabled="!selectedCardId"
+              :loading="mergeLoading"
+          >
+            确认合并到已选记录
+          </el-button>
+        </template>
+
+        <!-- 添加模式步骤3：完善信息 -->
+        <template v-else-if="currentStep === 2">
+          <el-button @click="handlePrevStep" size="large">上一步</el-button>
+          <el-button type="primary" @click="onSubmit" size="large" :loading="submitLoading">添加</el-button>
+        </template>
       </div>
     </template>
   </el-dialog>
@@ -366,7 +612,7 @@
 
 <script setup>
 import {computed, ref, watch} from "vue";
-import {maileRepeatt, getComplaintCollectionDetail, updateComplaintCollection, addComplaintCollection} from "@/api/data/complaintCollection.ts";
+import {maileRepeatt, getComplaintCollectionDetail, updateComplaintCollection, addComplaintCollection, mergeComplaintCollection} from "@/api/data/complaintCollection.ts";
 import dayjs from "dayjs";
 import feedback from "@/utils/feedback.ts";
 import DuplicateDrawerWithDetail from "@/views/data/DuplicateDrawerWithDetail.vue";
@@ -517,6 +763,129 @@ const formRef = ref();
 const submitLoading = ref(false);
 const timeLimitKey = ref(0);
 
+// 步骤控制
+const currentStep = ref(0)
+const isMerging = ref(false)
+const selectedCardId = ref(null)
+const selectedCard = ref(null)
+const mergeLoading = ref(false)
+
+// 步骤切换方法
+const handleNextStep = async () => {
+  try {
+    await formRef.value.validate()
+  } catch {
+    feedback.msgWarning("请完善必填信息")
+    return
+  }
+  currentStep.value = 1
+  await fetchDuplicateList()
+}
+
+const handlePrevStep = () => {
+  currentStep.value--
+}
+
+const handleSkipMerge = async () => {
+  isMerging.value = false
+  formData.value.repeatt = '0' // 默认设置为"否"
+  currentStep.value = 2
+}
+
+const handleConfirmMerge = async () => {
+  if (!selectedCardId.value) {
+    feedback.msgWarning("请选择一个记录进行合并")
+    return
+  }
+
+  mergeLoading.value = true
+  try {
+    await mergeComplaintCollection({
+      targetId: selectedCardId.value,
+      sourceTable: formData.value.sourceTable,
+      sourceTableSubOne: formData.value.sourceTableSubOne,
+      originId: formData.value.originId,
+      discoveryTime: formData.value.discoveryTime,
+      businessTypeCode: formData.value.businessTypeCode,
+      responderName: formData.value.responderName,
+      responderIdCode: formData.value.responderIdCode,
+      responderPhone: formData.value.responderPhone,
+      secondDepartId: formData.value.secondDepartId,
+      secondDepartName: formData.value.secondDepartName,
+      thingDesc: formData.value.thingDesc,
+      files: JSON.stringify(formData.value.thingFiles || [])
+    })
+
+    feedback.msgSuccess("合并成功")
+    visibleProxy.value = false
+    emit("updateSuccess")
+  } catch (e) {
+    console.error("合并失败", e)
+    feedback.notifyError("合并失败")
+  } finally {
+    mergeLoading.value = false
+  }
+}
+
+// 获取查重列表
+const fetchDuplicateList = async () => {
+  duplicateLoading.value = true
+  try {
+    const body = {
+      responderIdCode: formData.value.responderIdCode,
+      responderName: formData.value.responderName,
+      responderPhone: formData.value.responderPhone,
+    }
+    const res = await maileRepeatt(body)
+    duplicateList.value = res?.complaintCollectionRepeatDTOS || []
+  } catch (e) {
+    console.error("查重失败", e)
+  } finally {
+    duplicateLoading.value = false
+  }
+}
+
+// 选择卡片
+const handleSelectCard = (item) => {
+  const id = item.complaintId || item.negativeId
+  if (selectedCardId.value === id) {
+    selectedCardId.value = null
+    selectedCard.value = null
+  } else {
+    selectedCardId.value = id
+    selectedCard.value = item
+  }
+}
+
+// 辅助函数
+const maskIdCode = (idCode) => {
+  if (!idCode) return '-'
+  if (idCode.length >= 10) {
+    return idCode.substring(0, 6) + '****' + idCode.substring(idCode.length - 4)
+  }
+  return idCode
+}
+
+const maskPhone = (phone) => {
+  if (!phone) return '-'
+  if (phone.length >= 7) {
+    return phone.substring(0, 3) + '****' + phone.substring(phone.length - 4)
+  }
+  return phone
+}
+
+const formatTime = (time) => {
+  if (!time) return '-'
+  return dayjs(time).format('YYYY-MM-DD HH:mm')
+}
+
+const getSourceTagType = (source) => {
+  if (!source) return 'info'
+  if (source.includes('局长信箱')) return 'success'
+  if (source.includes('12389')) return 'warning'
+  return 'primary'
+}
+
 const visibleProxy = computed({
   get: () => props.modelValue,
   set: (v) => emit("update:modelValue", v),
@@ -526,9 +895,15 @@ watch(
     () => visibleProxy.value,
     async (v) => {
       if (v) {
-        // 重置表单
+        // 重置表单和步骤状态
         timeLimitKey.value++
-        formData.value = createEmptyForm();
+        formData.value = createEmptyForm()
+
+        // 重置步骤状态
+        currentStep.value = 0
+        isMerging.value = false
+        selectedCardId.value = null
+        selectedCard.value = null
 
         duplicateDrawerVisible.value = false
         duplicateLoading.value = false
@@ -723,6 +1098,7 @@ async function onSubmit() {
 const duplicateDrawerVisible = ref(false)
 const duplicateList = ref([])
 const duplicateLoading = ref(false)
+
 const onCheckDuplicate = async () => {
   duplicateDrawerVisible.value = true
 }
@@ -784,6 +1160,11 @@ const handleDuplicateRowClick = (row) => {
   }
 }
 
+// 处理查看详情
+const handleViewDetail = (item) => {
+  handleDuplicateRowClick(item)
+}
+
 </script>
 
 <style lang="scss" scoped>
@@ -883,4 +1264,155 @@ h2 {
   font-size: 16px;
   font-weight: 600;
 }
+
+// 步骤2样式
+.mb-20 {
+  margin-bottom: 20px;
+}
+
+.step2-container {
+  min-height: 400px;
+  padding: 0 20px;
+}
+
+.current-info-bar {
+  margin-bottom: 20px;
+  padding: 0 20px;
+
+  .info-label {
+    font-weight: 600;
+  }
+}
+
+.duplicate-list {
+  min-height: 200px;
+}
+
+.card-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 16px;
+  padding: 0 20px;
+}
+
+.merge-card {
+  position: relative;
+  border: 2px solid #e8e8e8;
+  border-radius: 10px;
+  background: #fff;
+  transition: all 0.25s ease;
+  overflow: hidden;
+  cursor: pointer;
+
+  &:hover {
+    border-color: #409eff;
+    box-shadow: 0 4px 12px rgba(64, 158, 255, 0.15);
+  }
+
+  &.is-selected {
+    border-color: #67c23a;
+    border-width: 3px;
+    background: linear-gradient(135deg, #f0f9eb 0%, #ffffff 100%);
+    box-shadow: 0 6px 20px rgba(103, 194, 58, 0.35);
+    transform: scale(1.02);
+  }
+
+  .card-header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 12px 14px;
+    border-bottom: 1px solid #f0f0f0;
+    background: #fafafa;
+
+    .origin-id {
+      font-weight: 600;
+      color: #303133;
+      flex: 1;
+    }
+
+    .card-checkbox {
+      margin-left: auto;
+    }
+  }
+
+  .card-info {
+    padding: 12px 14px;
+    background: #f9f9f9;
+
+    .info-row {
+      display: flex;
+      margin-bottom: 6px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .label {
+        color: #909399;
+        width: 70px;
+        flex-shrink: 0;
+      }
+
+      .value {
+        color: #303133;
+      }
+    }
+  }
+
+  .card-content {
+    padding: 12px 14px;
+
+    .content-label {
+      font-size: 12px;
+      color: #909399;
+      margin-bottom: 4px;
+    }
+
+    .content-text {
+      color: #606266;
+      font-size: 13px;
+      line-height: 1.5;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+    }
+  }
+
+  .card-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 14px;
+    border-top: 1px solid #f0f0f0;
+
+    .time {
+      color: #909399;
+      font-size: 12px;
+    }
+  }
+
+  .selected-badge {
+    position: absolute;
+    top: 0;
+    right: 0;
+    background: linear-gradient(135deg, #67c23a 0%, #5daf34 100%);
+    color: #fff;
+    font-size: 13px;
+    font-weight: 600;
+    padding: 6px 14px;
+    border-radius: 0 8px 0 8px;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    box-shadow: 0 2px 8px rgba(103, 194, 58, 0.4);
+    letter-spacing: 1px;
+    text-transform: uppercase;
+
+    .el-icon {
+      font-size: 14px;
+    }
+  }
+}
 </style>
diff --git a/src/components/negative/description.vue b/src/components/negative/description.vue
index c6242db..3425030 100644
--- a/src/components/negative/description.vue
+++ b/src/components/negative/description.vue
@@ -60,7 +60,14 @@
             </div>
           <div class="col col-6" v-if="negative.sourceType === '2' && negative.currentRow?.repeatt">
             <label>是否重复件</label>
-            <span>{{ getDictLable(dict.yesNo, negative.currentRow.repeatt) }}</span>
+            <span>{{ getDictLable(dict.yesNo, negative.currentRow.repeatt) }}<el-button
+                v-if="negative.currentRow?.mergeHistory"
+                type="primary"
+                size="small"
+                link
+                style="margin-left: 4px; padding: 0;"
+                @click="showMergeHistory"
+            >合并历史</el-button></span>
           </div>
           <div class="col col-6" v-if="negative.sourceType === '2' && negative.currentRow?.tag">
             <label>标签</label>
@@ -92,10 +99,40 @@
             <file-list :files="negative.thingFiles" />
         </div>
     </div>
+
+    <!-- 合并历史弹窗 -->
+    <MergeHistoryDialog
+        v-model="mergeHistoryDialogVisible"
+        :mergeHistory="mergeHistoryData"
+    />
 </template>
 <script setup>
+import { ref } from 'vue'
 import { getInvolveProblem ,getDictLable } from "@/utils/util";
+import MergeHistoryDialog from "@/components/data/MergeHistoryDialog.vue";
+import { getMergeHistory } from "@/api/data/complaintCollection.ts";
+
 const negative = inject('negative')
+const emit = defineEmits(['show-merge-history'])
+
+// 合并历史弹窗
+const mergeHistoryDialogVisible = ref(false)
+const mergeHistoryData = ref(null)
+
+const showMergeHistory = async () => {
+  if (negative.value?.currentRow?.id) {
+    try {
+      const res = await getMergeHistory({ id: negative.value.currentRow.id })
+      const data = res?.data || res
+      // 后端返回的是 JSON 字符串，需要解析
+      mergeHistoryData.value = typeof data === 'string' ? JSON.parse(data) : data
+    } catch (e) {
+      mergeHistoryData.value = null
+    }
+    mergeHistoryDialogVisible.value = true
+  }
+}
+
 import useCatchStore from "@/stores/modules/catch";
 const catchSotre = useCatchStore();
 const dict = catchSotre.getDicts([