diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js index 73539c8d..7280fec4 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js @@ -178,7 +178,7 @@ class Index extends Component { pageInfo: { ...pageInfo, current, pageSize, total } }, () => { const payload = { - dataSource, selectedRowKeys, + dataSource, selectedRowKeys, selectedKey, pageInfo: this.state.pageInfo, columns: _.map(columns, it => { if (it.dataIndex === "employeeName" || it.dataIndex === "subCompanyName") { @@ -208,7 +208,6 @@ class Index extends Component { }; this.setState({ loading: { ...this.state.loading, refresh: true } }); employeedeclareRefresh(payload).then(async ({ status, data, errormsg }) => { - this.setState({ loading: { ...this.state.loading, refresh: false } }); if (status) { message.destroy(); message.loading(getLabel(111, "刷新中..."), 0); @@ -217,12 +216,14 @@ class Index extends Component { const { status: rateStatus, finish, msg } = result; if (resStatus && rateStatus) { if (finish) { + this.setState({ loading: { ...this.state.loading, refresh: false } }); clearInterval(this.timer); message.destroy(); message.success(getLabel(111, "刷新成功!")); this.queryEmployeeList(); } } else { + this.setState({ loading: { ...this.state.loading, refresh: false } }); clearInterval(this.timer); message.destroy(); message.warning(msg || getLabel(111, "刷新失败!")); @@ -230,6 +231,7 @@ class Index extends Component { } }, 1000); } else { + this.setState({ loading: { ...this.state.loading, refresh: false } }); clearInterval(this.timer); message.destroy(); message.error(errormsg); @@ -253,7 +255,6 @@ class Index extends Component { }; this.setState({ loading: { ...this.state.loading, feedback: true } }); getDeclareFeedback(payload).then(async ({ status, data, errormsg }) => { - this.setState({ loading: { ...this.state.loading, feedback: false } }); if (status) { message.destroy(); message.loading(getLabel(111, "获取报送中..."), 0); @@ -262,12 +263,14 @@ class Index extends Component { const { status: rateStatus, finish, msg } = result; if (resStatus && rateStatus) { if (finish) { + this.setState({ loading: { ...this.state.loading, feedback: false } }); clearInterval(this.timer); message.destroy(); message.success(getLabel(111, "获取报送结果成功!")); this.queryEmployeeList(); } } else { + this.setState({ loading: { ...this.state.loading, feedback: false } }); clearInterval(this.timer); message.destroy(); message.warning(msg || getLabel(111, "获取失败!")); @@ -275,6 +278,7 @@ class Index extends Component { } }, 1000); } else { + this.setState({ loading: { ...this.state.loading, feedback: false } }); clearInterval(this.timer); message.destroy(); message.error(errormsg); @@ -324,7 +328,6 @@ class Index extends Component { }; this.setState({ loading: { ...this.state.loading, declare: true } }); employeedeclareDeclare(payload).then(async ({ status, data, errormsg }) => { - this.setState({ loading: { ...this.state.loading, declare: false } }); if (status) { message.destroy(); message.loading(getLabel(111, "报送中..."), 0); @@ -333,12 +336,14 @@ class Index extends Component { const { status: rateStatus, finish, msg } = result; if (resStatus && rateStatus) { if (finish) { + this.setState({ loading: { ...this.state.loading, declare: false } }); clearInterval(this.timer); message.destroy(); message.success(getLabel(111, "全部报送成功!")); this.queryEmployeeList(); } } else { + this.setState({ loading: { ...this.state.loading, declare: false } }); clearInterval(this.timer); message.destroy(); message.warning(msg || getLabel(111, "报送失败!")); @@ -346,6 +351,7 @@ class Index extends Component { } }, 1000); } else { + this.setState({ loading: { ...this.state.loading, declare: false } }); clearInterval(this.timer); message.destroy(); message.error(errormsg);