diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js index 6fca282a..4523d1b0 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js @@ -5,7 +5,7 @@ * Date: 2023/8/22 */ import React, { Component } from "react"; -import { WeaLocaleProvider, WeaLoadingGlobal } from "ecCom"; +import { WeaLoadingGlobal, WeaLocaleProvider } from "ecCom"; import { inject, observer } from "mobx-react"; import { Button, message, Modal } from "antd"; import PaymentDialog from "./paymentDialog"; @@ -46,7 +46,7 @@ class PaymentBtn extends Component { style={{ textAlign: "center" }}>{getLabel(111, "若申请过银行缴款,点击确定,将自动作废银行缴款凭证。并进行三方缴款。 ")} , onOk: () => { - taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id") }) + taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id"), reportType: this.props.reportType }) .then(({ status, data, errormsg }) => { if (status) { const { paymentDialog } = this.state; @@ -82,7 +82,8 @@ class PaymentBtn extends Component { const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo; const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth: taxYearMonth + "-01" + taxAgentId, taxYearMonth: taxYearMonth + "-01", + reportType: this.props.reportType }; this.setState({ paymentDialog: { @@ -122,7 +123,7 @@ class PaymentBtn extends Component { }; getBankAccountInfo = (payload) => { let loop = () => { - WeaLoadingGlobal.start({ tip: getLabel(111, "获取三方信息中...") }); + WeaLoadingGlobal.start({ tip: getLabel(111, "获取三方信息中...") }); clearTimeout(this.timer); this.timer = setTimeout(async () => { let response = await taxPaymentgetAgreementFeedback(payload); @@ -236,7 +237,7 @@ class PaymentBtn extends Component { }; handleMenuChange = ({ key }) => { if (key === "bank_voucher_payment") { - taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id") }) + taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id"), reportType: this.props.reportType }) .then(({ status, data, errormsg }) => { if (status) { const { paymentDialog } = this.state; diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js index b3afe5e3..9dbb3b03 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js @@ -53,7 +53,8 @@ class PaymentFeedbackBtn extends Component { const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo; const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth: taxYearMonth + "-01" + taxAgentId, taxYearMonth: taxYearMonth + "-01", + reportType: this.props.reportType }; this.setState({ paymentDialog: { @@ -152,7 +153,7 @@ class PaymentFeedbackBtn extends Component { return { ...it, options: [ - { key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true }, + { key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true } // { key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") } ] }; diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js index 692bb99e..c1dffb77 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js @@ -430,7 +430,7 @@ class Index extends Component { if (intelCalcSalaryStatus && (declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID")) { btns.push( , - + ); } if (intelCalcSalaryStatus && declareInfo.taxPaidAmount && parseFloat(declareInfo.taxPaidAmount) > 0) {