From 684665384d02d9e30a0c531ceaab96becc44eace Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 19 Feb 2025 14:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A1=AB=E6=8A=A5=E5=88=97?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/smartExcel/filling.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/smartExcel/filling.vue b/src/views/modules/base/smartExcel/filling.vue
index 21ab2618e..9452a814a 100644
--- a/src/views/modules/base/smartExcel/filling.vue
+++ b/src/views/modules/base/smartExcel/filling.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="g-main" :style="{ height: tableHeight }">
+    <div class="g-main">
         <div v-show="pageType == 'list'">
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
@@ -51,7 +51,7 @@
             </div>
 
             <div class="m-table">
-                <el-table :data="tableData" border class="m-table-item" style="width: 100%" :height="maxTableHeight">
+                <el-table :data="tableData" border class="m-table-item" style="width: 100%" :height="tableHeight">
                     <el-table-column label="" fixed="left" type="selection" align="center" width="50" />
                     <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
                     <el-table-column prop="agencyName" align="center" label="发布组织" :show-overflow-tooltip="true">
@@ -189,8 +189,9 @@ export default {
     },
     computed: {
         tableHeight() {
-            return (this.clientHeight - 140) + 'px'
-
+            const h = this.clientHeight - this.searchH - 200 + this.iframeHeight;
+            const _h = this.clientHeight - 200 - this.searchH;
+            return this.$store.state.inIframe ? h : _h;
         },
         ...mapGetters(['clientHeight', 'resolution']),
     },