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) ? (
{it.id}
-
{it.name}
+
{it.name}
)} height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]} /> :
{getLabel(111, "无数据变更记录")}
)) 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 })}/> ]; + const logFunction = selectedKey === "1" ? "mysalarybill" : "myadjustrecord"; return ( } @@ -81,7 +82,7 @@ class Index extends Component { > {this.renderContent()} {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> );