From 2fd927a90c39f4535e2d172fbadc7f2aa03fb562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 5 Nov 2026 15:01:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A2=84=E4=BB=98=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8E=E7=BB=93=E7=AE=97=E8=B0=83=E6=95=B4=E5=8D=95?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=9B=BA=E5=AE=9A=E5=BA=95=E9=83=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2label=E4=B8=8D=E5=86=8D=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/settlement/formalSettlement.js     |  2 +-
 src/views/settlement/pre-settlement.vue       | 32 ++++++++++++++++++-
 .../settlement/settlement-adjustment.vue      | 30 +++++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/option/settlement/formalSettlement.js b/src/option/settlement/formalSettlement.js
index 6fdc26b..6e335c0 100644
--- a/src/option/settlement/formalSettlement.js
+++ b/src/option/settlement/formalSettlement.js
@@ -118,7 +118,7 @@ export const formalSettlementOption = (settlementType = '') => ({
   emptyBtnText: '重置',
   searchShow: true,
   searchIcon: true,
-  searchLabelWidth: 88,
+  searchLabelWidth: 100,
   // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
   searchMenuSpan: 4,
   searchIndex: 4,
diff --git a/src/views/settlement/pre-settlement.vue b/src/views/settlement/pre-settlement.vue
index 8648db4..a36e4b4 100644
--- a/src/views/settlement/pre-settlement.vue
+++ b/src/views/settlement/pre-settlement.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container class="pre-settlement-page">
     <section v-show="searchVisible" class="pre-settlement-page__search">
-      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
+      <el-form :model="query" label-position="right" label-width="100px" @submit.prevent>
         <div class="pre-settlement-page__search-grid">
           <template v-for="field in visibleSearchFields" :key="field.prop">
             <el-form-item :label="field.label">
@@ -108,6 +108,7 @@
         :data="rows"
         :size="tableSize"
         border
+        height="100%"
         class="pre-settlement-page__table"
         @selection-change="handleSelectionChange"
       >
@@ -768,8 +769,27 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单 avue 高度自适应对齐）
+// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
+$pre_page_height: calc(100vh - 114px);
+
 .pre-settlement-page {
+  height: $pre_page_height;
+
+  :deep(.basic-container__card) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+  }
+
   &__search {
+    flex-shrink: 0;
     padding: 12px 12px 4px;
     background: #fff;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -801,6 +821,10 @@ export default {
   }
 
   &__table-panel {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
     margin-top: 8px;
   }
 
@@ -823,8 +847,14 @@ export default {
     justify-content: center;
   }
 
+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
+
   &__pagination {
     display: flex;
+    flex-shrink: 0;
     justify-content: flex-end;
     padding: 12px;
   }
diff --git a/src/views/settlement/settlement-adjustment.vue b/src/views/settlement/settlement-adjustment.vue
index 19732c9..4a7612d 100644
--- a/src/views/settlement/settlement-adjustment.vue
+++ b/src/views/settlement/settlement-adjustment.vue
@@ -69,6 +69,8 @@
         :data="rows"
         :size="tableSize"
         border
+        height="100%"
+        class="settlement-adjustment-page__table"
         @selection-change="selection = $event"
       >
         <el-table-column type="selection" width="52" fixed="left" align="center" /><el-table-column
@@ -389,8 +391,27 @@ export default {
 </script>
 
 <style scoped lang="scss">
+// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单对齐）
+// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
+$adjustment_page_height: calc(100vh - 114px);
+
 .settlement-adjustment-page {
+  height: $adjustment_page_height;
+
+  :deep(.basic-container__card) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+  }
+
   &__search {
+    flex-shrink: 0;
     padding: 12px 12px 4px;
     background: #fff;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -417,6 +438,10 @@ export default {
     margin-bottom: 8px;
   }
   &__table-panel {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
     margin-top: 8px;
   }
   &__toolbar {
@@ -431,8 +456,13 @@ export default {
     justify-content: center;
     gap: 8px;
   }
+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
   &__pagination {
     display: flex;
+    flex-shrink: 0;
     justify-content: flex-end;
     padding: 12px;
   }