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

Merge branch 'release/3.0.1.2504.01-合并业务线' into custom-中航富士达最新

This commit is contained in:
lys 2025-04-30 11:05:35 +08:00
parent 904384f30a 2e832e3aa9
commit b6abc09016
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
View File

@ -153,7 +153,7 @@ class StandingBook extends Component {
})} onOk={this.handleAccount} })} onOk={this.handleAccount}
/> />
{/*操作日志*/} {/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="siAccount" filterConditions={filterConditions} <LogDialog visible={logDialogVisible} logFunction="siaccount" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/> onCancel={() => this.setState({ logDialogVisible: false })}/>
{/*核算进度条*/} {/*核算进度条*/}
{ {

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
View File

@ -189,7 +189,7 @@ class Index extends Component {
{/*基数调整记录*/} {/*基数调整记录*/}
<RecordDialog visible={recordDialogVisible} onCancel={() => this.setState({ recordDialogVisible: false })}/> <RecordDialog visible={recordDialogVisible} onCancel={() => this.setState({ recordDialogVisible: false })}/>
{/*操作日志*/} {/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="siArchives" filterConditions={filterConditions} <LogDialog visible={logDialogVisible} logFunction="siarchives" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/> onCancel={() => this.setState({ logDialogVisible: false })}/>
{/* 导入*/} {/* 导入*/}
<WelfareArchivesImportDialog {...welfareImpDialog} <WelfareArchivesImportDialog {...welfareImpDialog}