qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hotfix/2.9.42309.01

This commit is contained in:
黎永顺 2023-09-21 15:45:58 +08:00
parent f8393fbe7d
commit e4d9a2c545
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
View File

@ -158,9 +158,9 @@ class SalaryStatisticsDetailShareLogDialog extends Component {
title={
<div>
<p>{getLabel(111, "1、分享状态为成功且撤回状态为空时，可操作撤回；")}</p>
<p>{getLabel(111, "2、撤回后不可重新分享；")}</p>
<p>{getLabel(111, "3、分享状态为失败，可操作重新分享；")}</p>
<p>{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}</p>
{/*<p>{getLabel(111, "2、撤回后不可重新分享；")}</p>*/}
{/*<p>{getLabel(111, "3、分享状态为失败，可操作重新分享；")}</p>*/}
{/*<p>{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}</p>*/}
</div>
}
/>

2
pc4mobx/hrmSalary/pages/salaryItem/index.js
View File

@ -384,7 +384,7 @@ export default class SalaryItem extends React.Component {
onCancel={() => this.setState({
syncSalarySetDialog: {
...this.state.syncSalarySetDialog,
visible: false, id: "", title: ""
visible: false, title: ""
}
})}
/>

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
View File

@ -409,7 +409,7 @@ class AdjustTable extends Component {
if (_.isEmpty(errorMessage)) {
this.setState({
dataSource: _.map(this.state.dataSource, it => {
if (record.target === it.target && record.uuid === it.uuid) {
if (record.id === it.id || (!it.id && record.uuid === it.uuid)) {
return {
...it, status: true, id: successIds[0],
targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({

1
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
View File

@ -83,7 +83,6 @@ class AdjustmentSlide extends Component {
};
handleSetasDefault = () => {
const { adjustDefSlide } = this.state;
console.log(this.adjustTableRef.state.dataSource);
this.setState({
adjustDefSlide: {
...adjustDefSlide,