fix: 详情页面刷新错误问题

src/components/data/complaintformdialog.vue

@@ -160,11 +160,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="被投诉二级机构" prop="secondDepartId">
+            <el-form-item label="涉及单位" prop="involveDepartId">
               <depart-tree-select
-                  v-model="formData.secondDepartId"
+                  v-model="formData.involveDepartId"
                   :check-strictly="true"
-                  @node-click="(row) => (formData.secondDepartName = row.shortName)"
+                  @node-click="(row) => (formData.involveDepartName = row.shortName)"
               />
             </el-form-item>
           </el-col>
@@ -453,11 +453,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="被投诉二级机构" prop="secondDepartId">
+              <el-form-item label="涉及单位" prop="involveDepartId">
                 <depart-tree-select
-                    v-model="formData.secondDepartId"
+                    v-model="formData.involveDepartId"
                     :check-strictly="true"
-                    @node-click="(row) => (formData.secondDepartName = row.shortName)"
+                    @node-click="(row) => (formData.involveDepartName = row.shortName)"
                 />
               </el-form-item>
             </el-col>
@@ -700,9 +700,9 @@ function createEmptyForm() {
     responderIdCodeSkip: false,
     responderPhone: '',
     responderPhoneSkip: false,
-    // 被投诉机构
+    // 涉及单位
-    secondDepartId: '',
+    involveDepartId: '',
-    secondDepartName: '',
+    involveDepartName: '',
     // 内容
     thingDesc: '',
     involveProblemIdList: [],
@@ -735,7 +735,7 @@ const rules = {
     {required: true, message: "请选择来源（一级/二级）", trigger: "change"},
   ],
   discoveryTime: [{required: true, message: '请选择受理时间', trigger: 'change'}],
-  secondDepartId: [{required: true, message: '请选择被投诉二级机构', trigger: 'change'}],
+    involveDepartId: [{required: true, message: '请选择涉及单位', trigger: 'change'}],
   thingDesc: [{required: true, message: '请输入来件内容', trigger: 'blur'}],
   involveProblemIdList: [{required: true, message: '请选择涉嫌问题', trigger: 'change'}],
   repeatt: [{required: true, message: '请选择是否重复件', trigger: 'change'}],
@@ -987,8 +987,8 @@ watch(
             formData.value.responderName = r.responderName ?? '';
             formData.value.responderIdCode = r.responderIdCode ?? '';
             formData.value.responderPhone = r.responderPhone ?? '';
-            formData.value.secondDepartId = r.secondDepartId ?? '';
+            formData.value.involveDepartId = r.involveDepartId ?? '';
-            formData.value.secondDepartName = r.secondDepartName ?? '';
+            formData.value.involveDepartName = r.involveDepartName ?? '';
             formData.value.thingDesc = r.thingDesc ?? '';
             formData.value.repeatt = r.repeatt ?? '';
             formData.value.handleMethod = r.handleMethod ?? '';
@@ -1052,8 +1052,8 @@ function handleLinkDepart() {
     feedback.msgWarning("当前选择二级机构主办，指定办理单位请选择二级机构！");
     return;
   }
-  formData.value.departId = formData.value.secondDepartId;
+  formData.value.departId = formData.value.involveDepartId;
-  formData.value.departName = formData.value.secondDepartName;
+  formData.value.departName = formData.value.involveDepartName;
 }
 
 function handleChangeHostLevel(val) {

src/components/negative/dialog.vue

@@ -521,10 +521,19 @@ watch(
             formData.value = {};
             currentComplaintStage.value = STAGE_COMPLETION;
         }
-        
     }
 );
 
+// 新增：监听弹窗打开，强制刷新数据
+watch(visible, (newVal) => {
+    if (newVal) {
+        getDetails();
+        verifyEditFlag.value = false;
+        formData.value = {};
+        currentComplaintStage.value = STAGE_COMPLETION;
+    }
+});
+
 const confirmationCompletionFlag = ref(false);
 function getDetails() {
     loading.value = true;

src/views/data/ComplaintCollection.vue

@@ -285,8 +285,8 @@
                          :formatter="row => row.responderPhone ? row.responderPhone : '无'" show-overflow-tooltip/>
         <el-table-column label="被投诉机构" width="130" show-overflow-tooltip>
           <template #default="{ row }">
-            <span>{{ row.secondDepartName }}</span>
+            <span>{{ row.involveDepartName }}</span>
-            <span v-if="row.thirdDepartName"> {{ row.thirdDepartName }}</span>
+<!--            <span v-if="row.thirdDepartName"> {{ row.thirdDepartName }}</span>-->
           </template>
         </el-table-column>
         <el-table-column label="办理单位" width="160" show-overflow-tooltip>
@@ -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>