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

custom/钱智

This commit is contained in:
lys 2025-11-28 11:06:18 +08:00
parent 914742fdad
commit f6156ca336
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/baseInfo.js
View File

@ -31,7 +31,7 @@ class BaseInfo extends Component {
if (salaryInfo.status && salarySobCycle.status) {
this.setState({
salaryInfo: salaryInfo.data, salarySobCycle: salarySobCycle.data
}, () => this.props.onSetFormInfo(salaryInfo.data.formDTO.msg));
});
}
};

3
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
View File

@ -263,8 +263,9 @@ class EditCalcTable extends Component {
acctResultList(payload).then(({ status, data }) => {
this.setState({ loading: false });
if (status) {
const { columns, pageInfo: list } = data;
const { columns, pageInfo: list, msg } = data;
const { list: dataSource, pageNum: current, pageSize, total } = list;
this.props.onSetFormInfo(msg);
this.setState({ pageInfo: { ...pageInfo, current, pageSize, total } }, () => {
const { pageInfo, selectedRowKeys } = this.state;
const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : "";

14
pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
View File

@ -237,8 +237,11 @@ class Index extends Component {
</Dropdown.Button>,
<Button type="ghost" onClick={this.acctresultCalcTax}
loading={loading.calcTax}>{getLabel(111, "在线算税")}</Button>,
<Button type="ghost" loading={loading.feedback}
onClick={this.calcTaxFeedback}>{getLabel(111, "获取算税结果")}</Button>,
<div style={{ display: "flex", alignItems: "center" }}>
<Button type="ghost" loading={loading.feedback} style={{ marginRight: 10 }}
onClick={this.calcTaxFeedback}>{getLabel(111, "获取算税结果")}</Button>
{formMsg && <WeaHelpfulTip width={200} title={formMsg} placement="topLeft"/>}
</div>,
<Dropdown overlay={moreMenu}><Button type="ghost">{getLabel(17499, "更多")}</Button></Dropdown>,
<AdvanceInputBtn onOpenAdvanceSearch={() => this.calc.openAdvanceSearch()}
onAdvanceSearch={() => this.calc.onAdSearch(false)}/>
@ -250,7 +253,6 @@ class Index extends Component {
accountExceptInfo && reqBtns.unshift(<i className="iconfont icon-jinggao"
title={getLabel(111, "存在异常信息，点击下载！")}
onClick={() => this.downloadTxtfile(accountExceptInfo)}/>);
formMsg && reqBtns.unshift(<WeaHelpfulTip width={200} title={formMsg} placement="topLeft"/>);
break;
default:
break;
@ -271,11 +273,11 @@ class Index extends Component {
let dom = null;
switch (selectedKey) {
case "person":
dom = <SalaryCalcPersonConfirm calcDetail={!canEdit} {...this.props}
onSetFormInfo={v => this.setState({ formMsg: v })}/>;
dom = <SalaryCalcPersonConfirm calcDetail={!canEdit} {...this.props} />;
break;
case "calc":
dom = <SalaryEditCalc {...this.props} calcDetail={!canEdit} ref={dom => this.calc = dom}/>;
dom = <SalaryEditCalc {...this.props} calcDetail={!canEdit} ref={dom => this.calc = dom}
onSetFormInfo={v => this.setState({ formMsg: v })}/>;
break;
default:
break;