diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index c288edd4..c27a6439 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -252,18 +252,15 @@ export default class Archives extends React.Component { }; // 导入 - handleBtnImport(runStatus) { + handleBtnImport = (runStatus) => { this.setState({ importVisible: true, runStatus }); - } + }; // 模板点击 handleTemplateLinkClick = (exportData) => { const { selectedKey } = this.state; - const { archivesStore: { exportTempateDownload } } = this.props; - exportTempateDownload({ - exportData, - runStatuses: selectedKey === "pending" ? ["1"] : ["2", "3"] - }); + let url = `/api/bs/hrmsalary/scheme/template/export?exportData=${exportData}&runStatuses=${selectedKey === "pending" ? "1" : "2,3"}`; + window.open(`${window.location.origin}${url}`); }; // 导入预览 diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 1197b332..9c65962b 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -349,7 +349,7 @@ export default class NormalIndex extends Component { this.setState({ addProps: { ...this.state.addProps, - title: "添加补缴人员", + title: "添加缴纳人员", visible: true } }); @@ -431,11 +431,21 @@ export default class NormalIndex extends Component { this.setState({ returnEditPersonSlide: { ...returnEditPersonSlide, visible: false, title: "", editId: "" } }, () => { - const { location } = this.props; - const { current } = this.state; - const billMonth = location.query.billMonth; - const paymentOrganization = location.query.paymentOrganization; - refreshList && this.getSupplementaryList({ billMonth, current, paymentOrganization }); + if (refreshList) { + const { current } = this.state; + const { billMonth, selectedKey, paymentOrganization } = this.props; + selectedKey === "1" + ? this.getNormalList({ + billMonth, + paymentOrganization, + current + }) + : this.getSupplementaryList({ + billMonth, + paymentOrganization, + current + }); + } }); }; @@ -510,14 +520,11 @@ export default class NormalIndex extends Component { render: (text, record) => { return (
- { - selectedKey === "3" && - this.handleEditNormalStandingBook(record)} - >编辑 - } + this.handleEditNormalStandingBook(record)} + >编辑
); }