From 8301342598761163879c567cd7e40b89e09c8f48 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Mon, 14 Sep 2026 20:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B930=E5=B9=B4=E6=95=99=E9=BE=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E7=A6=8F=E5=88=A9=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thirtyTeach/summary/index.html            |  84 +++++++++----
 .../zhgh/welfare/statistics/index.html        | 111 ++++++++++++------
 2 files changed, 140 insertions(+), 55 deletions(-)

diff --git a/src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/summary/index.html b/src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/summary/index.html
index 5a7b49e5..d89818ab 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/summary/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/summary/index.html
@@ -2,10 +2,50 @@
 layout("/layouts/platform.html"){
 #-->
 
-<div id="app" v-cloak>
+<style>
+    /* 扣除平台顶部导航 64px 和内容区上下间距 20px，让列表使用剩余可视高度。 */
+    .thirty-teach-summary-page {
+        height: calc(100vh - 84px);
+    }
+
+    .thirty-teach-summary-page > .guava-main-content {
+        height: 100%;
+    }
+
+    .thirty-teach-summary-page > .guava-main-content > .transition-item {
+        display: flex;
+        flex-direction: column;
+        min-height: 0;
+    }
+
+    .thirty-teach-summary-page .summary-search-card,
+    .thirty-teach-summary-page .summary-list-card > .el-card__body > .ele-table-tool {
+        flex-shrink: 0;
+    }
+
+    /* 列表卡片允许收缩，避免数据行撑高外层页面；表头和合计由 el-table 固定。 */
+    .thirty-teach-summary-page .summary-list-card {
+        flex: 1;
+        min-height: 0;
+    }
+
+    .thirty-teach-summary-page .summary-list-card > .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .thirty-teach-summary-page .summary-table-container {
+        flex: 1;
+        min-height: 0;
+    }
+</style>
+
+<div id="app" class="thirty-teach-summary-page" v-cloak>
     <guava ref="guava">
         <template>
-            <el-card shadow="never">
+            <el-card shadow="never" class="summary-search-card">
                 <search @search="doSearch">
                     <search-item label="所属工会">
                         <el-select v-model="pageForm.unionId" placeholder="请选择所属工会"
@@ -29,29 +69,31 @@ layout("/layouts/platform.html"){
 
             </el-card>
 
-            <el-card shadow="never" class="mt10">
+            <el-card shadow="never" class="mt10 summary-list-card">
                 <table-tool label="教职工汇总">
                     <el-button size="small" @click="doExportSummary" type="primary">
                         导出汇总表
                     </el-button>
                 </table-tool>
-                <el-table ref="table" :data="tableData" style="width: 100%" row-key="id"
-                          @sort-change="pageOrder" show-summary
-                          v-loading="tableLoading" :size="tableSize" class="vi-table">
-                    <el-table-column align="center" header-align="center" type="index"
-                                     :index="indexMethod" label="序号"
-                                     width="80px"></el-table-column>
-                    <el-table-column
-                            align="center"
-                            header-align="center"
-                            v-for="column in tableColumns"
-                            show-overflow-tooltip
-                            :label="column.label"
-                            :prop="column.prop"
-                            :sortable="column.sortable"
-                    >
-                    </el-table-column>
-                </el-table>
+                <div class="summary-table-container">
+                    <el-table ref="table" :data="tableData" style="width: 100%" row-key="id"
+                              @sort-change="pageOrder" show-summary height="100%"
+                              v-loading="tableLoading" :size="tableSize" class="vi-table">
+                        <el-table-column align="center" header-align="center" type="index"
+                                         :index="indexMethod" label="序号"
+                                         width="80px"></el-table-column>
+                        <el-table-column
+                                align="center"
+                                header-align="center"
+                                v-for="column in tableColumns"
+                                show-overflow-tooltip
+                                :label="column.label"
+                                :prop="column.prop"
+                                :sortable="column.sortable"
+                        >
+                        </el-table-column>
+                    </el-table>
+                </div>
 
             </el-card>
         </template>
@@ -71,10 +113,10 @@ layout("/layouts/platform.html"){
                 },
                 tableColumns: [
                     {prop: 'name', label: '分工会名称', sortable: true},
+                    {prop: 'userNum', label: '人数', sortable: true},
                     {prop: 'willThirtyNum', label: '即将满30年', sortable: true},
                     {prop: 'anniversaryThirtyNum', label: '周年满30年', sortable: true},
                     {prop: 'overThirtyNum', label: '超过30年', sortable: true},
-                    {prop: 'userNum', label: '人数', sortable: true},
                 ],
                 unionOptions: [],
                 unitOptions: [],
diff --git a/src/main/resources/views/platform/zhgh/welfare/statistics/index.html b/src/main/resources/views/platform/zhgh/welfare/statistics/index.html
index 4dc8b373..f34fa1fe 100644
--- a/src/main/resources/views/platform/zhgh/welfare/statistics/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/statistics/index.html
@@ -2,10 +2,50 @@
 layout("/layouts/platform.html"){
 #-->
 
-<div id="app" v-cloak>
+<style>
+    /* 扣除平台顶部导航 64px 和内容区上下间距 20px，让列表使用剩余可视高度。 */
+    .welfare-statistics-page {
+        height: calc(100vh - 84px);
+    }
+
+    .welfare-statistics-page > .guava-main-content {
+        height: 100%;
+    }
+
+    .welfare-statistics-page > .guava-main-content > .transition-item {
+        display: flex;
+        flex-direction: column;
+        min-height: 0;
+    }
+
+    .welfare-statistics-page .statistics-search-card,
+    .welfare-statistics-page .statistics-list-card > .el-card__body > .ele-table-tool {
+        flex-shrink: 0;
+    }
+
+    /* 列表卡片允许收缩，避免数据行撑高外层页面；表头和合计由 el-table 固定。 */
+    .welfare-statistics-page .statistics-list-card {
+        flex: 1;
+        min-height: 0;
+    }
+
+    .welfare-statistics-page .statistics-list-card > .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .welfare-statistics-page .statistics-table-container {
+        flex: 1;
+        min-height: 0;
+    }
+</style>
+
+<div id="app" class="welfare-statistics-page" v-cloak>
     <guava ref="guava">
         <template>
-            <el-card shadow="never">
+            <el-card class="statistics-search-card" shadow="never">
                 <search @search="doSearch">
                     <search-item label="年度">
                         <el-date-picker
@@ -31,7 +71,7 @@ layout("/layouts/platform.html"){
                 </search>
             </el-card>
 
-            <el-card class="mt10" shadow="never" v-loading="tableLoading">
+            <el-card class="mt10 statistics-list-card" shadow="never" v-loading="tableLoading">
                 <table-tool label="工会列表">
                     <el-button @click="exportByWelfareOptions" icon="el-icon-printer" size="small" type="primary">按福利选项导出</el-button>
                     <template v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','SCHOOL_UNION_WELFARE_ADMIN'])">
@@ -40,38 +80,41 @@ layout("/layouts/platform.html"){
                         </el-button>
                     </template>
                 </table-tool>
-                <el-table
-                    :data="tableData"
-                    :size="tableSize"
-                    @sort-change="pageOrder"
-                    class="vi-table"
-                    lazy
-                    ref="table"
-                    row-key="id"
-                    show-summary
-                    style="width: 100%"
-                    v-if="tableData&&tableData.length>0"
-                >
-                    <el-table-column type="index" width="50"></el-table-column>
-                    <el-table-column
-                        :key="column.prop"
-                        :label="column.label"
-                        :prop="column.prop"
-                        :sortable="column.sortable"
-                        :width="column.width"
-                        align="center"
-                        show-overflow-tooltip
-                        v-for="column in tableColumns"
+                <div class="statistics-table-container">
+                    <el-table
+                        :data="tableData"
+                        :size="tableSize"
+                        @sort-change="pageOrder"
+                        class="vi-table"
+                        height="100%"
+                        lazy
+                        ref="table"
+                        row-key="id"
+                        show-summary
+                        style="width: 100%"
+                        v-if="tableData&&tableData.length>0"
                     >
-                        <template scope="{row}" v-if="column.prop=='welfareUnitName'">{{row.welfareUnitName}}</template>
-                        <template scope="{row}" v-else-if="column.prop=='selectedNum'">
-                            <el-link @click="openSelected(row)" type="primary">{{row.selectedNum}}</el-link>
-                        </template>
-                        <template scope="{row}" v-else-if="column.prop=='unSelectedNum'">
-                            <el-link @click="openUnSelected(row)" type="primary">{{row.unSelectedNum}}</el-link>
-                        </template>
-                    </el-table-column>
-                </el-table>
+                        <el-table-column type="index" width="50"></el-table-column>
+                        <el-table-column
+                            :key="column.prop"
+                            :label="column.label"
+                            :prop="column.prop"
+                            :sortable="column.sortable"
+                            :width="column.width"
+                            align="center"
+                            show-overflow-tooltip
+                            v-for="column in tableColumns"
+                        >
+                            <template scope="{row}" v-if="column.prop=='welfareUnitName'">{{row.welfareUnitName}}</template>
+                            <template scope="{row}" v-else-if="column.prop=='selectedNum'">
+                                <el-link @click="openSelected(row)" type="primary">{{row.selectedNum}}</el-link>
+                            </template>
+                            <template scope="{row}" v-else-if="column.prop=='unSelectedNum'">
+                                <el-link @click="openUnSelected(row)" type="primary">{{row.unSelectedNum}}</el-link>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
             </el-card>
         </template>
     </guava>