From 3fbe08ab2ef63091814d691ecc80e8a1c52386a2 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 8 Nov 2024 15:16:09 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.16.1.2410.01-=E8=96=AA=E9=85=AC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E8=96=AA=E8=B5=84=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=92=8C=E6=A8=A1=E6=9D=BF=E5=88=9B=E5=BB=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/salaryDetails.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js index b5e9acc5..e9108e3d 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js @@ -183,8 +183,7 @@ class SalaryDetails extends Component { const { transferDialog, tempDialog } = this.state, { type } = transferDialog; if (type === "temp") { this.setState({ - tempDialog: { ...tempDialog, visible: true, setting: _.map(values, o => o.id) }, - transferDialog: { ...this.state.transferDialog, visible: false, cancel: true, type: "default" } + tempDialog: { ...tempDialog, visible: true, setting: _.map(values, o => o.id) } }); return; } @@ -273,7 +272,11 @@ class SalaryDetails extends Component { {/*薪资明细模板设置*/} this.setState({ - tempDialog: { ...tempDialog, visible: false, setting: [] } + tempDialog: { ...tempDialog, visible: false, setting: [] }, + transferDialog: { + ...this.state.transferDialog, + visible: false, cancel: true, type: "default" + } }, () => callback && callback())}/>