From ce63d26457a1b6959d760d3cc65b9bbd2e6f9a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 2 Jan 2024 11:12:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?hotfix/2.9.9.2312.02-=E4=B8=AA=E7=A8=8E=20?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E8=A1=A8-=E5=8A=A8=E6=80=81=E5=A2=9E?= =?UTF-8?q?=E5=88=A0tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/declare/components/declareTablelist/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js index 936e9c9f..0a818600 100644 --- a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js +++ b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js @@ -40,8 +40,8 @@ class Index extends Component { const { pageInfo } = this.state; const { queryParams } = props; const { dateRange, ...extra } = queryParams; - const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || []; - const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra }; + const [fromSalaryMonth, endSalaryMonth] = dateRange || []; + const params = { fromSalaryMonth: fromSalaryMonth + "-01", endSalaryMonth: endSalaryMonth + "-01", ...extra }; const payload = { ...pageInfo, ...params }; this.setState({ loading: true }); getDeclareList(payload).then(({ status, data }) => { From 611a0834acfe07a7f5bc576e80b563674124c2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 2 Jan 2024 15:56:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?hotfix/2.9.9.2312.02-=E4=B8=AA=E7=A8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/declare/declare.js | 2 +- pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declare/declare.js b/pc4mobx/hrmSalary/pages/declare/declare.js index e64e38d7..1b05c827 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()).startOf("month").format("YYYY-MM") + moment(new Date()).endOf("month").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 428344c8..191e8d1a 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js @@ -82,7 +82,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: { From 43a17eb18844d2b208b2a849c63f93395780f50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 2 Jan 2024 16:47:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?hotfix/2.9.9.2312.02-=E4=B8=AA=E7=A8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/bankVoucherDetail/index.js | 2 +- pc4mobx/hrmSalary/pages/declare/declare.js | 2 +- .../pages/declareDetail/components/paymentBtn.js | 7 ++++--- .../declareDetail/components/paymentFeedbackBtn.js | 5 +++-- pc4mobx/hrmSalary/pages/declareDetail/index.js | 12 ++++-------- .../pages/enterprisePayCertificationDetail/index.js | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) 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 }) => { From 5a114d14c0703ac7e60b872a63f50e127ce39559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 3 Jan 2024 10:34:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?hotfix/2.9.9.2312.02-=E4=B8=AA=E7=A8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/calculate/calculate.js | 2 +- .../hrmSalary/pages/declareDetail/confirm.js | 27 +++++++++++++++++++ .../hrmSalary/pages/declareDetail/index.js | 15 ++++++----- .../hrmSalary/pages/mySalaryBenefits/index.js | 3 ++- .../hrmSalary/pages/payrollRelease/index.js | 2 +- 5 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/declareDetail/confirm.js diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js index 8f886557..64d75f65 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calculate.js +++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js @@ -28,7 +28,7 @@ class Calculate extends Component { name: "", dateRange: [ moment(new Date()).startOf("year").format("YYYY-MM"), - moment(new Date()).startOf("month").format("YYYY-MM") + moment(new Date()).endOf("year").format("YYYY-MM") ] }, isRefresh: false, progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") }, diff --git a/pc4mobx/hrmSalary/pages/declareDetail/confirm.js b/pc4mobx/hrmSalary/pages/declareDetail/confirm.js new file mode 100644 index 00000000..a64db297 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declareDetail/confirm.js @@ -0,0 +1,27 @@ +import { WeaLocaleProvider } from "ecCom"; +import { Modal } from "antd"; + +const { getLabel } = WeaLocaleProvider; +export const confirmDialog = (type, callback) => { + let content = ""; + switch (type) { + case "refresh": + content = getLabel(111, "刷新数据会重新从核算数据中取值，申报界面新增、编辑的数据会被全部覆盖，是否确认刷新？"); + break; + case "correct": + content = getLabel(111, "更正申报，当申报成功后，发现有错报、漏报的情况，可使用更正申报，更正申报成功时，企业状态会变成未申报"); + break; + case "cancel": + content = getLabel(111, "申报作废，只有申报成功，无需缴款/申报成功，未缴款的状态才能作废，当作废成功时，企业状态会变成未申报；当作废失败时，企业状态还是原来的未缴款或无需缴款的状态。"); + break; + case "declare": + content = getLabel(111, "解除劳动合同一次性补偿金、全年一次性奖金所得，不能单独申报，需要同正常工资薪金一起申报；解除劳动合同一次性补偿金、稿酬所得，由于税务规则需要，解除劳动合同一次性补偿金、稿酬所得必须填写免税附表。是否确认申报？"); + break; + default: + break; + } + return Modal.confirm({ + title: getLabel(131329, "信息确认"), content, + onOk: callback + }); +}; diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js index 1ac1f6b1..736ec8bf 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js @@ -31,6 +31,7 @@ import { convertToUrlString, getQueryString } from "../../util/url"; import IncomeTaxDeclarationPersonnelSlide from "./components/incomeTaxDeclarationPersonnelSlide"; import TaxDeclareDetailImportDialog from "./components/taxDeclareDetailImportDialog"; import TabEditDialog from "./components/tabEditDialog"; +import { confirmDialog } from "./confirm"; import "./index.less"; const { getLabel } = WeaLocaleProvider; @@ -324,9 +325,9 @@ class Index extends Component { const [__, taxDeclarationId] = selectedKey.split("%%"); let btns = [ , - , - ]; //申报状态：作废中 @@ -342,24 +343,24 @@ class Index extends Component { //申报状态：已缴款 declareInfo.declareStatus === "DECLARE_SUCCESS_PAID" && (btns.splice(1, 2, )); + onClick={() => confirmDialog("correct", () => this.handleOperateDeclare("correct"))}>{getLabel(111, "更正申报")})); //申报状态：申报成功，无需缴款 declareInfo.declareStatus === "DECLARE_SUCCESS_NO_PAY" && (btns.splice(1, 2, , + onClick={() => confirmDialog("correct", () => this.handleOperateDeclare("correct"))}>{getLabel(111, "更正申报")}, + onClick={() => confirmDialog("cancel", () => this.handleOperateDeclare("cancel"))}>{getLabel(111, "作废申报")} )); //申报状态：申报成功，未缴款 declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID" && (btns.splice(1, 2, , + onClick={() => confirmDialog("correct", () => this.handleOperateDeclare("correct"))}>{getLabel(111, "更正申报")}, , + onClick={() => confirmDialog("cancel", () => this.handleOperateDeclare("cancel"))}>{getLabel(111, "作废申报")}, diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js index 5f608921..e70aa4c2 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js @@ -18,7 +18,8 @@ class Index extends Component { constructor(props) { super(props); this.state = { - selectedKey: "1", salaryYearMonth: [moment().startOf("year").format("YYYY-MM"), moment().format("YYYY-MM")] + selectedKey: "1", + salaryYearMonth: [moment().startOf("year").format("YYYY-MM"), moment().endOf("year").format("YYYY-MM")] }; } diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/index.js index fb49383c..6e406620 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/index.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.js @@ -29,7 +29,7 @@ class Index extends Component { salarySobId: "", name: "", dateRange: [ moment(new Date()).startOf("year").format("YYYY-MM"), - moment(new Date()).startOf("month").format("YYYY-MM") + moment(new Date()).endOf("year").format("YYYY-MM") ] } };