From f111164783bf012cc88afbf89dfb32bc392f2242 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 27 Dec 2024 14:09:55 +0800
Subject: [PATCH] =?UTF-8?q?release/2.18.2.2412.02-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataAcquisition/otherDeduct/detailSettingsDialog.js      | 5 +++--
 .../pages/dataAcquisition/otherDeduct/taxSetDialog.js        | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/detailSettingsDialog.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/detailSettingsDialog.js
index 84627b47..47c31fcb 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/detailSettingsDialog.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/detailSettingsDialog.js
@@ -62,7 +62,7 @@ class DetailSettingsDialog extends Component {
             this.setState({ loading: false });
             if (status) {
               message.success(getLabel(111, "操作成功！"));
-              this.props.onCancel(this.props.onSuccess());
+              this.props.onCancel(this.props.onSuccess);
             } else {
               message.error(errormsg);
             }
@@ -148,7 +148,8 @@ class DetailSettingsDialog extends Component {
     };
     return (
       <WeaDialog
-        {...this.props} style={{ width: 480, minHeight: 127 }} initLoadCss title={getLabel(111, "明细设置")}
+        {...this.props} initLoadCss title={getLabel(111, "明细设置")}
+        style={{ width: 480, height: _.reduce(conditions, (pre, cur) => (pre += cur.items.length), 0) * 47 + 33 }}
         buttons={[
           <Button type="primary" onClick={this.save} loading={loading}>{getLabel(111, "确定")}</Button>,
           <Button type="ghost" onClick={this.props.onCancel}>{getLabel(111, "取消")}</Button>
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
index 5025d4b4..821442b1 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
@@ -127,9 +127,9 @@ class TaxSetDialog extends Component {
           <WeaTable columns={columns} dataSource={dataSource} pagination={pagination} bordered
                     rowSelection={rowSelection} loading={loading} rowKey="id"
                     scroll={{ y: this.taxSetRef ? this.taxSetRef.state.height - 164 : 600 }}/>
-          <DetailSettingsDialog {...detailSettingsDialog} onCancel={() => this.setState({
+          <DetailSettingsDialog {...detailSettingsDialog} onCancel={(callback) => this.setState({
             detailSettingsDialog: { ...detailSettingsDialog, visible: false, id: "" }
-          })} onSuccess={this.getList}/>
+          }, () => callback && callback())} onSuccess={this.getList}/>
         </Spin>
       </div>
     </WeaDialog>);