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

Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税

This commit is contained in:
lys 2025-07-11 17:21:17 +08:00
parent f8684ce32d ecee093b7d
commit 4c4dd3bd82
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
View File

@ -5,7 +5,7 @@
* Date: 2023/8/22 * Date: 2023/8/22
*/ */
import React, { Component } from "react"; import React, { Component } from "react";
import { WeaLocaleProvider, WeaLoadingGlobal } from "ecCom"; import { WeaLoadingGlobal, WeaLocaleProvider } from "ecCom";
import { inject, observer } from "mobx-react"; import { inject, observer } from "mobx-react";
import { Button, message, Modal } from "antd"; import { Button, message, Modal } from "antd";
import PaymentDialog from "./paymentDialog"; import PaymentDialog from "./paymentDialog";
@ -46,7 +46,7 @@ class PaymentBtn extends Component {
style={{ textAlign: "center" }}>{getLabel(111, "若申请过银行缴款，点击确定，将自动作废银行缴款凭证。并进行三方缴款。 ")}</div> style={{ textAlign: "center" }}>{getLabel(111, "若申请过银行缴款，点击确定，将自动作废银行缴款凭证。并进行三方缴款。 ")}</div>
</div>, </div>,
onOk: () => { onOk: () => {
taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id") }) taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id"), reportType: this.props.reportType })
.then(({ status, data, errormsg }) => { .then(({ status, data, errormsg }) => {
if (status) { if (status) {
const { paymentDialog } = this.state; const { paymentDialog } = this.state;
@ -82,7 +82,8 @@ class PaymentBtn extends Component {
const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo; const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo;
const payload = { const payload = {
taxDeclareRecordId: getQueryString("id"), taxDeclareRecordId: getQueryString("id"),
taxAgentId, taxYearMonth: taxYearMonth + "-01" taxAgentId, taxYearMonth: taxYearMonth + "-01",
reportType: this.props.reportType
}; };
this.setState({ this.setState({
paymentDialog: { paymentDialog: {
@ -236,7 +237,7 @@ class PaymentBtn extends Component {
}; };
handleMenuChange = ({ key }) => { handleMenuChange = ({ key }) => {
if (key === "bank_voucher_payment") { if (key === "bank_voucher_payment") {
taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id") }) taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id"), reportType: this.props.reportType })
.then(({ status, data, errormsg }) => { .then(({ status, data, errormsg }) => {
if (status) { if (status) {
const { paymentDialog } = this.state; const { paymentDialog } = this.state;

5
pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js
View File

@ -53,7 +53,8 @@ class PaymentFeedbackBtn extends Component {
const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo; const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo;
const payload = { const payload = {
taxDeclareRecordId: getQueryString("id"), taxDeclareRecordId: getQueryString("id"),
taxAgentId, taxYearMonth: taxYearMonth + "-01" taxAgentId, taxYearMonth: taxYearMonth + "-01",
reportType: this.props.reportType
}; };
this.setState({ this.setState({
paymentDialog: { paymentDialog: {
@ -152,7 +153,7 @@ class PaymentFeedbackBtn extends Component {
return { return {
...it, ...it,
options: [ options: [
{ key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true }, { key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true }
// { key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") } // { key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") }
] ]
}; };

2
pc4mobx/hrmSalary/pages/declareDetail/index.js
View File

@ -430,7 +430,7 @@ class Index extends Component {
if (intelCalcSalaryStatus && (declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID")) { if (intelCalcSalaryStatus && (declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID")) {
btns.push( btns.push(
<PaymentBtn declareInfo={declareInfo} updateDeclare={this.declare} reportType={reportType}/>, <PaymentBtn declareInfo={declareInfo} updateDeclare={this.declare} reportType={reportType}/>,
<PaymentFeedbackBtn declareInfo={declareInfo} updateDeclare={this.declare}/> <PaymentFeedbackBtn declareInfo={declareInfo} updateDeclare={this.declare} reportType={reportType}/>
); );
} }
if (intelCalcSalaryStatus && declareInfo.taxPaidAmount && parseFloat(declareInfo.taxPaidAmount) > 0) { if (intelCalcSalaryStatus && declareInfo.taxPaidAmount && parseFloat(declareInfo.taxPaidAmount) > 0) {