From 4caf69db074ebb8074e9c36872a501adc0fb2c72 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Thu, 7 May 2026 16:55:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AD=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/ComplaintCollection_12389ts.vue      | 160 ++++++++++-----
 src/views/data/ComplaintCollection_gabxf.vue  | 161 +++++++++++-----
 src/views/data/ComplaintCollection_gjxf.vue   | 158 ++++++++++-----
 src/views/data/ComplaintCollection_jzxx.vue   | 182 +++++++++++-------
 src/views/data/ComplaintCollection_ldxj.vue   | 160 ++++++++++-----
 5 files changed, 564 insertions(+), 257 deletions(-)

diff --git a/src/views/data/ComplaintCollection_12389ts.vue b/src/views/data/ComplaintCollection_12389ts.vue
index 5685c2c..c27398b 100644
--- a/src/views/data/ComplaintCollection_12389ts.vue
+++ b/src/views/data/ComplaintCollection_12389ts.vue
@@ -59,6 +59,14 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="涉及三级机构" prop="thirdDepartId">
+              <depart-tree-select
+                  v-model="query.thirdDepartId"
+                  :check-strictly="true"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="办理方式">
               <el-select
@@ -75,29 +83,17 @@
           <el-col :span="6">
             <el-form-item label="办理状态">
               <el-select
-                  v-model="query.status"
-                  clearable
-                  placeholder="办理状态"
-              >
-                <el-option value="0" label="未办理"/>
-                <el-option value="1" label="已办理"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标签">
-              <el-select
-                  placeholder="全部"
+                  v-model="query.processingStatus"
                   clearable
-                  v-model="query.tags"
                   multiple
                   collapse-tags
+                  placeholder="办理状态"
               >
                 <el-option
-                    v-for="item in dict.sfssTags"
+                    v-for="item in dict.processingStatus"
                     :key="item.id"
-                    :value="item.dictValue"
                     :label="item.dictLabel"
+                    :value="item.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -163,7 +159,6 @@
                     :value="item.dictValue"
                     :label="item.dictLabel"
                 >
-                  <!-- 复选框展示（和你弹窗里一致） -->
                   <el-checkbox :model-value="(query.involveProblemIdList || []).includes(item.dictValue)">
                     {{ item.dictLabel }}
                   </el-checkbox>
@@ -171,8 +166,40 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签">
+              <el-select
+                  placeholder="全部"
+                  clearable
+                  v-model="query.tags"
+                  multiple
+                  collapse-tags
+              >
+                <el-option
+                    v-for="item in dict.sfssTags"
+                    :key="item.id"
+                    :value="item.dictValue"
+                    :label="item.dictLabel"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="录入时间">
+              <date-time-range-picker-ext
+                  v-model="query.createTimeList"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="办理单位" prop="handleDepartId">
+              <depart-tree-select
+                  v-model="query.handleDepartId"
+                  placeholder="办理单位"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
-
       </el-form>
       <div class="mb-25 flex between">
         <div>
@@ -210,7 +237,17 @@
                          :formatter="row => row.responderIdCode ? row.responderIdCode : '无'" show-overflow-tooltip/>
         <el-table-column label="联系电话" width="100" prop="responderPhone"
                          :formatter="row => row.responderPhone ? row.responderPhone : '无'" show-overflow-tooltip/>
-        <el-table-column label="被投诉机构" width="130" prop="secondDepartName"/>
+        <el-table-column label="被投诉机构" width="130" show-overflow-tooltip>
+          <template #default="{ row }">
+            <span>{{ row.secondDepartName }}</span>
+            <span v-if="row.thirdDepartName"> {{ row.thirdDepartName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="办理单位" width="160" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.handleSecondDepartName || '' }}{{ row.handleThreeDepartName ? '/' + row.handleThreeDepartName : '' }}
+          </template>
+        </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">
@@ -221,16 +258,20 @@
 
         <el-table-column label="初核限时" width="150" align="center">
           <template #default="{ row }">
-            <!-- 有状态：显示状态文案 -->
             <el-tag v-if="row.gwf3>=1" :type="row.gwf3 === '2' ? 'danger' : 'success'">
               {{ row.gwf3 === '2' ? '超时完成初核' : '按时完成初核' }}
             </el-tag>
-
-            <!-- 无状态：显示倒计时 -->
             <countdown v-else :time="Number(row.remainingDuration || 0)"/>
           </template>
         </el-table-column>
 
+        <el-table-column
+            label="录入时间"
+            width="170"
+            prop="createTime"
+            :formatter="(_, __, v) => v ? timeFormat(v, 'yyyy-mm-dd hh:MM:ss') : '/'"
+            show-overflow-tooltip
+        />
         <el-table-column label="标签" width="100" show-overflow-tooltip>
           <template #default="{ row }">
             {{ getDictLabel(dict.sfssTags, row.tag) }}
@@ -263,23 +304,23 @@
         <el-table-column label="业务类别" width="100" prop="businessTypeName"/>
         <el-table-column label="核查结论" width="140" prop="checkStatus" show-overflow-tooltip>
           <template #default="{ row }">
-            {{ getDictLabel(dict.checkStatus, row.checkStatus) }}
+            {{ getDictLabel(dict.checkStatus, row.checkStatusCode) }}
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="status" width="100">
+        <el-table-column label="办理状态" prop="processingStatus" width="100">
           <template #default="{ row }">
-            <span :style="row.status === '0' ? 'color: red' : ''">
-              {{
-                row.status === '0' ? '未办理' :
-                    row.status === '1' ? '已办理' :
-                        '-'
-              }}
-    </span>
+            <el-tag
+                :type="row.processingStatus === 'completed' ? 'success' : 'primary'"
+                v-if="row.processingStatus"
+            >
+              {{ getDictLabel(dict.processingStatus, row.processingStatus) }}
+            </el-tag>
+            <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100" fixed="right">
+        <el-table-column label="操作" width="120" fixed="right">
           <template #default="{ row }">
