From d65245b330b4f3a08ba4318e3433121da08dbb41 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 30 Dec 2024 17:46:50 +0800
Subject: [PATCH] =?UTF-8?q?release/2.18.2.2412.02-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/ledgerPage/components/index.less         | 14 ++++++++++++--
 .../components/ledgerSalaryItemSelectDialog.js     |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
index 30f8c2e3..1d24e4df 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
@@ -249,7 +249,7 @@
   padding: 0;
   background: transparent;
   border: none;
-  font-size: 20px!important;
+  font-size: 20px !important;
   line-height: 20px;
 }
 
@@ -370,6 +370,16 @@
 
   .incomeDialogContent {
     height: 100%;
-    padding: 16px;
+    padding: 8px 16px;
+    background: #f6f6f6;
+
+    .wea-input-focus {
+      margin-bottom: 2px!important;
+      margin-top: 0!important;
+    }
+
+    .clearfix {
+      background: #FFF;
+    }
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
index 424f3294..008cd66b 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
@@ -71,7 +71,7 @@ class LedgerSalaryItemSelectDialog extends Component {
     };
     return (
       <WeaDialog
-        {...this.props} hasScroll className="incomeDialog" initLoadCss
+        {...this.props} hasScroll className="incomeDialog" initLoadCss ref={dom => this.incomeRef = dom}
         buttons={[
           <Button type="primary" onClick={this.props.handleClearSalaryItem}>{getLabel(111, "清除")}</Button>
         ]}
@@ -109,6 +109,7 @@ class LedgerSalaryItemSelectDialog extends Component {
             showHeader={false} dataSource={dataSource}
             loading={loading} pagination={pagination}
             columns={columns} onRowClick={this.handleRowClick}
+            scroll={{ y: this.incomeRef ? this.incomeRef.state.height - 106 : 600 }}
           />
         </div>
       </WeaDialog>