From 1c1aac66d7915b71a873f6c6a8d3b91a34891138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Sat, 14 Sep 2024 11:15:25 +0800
Subject: [PATCH] =?UTF-8?q?hotfix/2.15.1.2409.01=20=E6=B5=AE=E5=8A=A8?=
 =?UTF-8?q?=E8=96=AA=E9=85=AC=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/variableSalary/components/salaryItemList/index.js   | 2 +-
 pc4mobx/hrmSalary/pages/variableSalary/index.js               | 4 ++--
 pc4mobx/hrmSalary/pages/variableSalary/index.less             | 1 -
 pc4mobx/hrmSalary/style/index.less                            | 4 ++++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
index 210df203..bceb4585 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
@@ -105,7 +105,7 @@ class Index extends Component {
     };
     return (
       <WeaTable columns={columns} dataSource={dataSource} loading={loading} bordered
-                pagination={pagination} scroll={{ y: `calc(100vh - 202px)` }}/>
+                pagination={pagination} scroll={{ y: `calc(100vh - 170px)` }}/>
     );
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js
index 115aa93e..76e364e4 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js
@@ -97,7 +97,7 @@ class Index extends Component {
     const { taxAgentStore: { showOperateBtn }, baseTableStore: { VSSalaryItemForm } } = this.props;
     const tabs = [
       {
-        title: getLabel(111, "薪资档案"), key: "salaryFile", showDropIcon: true,
+        title: getLabel(111, "浮动数据"), key: "salaryFile", showDropIcon: true,
         dropMenuDatas: showOperateBtn ? [
           { key: "export", icon: <i className="icon-coms-export"/>, content: getLabel(111, "导出") },
           { key: "custom_cols", icon: <i className="icon-coms-Custom"/>, content: getLabel(32535, "显示列定制") }
@@ -125,7 +125,7 @@ class Index extends Component {
                                   onViewSalaryFile={(data) => this.handleOperate("create", data)}/>
       },
       {
-        title: getLabel(111, "薪资项目"), key: "salaryItem", showDropIcon: false, dropMenuDatas: [],
+        title: getLabel(111, "字段管理"), key: "salaryItem", showDropIcon: false, dropMenuDatas: [],
         buttons: showOperateBtn ? [
           <Button type="primary" onClick={() => this.setState({
             SIDialog: { visible: true, id: "", title: getLabel(111, "新增薪资项目") }
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.less b/pc4mobx/hrmSalary/pages/variableSalary/index.less
index b76440d6..55dbb34b 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/index.less
+++ b/pc4mobx/hrmSalary/pages/variableSalary/index.less
@@ -4,7 +4,6 @@
   }
 
   .wea-new-top-req-content {
-    padding: 16px;
 
     .wea-new-table {
       background: #FFF;
diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less
index 5f2c76d6..02955b0b 100644
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@@ -39,6 +39,10 @@
 .form-dialog-layout {
   background: #f6f6f6;
 
+  .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
+    line-height: 28px;
+  }
+
   .wea-search-group {
     padding: 16px;
   }