hotfix/2.15.1.2409.01

浮动薪酬模块页面样式调整

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)` }}/>
     );
   }
 }

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, "新增薪资项目") }

pc4mobx/hrmSalary/pages/variableSalary/index.less

@@ -4,7 +4,6 @@
   }
 
   .wea-new-top-req-content {
-    padding: 16px;
 
     .wea-new-table {
       background: #FFF;

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;
   }