-            <el-button type="primary" link @click="handleWatchDetail(row)">查看详情</el-button>
+            <el-button type="primary" link @click="handleActionDetail(row)">办理详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -298,36 +339,53 @@
     </div>
   </div>
 
+  <negative-dialog
+      v-model="show"
+      :id="activeNegativeId"
+      @close="show = false"
+      ref="negativeDialogRef"
+  />
+
+  <negative-mailbox-dialog
+        v-model="mailboxShow"
+        :id="activeNegativeId"
+        @close="mailboxShow = false"
+    />
+
 </template>
 
 
 <script setup>
-import { ref, watch, computed, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import {timeFormat} from "@/utils/util";
 import useCatchStore from "@/stores/modules/catch";
 import {
   exportData,
   getComplaintCollectionPage
 } from "@/api/data/complaintCollection.ts";
-import useCatchStore = useCatchStore();
+
+const show = ref(false);
+const mailboxShow = ref(false);
+const activeNegativeId = ref("");
 
 const query = ref({
   size: 10,
   current: 1,
   sourceTableList: ['17'],
   sourceTableSubOneList: [],
+  secondDepartId: null,
+  thirdDepartId: null,
+  handleDepartId: null,
   initialReviewFileList: [],
+  createTimeList: [],
 });
 
-
-
 const list = ref([]);
 const total = ref(0);
 const loading = ref(false)
 const getList = async () => {
   loading.value = true;
 
-  // 确保始终包含默认来源
   if (!query.value.sourceTableList.includes('17')) {
     query.value.sourceTableList = ['17', ...query.value.sourceTableList];
   }
@@ -337,7 +395,7 @@ const getList = async () => {
   }
 
   let res = await getComplaintCollectionPage(params);
-  list.value = res.complaintCollectionPageDTOS;
+  list.value = res.records;
   total.value = res.total;
   loading.value = false;
 }
@@ -348,7 +406,11 @@ function reset() {
     current: 1,
     sourceTableList: ['17'],
     sourceTableSubOneList: [],
+    secondDepartId: null,
+    thirdDepartId: null,
+    handleDepartId: null,
     initialReviewFileList: [],
+    createTimeList: [],
   };
   getList();
 }
