From eb4517af0fdd7ba0e50252312cd63ad17aff1a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 11 Apr 2024 17:43:06 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.12.1.2403.02-=E4=B8=AA=E7=A8=8E-?= =?UTF-8?q?=E5=A4=96=E7=B1=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=8A=A5?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js | 3 ++- pc4mobx/hrmSalary/pages/declareDetail/index.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js index 986a05ae..4f6ad59f 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js @@ -262,7 +262,8 @@ class PaymentBtn extends Component { const { taxAgentId, taxCycle: taxYearMonth } = this.props.declareInfo; const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth: taxYearMonth + "-01" + taxAgentId, taxYearMonth: taxYearMonth + "-01", + reportType: this.props.reportType }; taxPaymentVoucherCancel(payload).then(({ status, errormsg }) => { if (status) { diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js index bb9e83bb..cf369c11 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js @@ -413,7 +413,7 @@ class Index extends Component { } if (intelCalcSalaryStatus && (declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID")) { btns.push( - , + , ); }