qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release/2.18.2.2412.02-个税

This commit is contained in:
lys 2024-12-27 14:09:55 +08:00
parent 7216560bfd
commit f111164783
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/detailSettingsDialog.js
View File

@ -62,7 +62,7 @@ class DetailSettingsDialog extends Component {
this.setState({ loading: false }); this.setState({ loading: false });
if (status) { if (status) {
message.success(getLabel(111, "操作成功！")); message.success(getLabel(111, "操作成功！"));
this.props.onCancel(this.props.onSuccess()); this.props.onCancel(this.props.onSuccess);
} else { } else {
message.error(errormsg); message.error(errormsg);
} }
@ -148,7 +148,8 @@ class DetailSettingsDialog extends Component {
}; };
return ( return (
<WeaDialog <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={[ buttons={[
<Button type="primary" onClick={this.save} loading={loading}>{getLabel(111, "确定")}</Button>, <Button type="primary" onClick={this.save} loading={loading}>{getLabel(111, "确定")}</Button>,
<Button type="ghost" onClick={this.props.onCancel}>{getLabel(111, "取消")}</Button> <Button type="ghost" onClick={this.props.onCancel}>{getLabel(111, "取消")}</Button>

4
pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
View File

@ -127,9 +127,9 @@ class TaxSetDialog extends Component {
<WeaTable columns={columns} dataSource={dataSource} pagination={pagination} bordered <WeaTable columns={columns} dataSource={dataSource} pagination={pagination} bordered
rowSelection={rowSelection} loading={loading} rowKey="id" rowSelection={rowSelection} loading={loading} rowKey="id"
scroll={{ y: this.taxSetRef ? this.taxSetRef.state.height - 164 : 600 }}/> 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: "" } detailSettingsDialog: { ...detailSettingsDialog, visible: false, id: "" }
})} onSuccess={this.getList}/> }, () => callback && callback())} onSuccess={this.getList}/>
</Spin> </Spin>
</div> </div>
</WeaDialog>); </WeaDialog>);