From ff1da8b19bcdf32abbb923af4037e969cc16f19b Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 4 Sep 2025 09:59:22 +0800 Subject: [PATCH 1/2] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js index f221b0ef..e8b7cc58 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js +++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js @@ -89,7 +89,12 @@ class MySalaryView extends Component { this.setState({ captchaVisible: false })} - onConfirm={() => this.props.mySalaryStore.setInitEmVerify()} + onConfirm={() => { + this.props.mySalaryStore.setInitEmVerify(); + this.props.mySalaryStore.getMySalaryBill(Number(salaryInfoId)).then(data => { + this.setState({ mySalaryStore: data }); + }); + }} /> ; } From 915e946c3e82dd738128a80b265d6094a73fa6bd Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 12 Sep 2025 09:57:54 +0800 Subject: [PATCH 2/2] release/2.19.1.2501.01 --- .../pages/declare/generateDeclarationDetail.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js index 91a1a88f..22d1c5ea 100644 --- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js +++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js @@ -2,6 +2,7 @@ import React from "react"; import { inject, observer } from "mobx-react"; import { WeaLocaleProvider, WeaTable, WeaTop } from "ecCom"; import { getQueryString } from "../../util/url"; +import { sysinfo } from "../../apis/ruleconfig"; import * as API from "../../apis/declare"; import { Button } from "antd"; import "./index.less"; @@ -14,15 +15,21 @@ export default class GenerateDeclarationDetail extends React.Component { super(props); this.state = { loading: false, dataSource: [], columns: [], declareInfo: {}, - pageInfo: { current: 1, pageSize: 10, total: 0 } + pageInfo: { current: 1, pageSize: 10, total: 0 }, sysinfo: {} }; } componentDidMount() { this.getDetailList(); this.getDeclareInfo(); + this.getSysinfo(); } + getSysinfo = () => { + sysinfo().then(({ status, data: sysinfo }) => { + if (status) this.setState({ sysinfo }); + }); + }; getDetailList = () => { const { pageInfo } = this.state; const payload = { @@ -64,9 +71,10 @@ export default class GenerateDeclarationDetail extends React.Component { window.open(url, "_self"); }; renderTitle = () => { - const { declareInfo } = this.state; + const { declareInfo, sysinfo } = this.state; + const title = sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月"); return ( - {getLabel(111, "薪资所属月")}:{declareInfo.salaryMonth} + {title}:{declareInfo.salaryMonth} {getLabel(111, "个税扣缴义务人")}:{declareInfo.taxAgentName} ); };