diff --git a/pc4mobx/hrmSalary/pages/bankVoucherDetail/index.js b/pc4mobx/hrmSalary/pages/bankVoucherDetail/index.js index 43916c7f..ff40a205 100644 --- a/pc4mobx/hrmSalary/pages/bankVoucherDetail/index.js +++ b/pc4mobx/hrmSalary/pages/bankVoucherDetail/index.js @@ -31,7 +31,7 @@ class Index extends Component { const payload = { taxDeclareRecordId: getQueryString("taxDeclareRecordId"), taxAgentId: getQueryString("taxAgentId"), - taxYearMonth: getQueryString("taxYearMonth"), + taxYearMonth: getQueryString("taxYearMonth") + "-01", checkFeedback: 0 }; this.setState({ loading: true }); diff --git a/pc4mobx/hrmSalary/pages/declare/declare.js b/pc4mobx/hrmSalary/pages/declare/declare.js index 1b05c827..d94d88ea 100644 --- a/pc4mobx/hrmSalary/pages/declare/declare.js +++ b/pc4mobx/hrmSalary/pages/declare/declare.js @@ -26,7 +26,7 @@ class Calculate extends Component { taxAgentName: "", dateRange: [ moment(new Date()).startOf("year").format("YYYY-MM"), - moment(new Date()).endOf("month").format("YYYY-MM") + moment(new Date()).endOf("year").format("YYYY-MM") ] }, isRefresh: false, declareDaialog: { visible: false, title: "" } diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js index 191e8d1a..986a05ae 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js @@ -183,7 +183,8 @@ class PaymentBtn extends Component { const { protocolNumber } = paymentForm.getFormParams(); const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth, taxAmount, protocolNumber + taxYearMonth: taxYearMonth + "-01", + taxAgentId, taxAmount, protocolNumber }; this.setState({ paymentDialog: { @@ -261,7 +262,7 @@ class PaymentBtn extends Component { const { taxAgentId, taxCycle: taxYearMonth } = this.props.declareInfo; const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth + taxAgentId, taxYearMonth: taxYearMonth + "-01" }; taxPaymentVoucherCancel(payload).then(({ status, errormsg }) => { if (status) { @@ -278,7 +279,7 @@ class PaymentBtn extends Component { const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo; const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth + taxAgentId, taxYearMonth: taxYearMonth + "-01" }; this.setState({ paymentDialog: { diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js index 7a9809bd..fca56898 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js @@ -53,7 +53,7 @@ class PaymentFeedbackBtn extends Component { const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo; const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth + taxAgentId, taxYearMonth: taxYearMonth + "-01" }; this.setState({ paymentDialog: { @@ -98,8 +98,9 @@ class PaymentFeedbackBtn extends Component { taxPaymentVoucherPrintFeedback = () => { const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo; const payload = { + taxYearMonth: taxYearMonth + "-01", taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth, checkFeedback: 1 + taxAgentId, checkFeedback: 1 }; this.setState({ paymentDialog: { diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js index 02c08064..1ac1f6b1 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js @@ -232,7 +232,7 @@ class Index extends Component { const { taxAgentId, taxCycle: taxYearMonth } = this.state.declareInfo; const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth + taxAgentId, taxYearMonth: taxYearMonth + "-01" }; this.setState({ loading: { ...this.state.loading, refreshingPay: true } }); taxPaymentVoucherStatusSync(payload).then(({ status, errormsg }) => { @@ -249,7 +249,7 @@ class Index extends Component { const { taxAgentId, taxCycle: taxYearMonth } = this.state.declareInfo; const payload = { taxDeclareRecordId: getQueryString("id"), - taxAgentId, taxYearMonth + taxAgentId, taxYearMonth: taxYearMonth + "-01" }; this.setState({ loading: { ...this.state.loading, issuance: true } }); taxPaymentWithheldVoucherGet(payload).then(({ status, data, errormsg }) => { @@ -282,13 +282,9 @@ class Index extends Component { message.destroy(); message.loading(getLabel(111, "下载中..."), 0); exportGetDeclareTaxResultFeedback({ id: getQueryString("id") }) - .then(async ({ status, errormsg }) => { + .then(async () => { message.destroy(); - if (status) { - message.success(getLabel(111, "下载成功!")); - } else { - message.error(errormsg || getLabel(111, "下载失败!")); - } + message.success(getLabel(111, "下载成功!")); }).catch(() => { message.destroy(); message.error(getLabel(111, "下载失败!")); diff --git a/pc4mobx/hrmSalary/pages/enterprisePayCertificationDetail/index.js b/pc4mobx/hrmSalary/pages/enterprisePayCertificationDetail/index.js index 026f4cde..c6d0bd55 100644 --- a/pc4mobx/hrmSalary/pages/enterprisePayCertificationDetail/index.js +++ b/pc4mobx/hrmSalary/pages/enterprisePayCertificationDetail/index.js @@ -31,7 +31,7 @@ class Index extends Component { const payload = { taxDeclareRecordId: getQueryString("taxDeclareRecordId"), taxAgentId: getQueryString("taxAgentId"), - taxYearMonth: getQueryString("taxYearMonth") + taxYearMonth: getQueryString("taxYearMonth") + "-01" }; this.setState({ loading: true }); taxPaymentWithheldVoucherGet(payload).then(({ status, data, errormsg }) => {