From 7063732d6f3e1e3fa8793d907ad2f51b862ee699 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 8 Nov 2024 16:01:18 +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                     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index e9108e3d..565a87bd 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -74,7 +74,8 @@ class SalaryDetails extends Component {
       if (status) {
         this.setState({
           tempPageList: _.map(data, o => ({ key: String(o.id), showname: o.name })),
-          templateId: !_.isEmpty(_.find(data, o => !!o.checked)) ? String(_.find(data, o => !!o.checked).id) : ""
+          templateId: !_.isEmpty(_.find(data, o => !!o.checked)) ? String(_.find(data, o => !!o.checked).id) : "",
+          transferDialog: { ...this.state.transferDialog, visible: false, cancel: true, type: "default" }
         });
       }
     });
@@ -271,13 +272,9 @@ class SalaryDetails extends Component {
                                 })}/>
           {/*薪资明细模板设置*/}
           <SalaryDetailsTempDialog {...tempDialog} onSuccess={this.getPageListTemplatelist}
-                                   onCancel={callback => this.setState({
-                                     tempDialog: { ...tempDialog, visible: false, setting: [] },
-                                     transferDialog: {
-                                       ...this.state.transferDialog,
-                                       visible: false, cancel: true, type: "default"
-                                     }
-                                   }, () => callback && callback())}/>
+                                   onCancel={() => this.setState({
+                                     tempDialog: { ...tempDialog, visible: false, setting: [] }
+                                   })}/>
         </div>
       </React.Fragment>
     );