From f113cb437f2f9c5a2ea0527496677ea2d380bc15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 30 Nov 2023 14:52:14 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.9.42310.02-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/welfareEditArchiveSlide/index.js | 6 +++++- .../components/welfareTableList/index.js | 10 ++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js index bcfa19cd..8a1c7579 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js @@ -195,13 +195,17 @@ class Index extends Component { }); renderTitle = () => { const { loading } = this.state; + const { runStatuses } = this.props; return
{getLabel(543191, "员工福利档案")}
- + { + runStatuses !== "4,5" && + + }
; }; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js index 86a5e3bc..7abea7c9 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js @@ -59,7 +59,8 @@ class Index extends Component { } if ((nextProps.runStatuses !== this.props.runStatuses)) { this.setState({ - dataSource: [], columns: [], loading: false, selectedRowKeys: [] + dataSource: [], columns: [], loading: false, selectedRowKeys: [], + welfareEditSlide: { ...this.state.welfareEditSlide, visible: false } }); } } @@ -70,6 +71,7 @@ class Index extends Component { this.getWelfareList(this.props); } else if (type === "turn") { const { record: { baseInfo, employeeId, paymentOrganization } = {}, interfaceParams = {} } = params; + const { runStatuses } = this.props; switch (id) { case "PAGEINFO": this.setState({ @@ -90,7 +92,7 @@ class Index extends Component { ]); this.setState({ welfareEditSlide: { - ...this.state.welfareEditSlide, employeeId, paymentOrganization, + ...this.state.welfareEditSlide, employeeId, paymentOrganization, runStatuses, socialItems: socialItems.data.items[0].items, socialBaseData: { SOCIAL_SECURITY: { ...socialItems.data.data, socialUnderTake: socialItems.data.data.underTake } @@ -268,8 +270,8 @@ class Index extends Component {