From a07ffedae4fb4c3326143b13d89d124b0616d5f6 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Fri, 8 May 2026 10:58:19 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260508-=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E7=9A=84=E5=8F=8D=E9=A6=88=E6=83=85=E5=86=B5=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=A1=A8=E6=A0=BC=E5=8D=B3=E5=8F=AF=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bg/bgpartymatter/BgPartymatter.data.ts    |   3 +-
 .../bg/bgpartymatter/BgPartymatterList.vue    | 116 +++++++++++++++---
 2 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/src/views/bg/bgpartymatter/BgPartymatter.data.ts b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
index 06e1049..ebafbc8 100644
--- a/src/views/bg/bgpartymatter/BgPartymatter.data.ts
+++ b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
@@ -19,7 +19,8 @@ export const columns: BasicColumn[] = [
   {
     title: '年份',
     align:"center",
-    dataIndex: 'year_dictText',
+    dataIndex: 'year',
+    width: '60px',
   },
   {
     title: '序号',
diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue
index 7face70..bea02d8 100644
--- a/src/views/bg/bgpartymatter/BgPartymatterList.vue
+++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue
@@ -9,7 +9,7 @@
     </div>
     <div class="content">
       <!--引用表格-->
-      <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <BasicTable @register="registerTable" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
         <!--插槽:table标题-->
         <template #tableTitle>
           <a-button type="primary" v-auth="'bgpartymatter:bg_partymatter:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
@@ -34,18 +34,31 @@
         </template>
         <!--操作栏-->
         <template #action="{ record }">
-          <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+          <TableAction stopButtonPropagation :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
         </template>
         <!--字段回显插槽-->
         <template v-slot:bodyCell="{ column, record, index, text }">
         </template>
+        <!--嵌套子表-->
+        <template #expandedRowRender="{ record }">
+          <div class="feedback-expand-table">
+            <BasicTable
+              bordered
+              size="small"
+              rowKey="id"
+              :canResize="false"
+              :showIndexColumn="false"
+              :showActionColumn="false"
+              :showTableSetting="false"
+              :clickToRowSelect="false"
+              :columns="bgPartymatterFeedbackColumns"
+              :dataSource="getFeedbackTableData(record)"
+              :loading="getFeedbackTableLoading(record)"
+              :pagination="false"
+            />
+          </div>
+        </template>
       </BasicTable>
-      <!--子表表格tab-->
-      <a-tabs defaultActiveKey="1" style="margin: 10px">
-        <a-tab-pane tab="党委会反馈表" key="1" >
-          <BgPartymatterFeedbackList />
-        </a-tab-pane>
-      </a-tabs>
     </div>
     <!-- 表单区域 -->
     <BgPartymatterModal ref="registerModal" @success="handleSuccess" />
@@ -57,20 +70,17 @@
 </template>
 
 <script lang="ts" name="bgpartymatter-bgPartymatter" setup>
-  import { computed, reactive, ref, unref, provide } from 'vue';
+  import { reactive, ref } from 'vue';
   import { BasicTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { useModal } from '/@/components/Modal';
   import { dateUtil } from '/@/utils/dateUtil';
-  import { useMessage } from '/@/hooks/web/useMessage';
   import { startProcessSchedules } from '/@/api/common/api';
   import BgPartymatterModal from './components/BgPartymatterModal.vue';
-  import BgPartymatterFeedbackList from './BgPartymatterFeedbackList.vue';
   import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
   import FlowScheduleStartModal from '/src/components/semri/process/FlowScheduleStartModal.vue';
-  import { columns as taskTaskColumns } from '/@/views/taskProcess/TaskTask.data';
-  import { columns, superQuerySchema } from './BgPartymatter.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BgPartymatter.api';
+  import { columns, superQuerySchema, bgPartymatterFeedbackColumns } from './BgPartymatter.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, bgPartymatterFeedbackList } from './BgPartymatter.api';
 
   const FLOW_CODE = 'dev_task_task_001';
   const FLOW_NAME = '党委会决议事项';
@@ -83,7 +93,9 @@
   const flowScheduleModalRef = ref();
   const businessProcessListModalRef = ref();
   const queryParam = reactive<any>({});
-  const processColumns = taskTaskColumns;
+  const expandedRowKeys = ref<Array<string | number>>([]);
+  const feedbackTableData = reactive<Record<string, Recordable[]>>({});
+  const feedbackTableLoading = reactive<Record<string, boolean>>({});
 
   interface DeptOption {
     label: string;
@@ -97,6 +109,7 @@
       columns,
       canResize:false,
       useSearchForm: false,
+      expandRowByClick: true,
       clickToRowSelect: true,
       rowSelection: {type: 'radio'},
       actionColumn: {
@@ -124,13 +137,63 @@
   });
 
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
-  const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
-  //下发 mainId,子组件接收
-  provide('mainId', mainId);
 
   // 高级查询配置
   const superQueryConfig = reactive(superQuerySchema);
 
+  function getFeedbackKey(record: Recordable) {
+    return String(record?.id ?? '');
+  }
+
+  function getFeedbackTableData(record: Recordable) {
+    return feedbackTableData[getFeedbackKey(record)] || [];
+  }
+
+  function getFeedbackTableLoading(record: Recordable) {
+    return !!feedbackTableLoading[getFeedbackKey(record)];
+  }
+
+  function clearFeedbackTableData() {
+    Object.keys(feedbackTableData).forEach((key) => {
+      delete feedbackTableData[key];
+    });
+    Object.keys(feedbackTableLoading).forEach((key) => {
+      delete feedbackTableLoading[key];
+    });
+  }
+
+  function resetFeedbackExpand() {
+    expandedRowKeys.value = [];
+    clearFeedbackTableData();
+  }
+
+  async function loadFeedbackTableData(mainId: string | number) {
+    const key = String(mainId);
+    feedbackTableLoading[key] = true;
+    try {
+      const res = await bgPartymatterFeedbackList({
+        mainId,
+        pageNo: 1,
+        pageSize: 9999,
+        column: 'createTime',
+        order: 'desc',
+      });
+      feedbackTableData[key] = Array.isArray(res) ? res : res?.records || [];
+    } finally {
+      feedbackTableLoading[key] = false;
+    }
+  }
+
+  async function handleExpand(expanded: boolean, record: Recordable) {
+    const mainId = record?.id;
+    expandedRowKeys.value = [];
+    if (!expanded || mainId === undefined || mainId === null || mainId === '') {
+      return;
+    }
+    expandedRowKeys.value = [mainId];
+    await loadFeedbackTableData(mainId);
+  }
+
   /**
    * 高级查询事件
    */
@@ -138,6 +201,7 @@
     Object.keys(params).map((k) => {
       queryParam[k] = params[k];
     });
+    resetFeedbackExpand();
     reload();
   }
 
@@ -183,7 +247,9 @@
    * 成功回调
    */
   function handleSuccess() {
-    (selectedRowKeys.value = []) && reload();
+    selectedRowKeys.value = [];
+    resetFeedbackExpand();
+    reload();
   }
 
   /**
@@ -269,7 +335,7 @@
       title: '流程列表',
       businessId: record.id,
       columns:''
-      // columns: processColumns,默认值
+      // 默认使用 BusinessProcessListModal 内部列配置
     });
   }
 
@@ -333,6 +399,7 @@
   function searchReset() {
     formRef.value.resetFields();
     selectedRowKeys.value = [];
+    resetFeedbackExpand();
     //刷新数据
     reload();
   }
@@ -385,5 +452,14 @@
       background-color: #fff;
       height: 100%;
     }
+
+    .feedback-expand-table {
+      padding: 8px 16px 12px;
+      background: #fafafa;
+
+      :deep(.jeecg-basic-table) {
+        background: #fff;
+      }
+    }
   }
 </style>