From 80307c7b9177da68c2c86d9b06fcc543284bfb71 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 14 Apr 2025 16:38:41 +0800
Subject: [PATCH] release/2.19.1.2501.01

---
 .../calculate/doCalc/components/salaryEditCalc/index.less     | 4 ++++
 pc4mobx/hrmSalary/pages/payrollFiles/config/index.js          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 4e3fb3b4..ff3ef53f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -150,6 +150,10 @@
 
       .esf-base-info-form, .wea-title, .wea-content {
         padding: 0;
+
+        .ant-row {
+          height: 100%;
+        }
       }
 
       .esf-form-content {
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
index ce378ee6..7802aee6 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
@@ -407,7 +407,7 @@ export const salaryFilesConditions = [
         domkey: ["position"],
         fieldcol: 14,
         label: "岗位",
-        lanId: 6086,
+        lanId: 111,
         labelcol: 10,
         value: "",
         viewAttr: 1