From 4e29c4ed936b9804a0f0d3dea4b65676a7d079da 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, 4 Jul 2024 18:50:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature/2.14.4.2406.02-=E4=B8=AA=E7=A8=8E?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../declareDetail/components/paymentBtn.js | 19 ++++++++++--------- .../hrmSalary/pages/declareDetail/index.js | 6 +++--- .../pages/employeedeclareDetail/index.js | 6 ++++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js index 4f6ad59f..e187d81d 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js @@ -332,15 +332,16 @@ class PaymentBtn extends Component { const { paymentDialog } = this.state; return ( - - {getLabel(111, "银行端凭证缴款")} - {getLabel(111, "作废缴款凭证")} - - } - type="ghost">{getLabel(111, "三方缴款")} + + {/**/} + {/* {getLabel(111, "银行端凭证缴款")}*/} + {/* {getLabel(111, "作废缴款凭证")}*/} + {/* */} + {/* }*/} + {/* type="ghost">{getLabel(111, "三方缴款")}*/} confirmDialog("cancel", () => this.handleOperateDeclare("cancel", { reportType }))}>{getLabel(111, "作废申报")}, - + // )); if (!intelCalcSalaryStatus) { if (["NOT_DECLARE", "DECLARE_FAIL"].includes(declareInfo.declareStatus)) { diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js index ed7805cf..f9783c57 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js @@ -21,7 +21,8 @@ import { employeedeclareList4Add, employeedeclareList4Update, employeedeclareRefresh, - employeeDelete, employeeInvalid, + employeeDelete, + employeeInvalid, getDeclareFeedback } from "../../apis/declare"; import { advanceConditions, submitStatus } from "./constants"; @@ -146,7 +147,8 @@ class Index extends Component { "总计": getLabel(523, "总计"), "编辑": getLabel(501169, "编辑"), "操作": getLabel(30585, "操作"), "删除": getLabel(535052, "删除"), "共": getLabel(83698, "共"), "条": getLabel(18256, "条"), - "加载中": getLabel(83698, "加载中"), "作废": getLabel(111, "作废") + "加载中": getLabel(83698, "加载中") + // "作废": getLabel(111, "作废") }; const childFrameObj = document.getElementById("atdTable"); childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*"); From 5f4d52761af705ee6e358c8dd6259ef52ed5b8be 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, 10 Jul 2024 14:35:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?custom/=E4=B8=8A=E6=B5=B7=E6=B8=AF=E6=B9=BE?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/paymentFeedbackBtn.js | 4 +-- .../components/taxDeclarationInfo.js | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js index fca56898..ee0bdf44 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js @@ -152,8 +152,8 @@ class PaymentFeedbackBtn extends Component { return { ...it, options: [ - { key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款") }, - { key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") } + { key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true }, + // { key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") } ] }; }) diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js index ec5edc9c..16eb0b9b 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js @@ -55,20 +55,20 @@ class TaxDeclarationInfo extends Component { ]; let dropMenuDatas = []; if (["DECLARE_SUCCESS_NO_PAY", "DECLARE_SUCCESS_UNPAID", "DECLARE_SUCCESS_PAID", "DECLARE_SUCCESS_PAYING"].includes(declareInfo.declareStatus)) { - dropMenuDatas = dropMenuDatas.concat([ - { - key: "exportGetDeclareTaxResultFeedback", - icon: , - content: getLabel(111, "下载申报内置算税结果"), - onClick: onOperate - }, - { - key: "onlineComparison", - icon: , - content: getLabel(111, "在线对比"), - onClick: onOperate - } - ]); + // dropMenuDatas = dropMenuDatas.concat([ + // { + // key: "exportGetDeclareTaxResultFeedback", + // icon: , + // content: getLabel(111, "下载申报内置算税结果"), + // onClick: onOperate + // }, + // { + // key: "onlineComparison", + // icon: , + // content: getLabel(111, "在线对比"), + // onClick: onOperate + // } + // ]); } return (