From 4b95f6811fdacca262467c5c5b030abff69a8be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 19 Feb 2024 09:03:40 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logViewModal/components/detailLogView/index.js           | 2 +-
 pc4mobx/hrmSalary/components/logViewModal/index.less         | 4 +---
 pc4mobx/hrmSalary/pages/ledgerPage/index.less                | 2 +-
 pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js            | 5 +++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js
index 7ca588a9..f19e1c05 100644
--- a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js
+++ b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js
@@ -66,7 +66,7 @@ class Index extends Component {
             _.map(dataSource, item => (!_.isEmpty(item.valueschanges) ? <WeaTransferList
               data={item.valueschanges} renderItem={(it) => (<div className="detailBox">
               <div className="order">{it.id}</div>
-              <div className="content">{it.name}</div>
+              <div className="content" title={it.name}>{it.name}</div>
             </div>)}
               height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]}
             /> : <div className="empty">{getLabel(111, "无数据变更记录")}</div>))
diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.less b/pc4mobx/hrmSalary/components/logViewModal/index.less
index 79d0bee5..1d54174f 100644
--- a/pc4mobx/hrmSalary/components/logViewModal/index.less
+++ b/pc4mobx/hrmSalary/components/logViewModal/index.less
@@ -71,10 +71,8 @@
               position: relative;
               flex: 1;
               min-height: 40px;
+              line-height: 40px;
               color: #000;
-              display: flex;
-              align-items: center;
-              justify-content: flex-start;
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/index.less
index 36f3ec2b..2fc10db7 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.less
@@ -1,7 +1,7 @@
 .ledgerOuter {
   .wea-new-top {
     .ant-col-10 {
-      span:nth-child(2) {
+      & > span:nth-child(2) {
         margin-top: -6px;
       }
     }
diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
index 3a221393..cef2bb12 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
@@ -9,9 +9,9 @@ import { WeaLocaleProvider, WeaReqTop } from "ecCom";
 import Payroll from "./components/payrollTable";
 import SalaryAdjustmentRecords from "./components/SalaryAdjustmentRecords";
 import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide";
+import LogDialog from "../../components/logViewModal";
 import moment from "moment";
 import "./index.less";
-import LogDialog from "../../components/logViewModal";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -65,6 +65,7 @@ class Index extends Component {
                           onChange={v => this.setState({ salaryYearMonth: v })}/>
       </div>
     ];
+    const logFunction = selectedKey === "1" ? "mysalarybill" : "myadjustrecord";
     return (
       <WeaReqTop
         title={getLabel(537998, "我的薪资福利")} icon={<i className="icon-coms-fa"/>}
@@ -81,7 +82,7 @@ class Index extends Component {
       >
         {this.renderContent()}
         {/*操作日志*/}
-        <LogDialog visible={logDialogVisible} logFunction="salaryitem"
+        <LogDialog visible={logDialogVisible} logFunction={logFunction}
                    onCancel={() => this.setState({ logDialogVisible: false })}/>
       </WeaReqTop>
     );