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

Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线

This commit is contained in:
lys 2025-04-17 14:25:10 +08:00
parent 799b086d9b 854a49b018
commit d911f0bcba
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
View File

@ -32,10 +32,10 @@ class PayrollPartTable extends Component {
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible) {
nextProps.visible && this.sendRangeList(nextProps);
this.setState({ selectedRowKeys: [] });
}
if (nextProps.visible !== this.props.visible && nextProps.visible) this.sendRangeList(nextProps);
if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 }
});
}
sendRangeList = (props) => {
@ -52,9 +52,9 @@ class PayrollPartTable extends Component {
sendRangeList(payload).then(({ status, data }) => {
this.setState({ loading: { ...loading, query: false } });
if (status) {
const { pageNum: current, pageSize, total, columns, list: dataSource } = data;
const { pageNum: current, total, columns, list: dataSource } = data;
this.setState({
pageInfo: { ...pageInfo, current, pageSize, total },
pageInfo: { ...pageInfo, current, total },
dataSource: _.map(dataSource, it => ({
...it,
includeObj: _.map(it.includeObj, child => child.targetName || child.targetTypeName).join(","),
@ -125,8 +125,7 @@ class PayrollPartTable extends Component {
onChange: current => {
this.setState({
pageInfo: { ...pageInfo, current }
}, () => {
});
}, () => this.sendRangeList({ grantType, salarySendId }));
}
};
const rowSelection = {