@@ -369,14 +431,15 @@ const storeDict = computed(() =>
       "checkStatus",
       "sfssSourceTable",
       "sfssTags",
-      "accountabilityTarget"
+      "accountabilityTarget",
+      "processingStatus",
+      "handleMethodType"
     ]) || {}
 );
 
 const ts12389SourceTableSubOneList = computed(() => {
   const list = storeDict.value.sfssSourceTable || []
 
-  // 二级：remark 等于12389投诉的dictValue
   const children = list
       .filter(d => d.remark === '17')
       .sort((a, b) => (a.dictSort ?? 0) - (b.dictSort ?? 0))
@@ -431,11 +494,15 @@ function getDictLabel(list, value) {
   return labels.length ? labels.join('，') : '/'
 }
 
-const detailShow = ref(false)
-const activeId = ref("")
-const handleWatchDetail = async (row) => {
-  activeId.value = row.id
-  detailShow.value = true
+function handleActionDetail(row) {
+  console.log('办理详情', row)
+  if (row.problemSources === '局长信箱') {
+    mailboxShow.value = true;
+    activeNegativeId.value = row.originId;
+  } else {
+    show.value = true;
+    activeNegativeId.value = row.negativeId;
+  }
 }
 
 const handleExport = async () => {
@@ -470,4 +537,3 @@ p {
   padding: 0 24px 16px;
 }
 </style>
-// 这是ai写的页面
diff --git a/src/views/data/ComplaintCollection_gabxf.vue b/src/views/data/ComplaintCollection_gabxf.vue
index e3ef8fa..da6771d 100644
--- a/src/views/data/ComplaintCollection_gabxf.vue
+++ b/src/views/data/ComplaintCollection_gabxf.vue
@@ -59,6 +59,14 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="涉及三级机构" prop="thirdDepartId">
+              <depart-tree-select
+                  v-model="query.thirdDepartId"
+                  :check-strictly="true"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="办理方式">
               <el-select
@@ -75,29 +83,17 @@
           <el-col :span="6">
             <el-form-item label="办理状态">
               <el-select
-                  v-model="query.status"
-                  clearable
-                  placeholder="办理状态"
-              >
-                <el-option value="0" label="未办理"/>
-                <el-option value="1" label="已办理"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标签">
-              <el-select
-                  placeholder="全部"
+                  v-model="query.processingStatus"
                   clearable
-                  v-model="query.tags"
                   multiple
                   collapse-tags
+                  placeholder="办理状态"
               >
                 <el-option
-                    v-for="item in dict.sfssTags"
+                    v-for="item in dict.processingStatus"
                     :key="item.id"
-                    :value="item.dictValue"
                     :label="item.dictLabel"
+                    :value="item.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -163,7 +159,6 @@
                     :value="item.dictValue"
                     :label="item.dictLabel"
                 >
-                  <!-- 复选框展示（和你弹窗里一致） -->
                   <el-checkbox :model-value="(query.involveProblemIdList || []).includes(item.dictValue)">
                     {{ item.dictLabel }}
                   </el-checkbox>
@@ -171,6 +166,39 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签">
+              <el-select
+                  placeholder="全部"
+                  clearable
+                  v-model="query.tags"
+                  multiple
+                  collapse-tags
+              >
+                <el-option
+                    v-for="item in dict.sfssTags"
+                    :key="item.id"
+                    :value="item.dictValue"
+                    :label="item.dictLabel"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="录入时间">
+              <date-time-range-picker-ext
+                  v-model="query.createTimeList"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="办理单位" prop="handleDepartId">
+              <depart-tree-select
+                  v-model="query.handleDepartId"
+                  placeholder="办理单位"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="mb-25 flex between">
@@ -209,7 +237,17 @@
                          :formatter="row => row.responderIdCode ? row.responderIdCode : '无'" show-overflow-tooltip/>
         <el-table-column label="联系电话" width="100" prop="responderPhone"
                          :formatter="row => row.responderPhone ? row.responderPhone : '无'" show-overflow-tooltip/>
-        <el-table-column label="被投诉机构" width="130" prop="secondDepartName"/>
+        <el-table-column label="被投诉机构" width="130" show-overflow-tooltip>
+          <template #default="{ row }">
+            <span>{{ row.secondDepartName }}</span>
+            <span v-if="row.thirdDepartName"> {{ row.thirdDepartName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="办理单位" width="160" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.handleSecondDepartName || '' }}{{ row.handleThreeDepartName ? '/' + row.handleThreeDepartName : '' }}
+          </template>
+        </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">
@@ -220,16 +258,20 @@
 
         <el-table-column label="初核限时" width="150" align="center">
           <template #default="{ row }">
-            <!-- 有状态：显示状态文案 -->
             <el-tag v-if="row.gwf3>=1" :type="row.gwf3 === '2' ? 'danger' : 'success'">
               {{ row.gwf3 === '2' ? '超时完成初核' : '按时完成初核' }}
             </el-tag>
-
-            <!-- 无状态：显示倒计时 -->
             <countdown v-else :time="Number(row.remainingDuration || 0)"/>
           </template>
         </el-table-column>
 
+        <el-table-column
+            label="录入时间"
+            width="170"
+            prop="createTime"
+            :formatter="(_, __, v) => v ? timeFormat(v, 'yyyy-mm-dd hh:MM:ss') : '/'"
+            show-overflow-tooltip
+        />
         <el-table-column label="标签" width="100" show-overflow-tooltip>
           <template #default="{ row }">
             {{ getDictLabel(dict.sfssTags, row.tag) }}
@@ -262,23 +304,23 @@
         <el-table-column label="业务类别" width="100" prop="businessTypeName"/>
         <el-table-column label="核查结论" width="140" prop="checkStatus" show-overflow-tooltip>
           <template #default="{ row }">
-            {{ getDictLabel(dict.checkStatus, row.checkStatus) }}
+            {{ getDictLabel(dict.checkStatus, row.checkStatusCode) }}
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="status" width="100">
+        <el-table-column label="办理状态" prop="processingStatus" width="100">
           <template #default="{ row }">
-            <span :style="row.status === '0' ? 'color: red' : ''">
-              {{
-                row.status === '0' ? '未办理' :
-                    row.status === '1' ? '已办理' :
-                        '-'
-              }}
-    </span>
+            <el-tag
+                :type="row.processingStatus === 'completed' ? 'success' : 'primary'"
+                v-if="row.processingStatus"
+            >
+              {{ getDictLabel(dict.processingStatus, row.processingStatus) }}
+            </el-tag>
+            <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100" fixed="right">
+        <el-table-column label="操作" width="120" fixed="right">
           <template #default="{ row }">
-            <el-button type="primary" link @click="handleWatchDetail(row)">查看详情</el-button>
+            <el-button type="primary" link @click="handleActionDetail(row)">办理详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -297,37 +339,53 @@
     </div>
   </div>
 
+  <negative-dialog
+      v-model="show"
+      :id="activeNegativeId"
+      @close="show = false"
+      ref="negativeDialogRef"
+  />
+
+  <negative-mailbox-dialog
+        v-model="mailboxShow"
+        :id="activeNegativeId"
+        @close="mailboxShow = false"
+    />
+
 </template>
 
 
 <script setup>
-import { ref, watch, computed, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import {timeFormat} from "@/utils/util";
-import feedback from "@/utils/feedback";
 import useCatchStore from "@/stores/modules/catch";
 import {
   exportData,
   getComplaintCollectionPage
 } from "@/api/data/complaintCollection.ts";
-import useCatchStore = useCatchStore();
+
+const show = ref(false);
+const mailboxShow = ref(false);
+const activeNegativeId = ref("");
 
 const query = ref({
   size: 10,
   current: 1,
   sourceTableList: ['22'],
   sourceTableSubOneList: [],
+  secondDepartId: null,
+  thirdDepartId: null,
+  handleDepartId: null,
   initialReviewFileList: [],
+  createTimeList: [],
 });
 
-
-
 const list = ref([]);
 const total = ref(0);
 const loading = ref(false)
 const getList = async () => {
   loading.value = true;
 
-  // 确保始终包含默认来源
   if (!query.value.sourceTableList.includes('22')) {
     query.value.sourceTableList = ['22', ...query.value.sourceTableList];
   }
@@ -337,7 +395,7 @@ const getList = async () => {
   }
 
   let res = await getComplaintCollectionPage(params);
-  list.value = res.complaintCollectionPageDTOS;
+  list.value = res.records;
   total.value = res.total;
   loading.value = false;
 }
@@ -348,7 +406,11 @@ function reset() {
     current: 1,
     sourceTableList: ['22'],
     sourceTableSubOneList: [],
+    secondDepartId: null,
+    thirdDepartId: null,
+    handleDepartId: null,
     initialReviewFileList: [],
+    createTimeList: [],
   };
   getList();
 }
@@ -369,14 +431,15 @@ const storeDict = computed(() =>
       "checkStatus",
       "sfssSourceTable",
       "sfssTags",
-      "accountabilityTarget"
+      "accountabilityTarget",
+      "processingStatus",
+      "handleMethodType"
     ]) || {}
 );
 
 const gabxfSourceTableSubOneList = computed(() => {
   const list = storeDict.value.sfssSourceTable || []
 
-  // 二级：remark 等于公安部信访的dictValue
   const children = list
       .filter(d => d.remark === '22')
       .sort((a, b) => (a.dictSort ?? 0) - (b.dictSort ?? 0))
@@ -431,11 +494,15 @@ function getDictLabel(list, value) {
   return labels.length ? labels.join('，') : '/'
 }
 
-const detailShow = ref(false)
-const activeId = ref("")
-const handleWatchDetail = async (row) => {
-  activeId.value = row.id
-  detailShow.value = true
+function handleActionDetail(row) {
+  console.log('办理详情', row)
+  if (row.problemSources === '局长信箱') {
+    mailboxShow.value = true;
+    activeNegativeId.value = row.originId;
+  } else {
+    show.value = true;
+    activeNegativeId.value = row.negativeId;
+  }
 }
 
 const handleExport = async () => {
@@ -470,5 +537,3 @@ p {
   padding: 0 24px 16px;
 }
 </style>
-
-// 这是ai写的页面
\ No newline at end of file
diff --git a/src/views/data/ComplaintCollection_gjxf.vue b/src/views/data/ComplaintCollection_gjxf.vue
index 5c69907..661867b 100644
--- a/src/views/data/ComplaintCollection_gjxf.vue
+++ b/src/views/data/ComplaintCollection_gjxf.vue
@@ -59,6 +59,14 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="涉及三级机构" prop="thirdDepartId">
+              <depart-tree-select
+                  v-model="query.thirdDepartId"
+                  :check-strictly="true"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="办理方式">
               <el-select
@@ -75,29 +83,17 @@
           <el-col :span="6">
             <el-form-item label="办理状态">
               <el-select
-                  v-model="query.status"
+                  v-model="query.processingStatus"
                   clearable
-                  placeholder="办理状态"
-              >
-                <el-option value="0" label="未办理"/>
-                <el-option value="1" label="已办理"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标签">
-              <el-select
-                  placeholder="全部"
-                  clearable
-                  v-model="query.tags"
                   multiple
                   collapse-tags
+                  placeholder="办理状态"
               >
                 <el-option
-                    v-for="item in dict.sfssTags"
+                    v-for="item in dict.processingStatus"
                     :key="item.id"
-                    :value="item.dictValue"
                     :label="item.dictLabel"
+                    :value="item.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -163,7 +159,6 @@
                     :value="item.dictValue"
                     :label="item.dictLabel"
                 >
-                  <!-- 复选框展示（和你弹窗里一致） -->
                   <el-checkbox :model-value="(query.involveProblemIdList || []).includes(item.dictValue)">
                     {{ item.dictLabel }}
                   </el-checkbox>
@@ -171,6 +166,39 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签">
+              <el-select
+                  placeholder="全部"
+                  clearable
+                  v-model="query.tags"
+                  multiple
+                  collapse-tags
+              >
+                <el-option
+                    v-for="item in dict.sfssTags"
+                    :key="item.id"
+                    :value="item.dictValue"
+                    :label="item.dictLabel"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="录入时间">
+              <date-time-range-picker-ext
+                  v-model="query.createTimeList"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="办理单位" prop="handleDepartId">
+              <depart-tree-select
+                  v-model="query.handleDepartId"
+                  placeholder="办理单位"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="mb-25 flex between">
@@ -209,7 +237,17 @@
                          :formatter="row => row.responderIdCode ? row.responderIdCode : '无'" show-overflow-tooltip/>
         <el-table-column label="联系电话" width="100" prop="responderPhone"
                          :formatter="row => row.responderPhone ? row.responderPhone : '无'" show-overflow-tooltip/>
-        <el-table-column label="被投诉机构" width="130" prop="secondDepartName"/>
+        <el-table-column label="被投诉机构" width="130" show-overflow-tooltip>
+          <template #default="{ row }">
+            <span>{{ row.secondDepartName }}</span>
+            <span v-if="row.thirdDepartName"> {{ row.thirdDepartName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="办理单位" width="160" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.handleSecondDepartName || '' }}{{ row.handleThreeDepartName ? '/' + row.handleThreeDepartName : '' }}
+          </template>
+        </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">
@@ -220,16 +258,20 @@
 
         <el-table-column label="初核限时" width="150" align="center">
           <template #default="{ row }">
-            <!-- 有状态：显示状态文案 -->
             <el-tag v-if="row.gwf3>=1" :type="row.gwf3 === '2' ? 'danger' : 'success'">
               {{ row.gwf3 === '2' ? '超时完成初核' : '按时完成初核' }}
             </el-tag>
-
-            <!-- 无状态：显示倒计时 -->
             <countdown v-else :time="Number(row.remainingDuration || 0)"/>
           </template>
         </el-table-column>
 
+        <el-table-column
+            label="录入时间"
+            width="170"
+            prop="createTime"
+            :formatter="(_, __, v) => v ? timeFormat(v, 'yyyy-mm-dd hh:MM:ss') : '/'"
+            show-overflow-tooltip
+        />
         <el-table-column label="标签" width="100" show-overflow-tooltip>
           <template #default="{ row }">
             {{ getDictLabel(dict.sfssTags, row.tag) }}
@@ -262,23 +304,23 @@
         <el-table-column label="业务类别" width="100" prop="businessTypeName"/>
         <el-table-column label="核查结论" width="140" prop="checkStatus" show-overflow-tooltip>
           <template #default="{ row }">
-            {{ getDictLabel(dict.checkStatus, row.checkStatus) }}
+            {{ getDictLabel(dict.checkStatus, row.checkStatusCode) }}
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="status" width="100">
+        <el-table-column label="办理状态" prop="processingStatus" width="100">
           <template #default="{ row }">
-            <span :style="row.status === '0' ? 'color: red' : ''">
-              {{
-                row.status === '0' ? '未办理' :
-                    row.status === '1' ? '已办理' :
-                        '-'
-              }}
-    </span>
+            <el-tag
+                :type="row.processingStatus === 'completed' ? 'success' : 'primary'"
+                v-if="row.processingStatus"
+            >
+              {{ getDictLabel(dict.processingStatus, row.processingStatus) }}
+            </el-tag>
+            <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100" fixed="right">
+        <el-table-column label="操作" width="120" fixed="right">
           <template #default="{ row }">
-            <el-button type="primary" link @click="handleWatchDetail(row)">查看详情</el-button>
+            <el-button type="primary" link @click="handleActionDetail(row)">办理详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -297,6 +339,19 @@
     </div>
   </div>
 
+  <negative-dialog
+      v-model="show"
+      :id="activeNegativeId"
+      @close="show = false"
+      ref="negativeDialogRef"
+  />
+
+  <negative-mailbox-dialog
+        v-model="mailboxShow"
+        :id="activeNegativeId"
+        @close="mailboxShow = false"
+    />
+
 </template>
 
 
@@ -305,25 +360,29 @@ import {computed, onMounted, ref} from 'vue';
 import {timeFormat} from "@/utils/util";
 import useCatchStore from "@/stores/modules/catch";
 import {exportData, getComplaintCollectionPage} from "@/api/data/complaintCollection.ts";
-import useCatchStore = useCatchStore();
+
+const show = ref(false);
+const mailboxShow = ref(false);
+const activeNegativeId = ref("");
 
 const query = ref({
   size: 10,
   current: 1,
   sourceTableList: ['21'],
   sourceTableSubOneList: [],
+  secondDepartId: null,
+  thirdDepartId: null,
+  handleDepartId: null,
   initialReviewFileList: [],
+  createTimeList: [],
 });
 
-
-
 const list = ref([]);
 const total = ref(0);
 const loading = ref(false)
 const getList = async () => {
   loading.value = true;
 
-  // 确保始终包含默认来源
   if (!query.value.sourceTableList.includes('21')) {
     query.value.sourceTableList = ['21', ...query.value.sourceTableList];
   }
@@ -333,7 +392,7 @@ const getList = async () => {
   }
 
   let res = await getComplaintCollectionPage(params);
-  list.value = res.complaintCollectionPageDTOS;
+  list.value = res.records;
   total.value = res.total;
   loading.value = false;
 }
@@ -344,7 +403,11 @@ function reset() {
     current: 1,
     sourceTableList: ['21'],
     sourceTableSubOneList: [],
+    secondDepartId: null,
+    thirdDepartId: null,
+    handleDepartId: null,
     initialReviewFileList: [],
+    createTimeList: [],
   };
   getList();
 }
@@ -365,7 +428,9 @@ const storeDict = computed(() =>
       "checkStatus",
       "sfssSourceTable",
       "sfssTags",
-      "accountabilityTarget"
+      "accountabilityTarget",
+      "processingStatus",
+      "handleMethodType"
     ]) || {}
 );
 
@@ -383,7 +448,6 @@ const localDict = {
 const gjxfSourceTableSubOneList = computed(() => {
   const list = storeDict.value.sfssSourceTable || []
 
-  // 二级：remark 等于国家信访的dictValue
   const children = list
       .filter(d => d.remark === '21')
       .sort((a, b) => (a.dictSort ?? 0) - (b.dictSort ?? 0))
@@ -427,11 +491,15 @@ function getDictLabel(list, value) {
   return labels.length ? labels.join('，') : '/'
 }
 
-const detailShow = ref(false)
-const activeId = ref("")
-const handleWatchDetail = async (row) => {
-  activeId.value = row.id
-  detailShow.value = true
+function handleActionDetail(row) {
+  console.log('办理详情', row)
+  if (row.problemSources === '局长信箱') {
+    mailboxShow.value = true;
+    activeNegativeId.value = row.originId;
+  } else {
+    show.value = true;
+    activeNegativeId.value = row.negativeId;
+  }
 }
 
 const handleExport = async () => {
@@ -465,4 +533,4 @@ p {
   justify-content: flex-end;
   padding: 0 24px 16px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/data/ComplaintCollection_jzxx.vue b/src/views/data/ComplaintCollection_jzxx.vue
index 285e4e7..64c26ce 100644
--- a/src/views/data/ComplaintCollection_jzxx.vue
+++ b/src/views/data/ComplaintCollection_jzxx.vue
@@ -59,6 +59,14 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="涉及三级机构" prop="thirdDepartId">
+              <depart-tree-select
+                  v-model="query.thirdDepartId"
+                  :check-strictly="true"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="办理方式">
               <el-select
@@ -73,32 +81,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="办理状态">
-              <el-select
-                  v-model="query.status"
-                  clearable
-                  placeholder="办理状态"
-              >
-                <el-option value="0" label="未办理"/>
-                <el-option value="1" label="已办理"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标签">
+            <el-form-item label="信件状态">
               <el-select
+                  v-model="query.processingStatus"
                   placeholder="全部"
                   clearable
-                  v-model="query.tags"
-                  multiple
-                  collapse-tags
+                  style="width: 100%"
               >
-                <el-option
-                    v-for="item in dict.sfssTags"
-                    :key="item.id"
-                    :value="item.dictValue"
-                    :label="item.dictLabel"
-                />
+                <el-option value="processing" label="办理中"/>
+                <el-option value="completion" label="已办结"/>
+                <el-option value="delayed" label="已延期"/>
+                <el-option value="terminated" label="已终止"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -163,7 +156,6 @@
                     :value="item.dictValue"
                     :label="item.dictLabel"
                 >
-                  <!-- 复选框展示（和你弹窗里一致） -->
                   <el-checkbox :model-value="(query.involveProblemIdList || []).includes(item.dictValue)">
                     {{ item.dictLabel }}
                   </el-checkbox>
@@ -172,22 +164,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="信件状态">
+            <el-form-item label="标签">
               <el-select
-                  v-model="query.processingStatus"
                   placeholder="全部"
                   clearable
-                  style="width: 100%"
+                  v-model="query.tags"
+                  multiple
+                  collapse-tags
               >
-                <el-option value="processing" label="办理中"/>
-                <el-option value="completion" label="已办结"/>
-                <el-option value="delayed" label="已延期"/>
-                <el-option value="terminated" label="已终止"/>
+                <el-option
+                    v-for="item in dict.sfssTags"
+                    :key="item.id"
+                    :value="item.dictValue"
+                    :label="item.dictLabel"
+                />
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="录入时间">
+              <date-time-range-picker-ext
+                  v-model="query.createTimeList"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="办理单位" prop="handleDepartId">
+              <depart-tree-select
+                  v-model="query.handleDepartId"
+                  placeholder="办理单位"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
-
       </el-form>
       <div class="mb-25 flex between">
         <div>
@@ -225,7 +234,17 @@
                          :formatter="row => row.responderIdCode ? row.responderIdCode : '无'" show-overflow-tooltip/>
         <el-table-column label="联系电话" width="100" prop="responderPhone"
                          :formatter="row => row.responderPhone ? row.responderPhone : '无'" show-overflow-tooltip/>
-        <el-table-column label="被投诉机构" width="130" prop="secondDepartName"/>
+        <el-table-column label="被投诉机构" width="130" show-overflow-tooltip>
+          <template #default="{ row }">
+            <span>{{ row.secondDepartName }}</span>
+            <span v-if="row.thirdDepartName"> {{ row.thirdDepartName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="办理单位" width="160" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.handleSecondDepartName || '' }}{{ row.handleThreeDepartName ? '/' + row.handleThreeDepartName : '' }}
+          </template>
+        </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">
@@ -236,16 +255,20 @@
 
         <el-table-column label="初核限时" width="150" align="center">
           <template #default="{ row }">
-            <!-- 有状态：显示状态文案 -->
             <el-tag v-if="row.gwf3>=1" :type="row.gwf3 === '2' ? 'danger' : 'success'">
               {{ row.gwf3 === '2' ? '超时完成初核' : '按时完成初核' }}
             </el-tag>
-
-            <!-- 无状态：显示倒计时 -->
             <countdown v-else :time="Number(row.remainingDuration || 0)"/>
           </template>
         </el-table-column>
 
+        <el-table-column
+            label="录入时间"
+            width="170"
+            prop="createTime"
+            :formatter="(_, __, v) => v ? timeFormat(v, 'yyyy-mm-dd hh:MM:ss') : '/'"
+            show-overflow-tooltip
+        />
         <el-table-column label="标签" width="100" show-overflow-tooltip>
           <template #default="{ row }">
             {{ getDictLabel(dict.sfssTags, row.tag) }}
@@ -278,34 +301,29 @@
         <el-table-column label="业务类别" width="100" prop="businessTypeName"/>
         <el-table-column label="核查结论" width="140" prop="checkStatus" show-overflow-tooltip>
           <template #default="{ row }">
-            {{ getDictLabel(dict.checkStatus, row.checkStatus) }}
+            {{ getDictLabel(dict.checkStatus, row.checkStatusCode) }}
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="status" width="100">
+        <el-table-column label="信件状态" prop="processingStatus" width="100">
           <template #default="{ row }">
-            <span :style="row.status === '0' ? 'color: red' : ''">
+            <el-tag
+                :type="row.processingStatus === 'completed' ? 'success' : 'primary'"
+                v-if="row.processingStatus"
+            >
               {{
-                row.status === '0' ? '未办理' :
-                    row.status === '1' ? '已办理' :
-                        '-'
+                row.processingStatus === 'completion' ? '已办结' :
+                    row.processingStatus === 'processing' ? '办理中' :
+                        row.processingStatus === 'delayed' ? '已延期' :
+                            row.processingStatus === 'terminated' ? '已终止' :
+                                getDictLabel(dict.processingStatus, row.processingStatus)
               }}
-    </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="信件状态(局)" width="120" prop="processingStatus">
-          <template #default="{ row }">
-            {{
-              row.processingStatus === 'completion' ? '已办结' :
-                  row.processingStatus === 'processing' ? '办理中' :
-                      row.processingStatus === 'delayed' ? '已延期' :
-                          row.processingStatus === 'terminated' ? '已终止' :
-                              '/'
-            }}
+            </el-tag>
+            <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100" fixed="right">
+        <el-table-column label="操作" width="120" fixed="right">
           <template #default="{ row }">
-            <el-button type="primary" link @click="handleWatchDetail(row)">查看详情</el-button>
+            <el-button type="primary" link @click="handleActionDetail(row)">办理详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -324,37 +342,54 @@
     </div>
   </div>
 
+  <negative-dialog
+      v-model="show"
+      :id="activeNegativeId"
+      @close="show = false"
+      ref="negativeDialogRef"
+  />
+
+  <negative-mailbox-dialog
+        v-model="mailboxShow"
+        :id="activeNegativeId"
+        @close="mailboxShow = false"
+    />
+
 </template>
 
 
 <script setup>
-import { ref, watch, computed, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import {timeFormat} from "@/utils/util";
 import useCatchStore from "@/stores/modules/catch";
 import {
   exportData,
   getComplaintCollectionPage
 } from "@/api/data/complaintCollection.ts";
-import useCatchStore = useCatchStore();
+
+const show = ref(false);
+const mailboxShow = ref(false);
+const activeNegativeId = ref("");
 
 const query = ref({
   size: 10,
   current: 1,
   sourceTableList: ['23'],
   sourceTableSubOneList: [],
+  secondDepartId: null,
+  thirdDepartId: null,
+  handleDepartId: null,
   initialReviewFileList: [],
+  createTimeList: [],
   processingStatus: '',
 });
 
-
-
 const list = ref([]);
 const total = ref(0);
 const loading = ref(false)
 const getList = async () => {
   loading.value = true;
 
-  // 确保始终包含默认来源
   if (!query.value.sourceTableList.includes('23')) {
     query.value.sourceTableList = ['23', ...query.value.sourceTableList];
   }
@@ -364,7 +399,7 @@ const getList = async () => {
   }
 
   let res = await getComplaintCollectionPage(params);
-  list.value = res.complaintCollectionPageDTOS;
+  list.value = res.records;
   total.value = res.total;
   loading.value = false;
 }
@@ -375,7 +410,11 @@ function reset() {
     current: 1,
     sourceTableList: ['23'],
     sourceTableSubOneList: [],
+    secondDepartId: null,
+    thirdDepartId: null,
+    handleDepartId: null,
     initialReviewFileList: [],
+    createTimeList: [],
     processingStatus: '',
   };
   getList();
@@ -397,14 +436,15 @@ const storeDict = computed(() =>
       "checkStatus",
       "sfssSourceTable",
       "sfssTags",
-      "accountabilityTarget"
+      "accountabilityTarget",
+      "processingStatus",
+      "handleMethodType"
     ]) || {}
 );
 
 const jzxxSourceTableSubOneList = computed(() => {
   const list = storeDict.value.sfssSourceTable || []
 
-  // 二级：remark 等于局长信箱的dictValue
   const children = list
       .filter(d => d.remark === '23')
       .sort((a, b) => (a.dictSort ?? 0) - (b.dictSort ?? 0))
@@ -459,11 +499,15 @@ function getDictLabel(list, value) {
   return labels.length ? labels.join('，') : '/'
 }
 
-const detailShow = ref(false)
-const activeId = ref("")
-const handleWatchDetail = async (row) => {
-  activeId.value = row.id
-  detailShow.value = true
+function handleActionDetail(row) {
+  console.log('办理详情', row)
+  if (row.problemSources === '局长信箱') {
+    mailboxShow.value = true;
+    activeNegativeId.value = row.originId;
+  } else {
+    show.value = true;
+    activeNegativeId.value = row.negativeId;
+  }
 }
 
 const handleExport = async () => {
@@ -498,5 +542,3 @@ p {
   padding: 0 24px 16px;
 }
 </style>
-
-// 这是ai写的页面
\ No newline at end of file
diff --git a/src/views/data/ComplaintCollection_ldxj.vue b/src/views/data/ComplaintCollection_ldxj.vue
index 223de01..88498fb 100644
--- a/src/views/data/ComplaintCollection_ldxj.vue
+++ b/src/views/data/ComplaintCollection_ldxj.vue
@@ -59,6 +59,14 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="涉及三级机构" prop="thirdDepartId">
+              <depart-tree-select
+                  v-model="query.thirdDepartId"
+                  :check-strictly="true"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="办理方式">
               <el-select
@@ -75,29 +83,17 @@
           <el-col :span="6">
             <el-form-item label="办理状态">
               <el-select
-                  v-model="query.status"
-                  clearable
-                  placeholder="办理状态"
-              >
-                <el-option value="0" label="未办理"/>
-                <el-option value="1" label="已办理"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标签">
-              <el-select
-                  placeholder="全部"
+                  v-model="query.processingStatus"
                   clearable
-                  v-model="query.tags"
                   multiple
                   collapse-tags
+                  placeholder="办理状态"
               >
                 <el-option
-                    v-for="item in dict.sfssTags"
+                    v-for="item in dict.processingStatus"
                     :key="item.id"
-                    :value="item.dictValue"
                     :label="item.dictLabel"
+                    :value="item.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -163,7 +159,6 @@
                     :value="item.dictValue"
                     :label="item.dictLabel"
                 >
-                  <!-- 复选框展示（和你弹窗里一致） -->
                   <el-checkbox :model-value="(query.involveProblemIdList || []).includes(item.dictValue)">
                     {{ item.dictLabel }}
                   </el-checkbox>
@@ -171,6 +166,39 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签">
+              <el-select
+                  placeholder="全部"
+                  clearable
+                  v-model="query.tags"
+                  multiple
+                  collapse-tags
+              >
+                <el-option
+                    v-for="item in dict.sfssTags"
+                    :key="item.id"
+                    :value="item.dictValue"
+                    :label="item.dictLabel"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="录入时间">
+              <date-time-range-picker-ext
+                  v-model="query.createTimeList"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="办理单位" prop="handleDepartId">
+              <depart-tree-select
+                  v-model="query.handleDepartId"
+                  placeholder="办理单位"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="mb-25 flex between">
@@ -209,7 +237,17 @@
                          :formatter="row => row.responderIdCode ? row.responderIdCode : '无'" show-overflow-tooltip/>
         <el-table-column label="联系电话" width="100" prop="responderPhone"
                          :formatter="row => row.responderPhone ? row.responderPhone : '无'" show-overflow-tooltip/>
-        <el-table-column label="被投诉机构" width="130" prop="secondDepartName"/>
+        <el-table-column label="被投诉机构" width="130" show-overflow-tooltip>
+          <template #default="{ row }">
+            <span>{{ row.secondDepartName }}</span>
+            <span v-if="row.thirdDepartName"> {{ row.thirdDepartName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="办理单位" width="160" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.handleSecondDepartName || '' }}{{ row.handleThreeDepartName ? '/' + row.handleThreeDepartName : '' }}
+          </template>
+        </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">
@@ -220,16 +258,20 @@
 
         <el-table-column label="初核限时" width="150" align="center">
           <template #default="{ row }">
-            <!-- 有状态：显示状态文案 -->
             <el-tag v-if="row.gwf3>=1" :type="row.gwf3 === '2' ? 'danger' : 'success'">
               {{ row.gwf3 === '2' ? '超时完成初核' : '按时完成初核' }}
             </el-tag>
-
-            <!-- 无状态：显示倒计时 -->
             <countdown v-else :time="Number(row.remainingDuration || 0)"/>
           </template>
         </el-table-column>
 
+        <el-table-column
+            label="录入时间"
+            width="170"
+            prop="createTime"
+            :formatter="(_, __, v) => v ? timeFormat(v, 'yyyy-mm-dd hh:MM:ss') : '/'"
+            show-overflow-tooltip
+        />
         <el-table-column label="标签" width="100" show-overflow-tooltip>
           <template #default="{ row }">
             {{ getDictLabel(dict.sfssTags, row.tag) }}
@@ -262,23 +304,23 @@
         <el-table-column label="业务类别" width="100" prop="businessTypeName"/>
         <el-table-column label="核查结论" width="140" prop="checkStatus" show-overflow-tooltip>
           <template #default="{ row }">
-            {{ getDictLabel(dict.checkStatus, row.checkStatus) }}
+            {{ getDictLabel(dict.checkStatus, row.checkStatusCode) }}
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="status" width="100">
+        <el-table-column label="办理状态" prop="processingStatus" width="100">
           <template #default="{ row }">
-            <span :style="row.status === '0' ? 'color: red' : ''">
-              {{
-                row.status === '0' ? '未办理' :
-                    row.status === '1' ? '已办理' :
-                        '-'
-              }}
-    </span>
+            <el-tag
+                :type="row.processingStatus === 'completed' ? 'success' : 'primary'"
+                v-if="row.processingStatus"
+            >
+              {{ getDictLabel(dict.processingStatus, row.processingStatus) }}
+            </el-tag>
+            <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100" fixed="right">
+        <el-table-column label="操作" width="120" fixed="right">
           <template #default="{ row }">
-            <el-button type="primary" link @click="handleWatchDetail(row)">查看详情</el-button>
+            <el-button type="primary" link @click="handleActionDetail(row)">办理详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -297,36 +339,53 @@
     </div>
   </div>
 
+  <negative-dialog
+      v-model="show"
+      :id="activeNegativeId"
+      @close="show = false"
+      ref="negativeDialogRef"
+  />
+
+  <negative-mailbox-dialog
+        v-model="mailboxShow"
+        :id="activeNegativeId"
+        @close="mailboxShow = false"
+    />
+
 </template>
 
 
 <script setup>
-import { ref, watch, computed, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import {timeFormat} from "@/utils/util";
 import useCatchStore from "@/stores/modules/catch";
 import {
   exportData,
   getComplaintCollectionPage
 } from "@/api/data/complaintCollection.ts";
-import useCatchStore = useCatchStore();
+
+const show = ref(false);
+const mailboxShow = ref(false);
+const activeNegativeId = ref("");
 
 const query = ref({
   size: 10,
   current: 1,
   sourceTableList: ['leader_explain'],
   sourceTableSubOneList: [],
+  secondDepartId: null,
+  thirdDepartId: null,
+  handleDepartId: null,
   initialReviewFileList: [],
+  createTimeList: [],
 });
 
-
-
 const list = ref([]);
 const total = ref(0);
 const loading = ref(false)
 const getList = async () => {
   loading.value = true;
 
-  // 确保始终包含默认来源
   if (!query.value.sourceTableList.includes('leader_explain')) {
     query.value.sourceTableList = ['leader_explain', ...query.value.sourceTableList];
   }
@@ -336,7 +395,7 @@ const getList = async () => {
   }
 
   let res = await getComplaintCollectionPage(params);
-  list.value = res.complaintCollectionPageDTOS;
+  list.value = res.records;
   total.value = res.total;
   loading.value = false;
 }
@@ -347,7 +406,11 @@ function reset() {
     current: 1,
     sourceTableList: ['leader_explain'],
     sourceTableSubOneList: [],
+    secondDepartId: null,
+    thirdDepartId: null,
+    handleDepartId: null,
     initialReviewFileList: [],
+    createTimeList: [],
   };
   getList();
 }
@@ -368,14 +431,15 @@ const storeDict = computed(() =>
       "checkStatus",
       "sfssSourceTable",
       "sfssTags",
-      "accountabilityTarget"
+      "accountabilityTarget",
+      "processingStatus",
+      "handleMethodType"
     ]) || {}
 );
 
 const leaderSourceTableSubOneList = computed(() => {
   const list = storeDict.value.sfssSourceTable || []
 
-  // 二级：remark 等于领导交办的dictValue
   const children = list
       .filter(d => d.remark === 'leader_explain')
       .sort((a, b) => (a.dictSort ?? 0) - (b.dictSort ?? 0))
@@ -430,11 +494,15 @@ function getDictLabel(list, value) {
   return labels.length ? labels.join('，') : '/'
 }
 
-const detailShow = ref(false)
-const activeId = ref("")
-const handleWatchDetail = async (row) => {
-  activeId.value = row.id
-  detailShow.value = true
+function handleActionDetail(row) {
+  console.log('办理详情', row)
+  if (row.problemSources === '局长信箱') {
+    mailboxShow.value = true;
+    activeNegativeId.value = row.originId;
+  } else {
+    show.value = true;
+    activeNegativeId.value = row.negativeId;
+  }
 }
 
 const handleExport = async () => {
@@ -469,5 +537,3 @@ p {
   padding: 0 24px 16px;
 }
 </style>
-
-// 这是ai写的页面
\ No newline at end of file