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] =?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 (
       <React.Fragment>
-        <Dropdown.Button
-          onClick={this.handleTripartiteContributions}
-          overlay={
-            <Menu onClick={this.handleMenuChange}>
-              <Menu.Item key="bank_voucher_payment">{getLabel(111, "银行端凭证缴款")}</Menu.Item>
-              <Menu.Item key="destory_voucher">{getLabel(111, "作废缴款凭证")}</Menu.Item>
-            </Menu>
-          }
-          type="ghost">{getLabel(111, "三方缴款")}</Dropdown.Button>
+        <Button type="ghost" onClick={this.handleTripartiteContributions}>{getLabel(111, "三方缴款")}</Button>
+        {/*<Dropdown.Button*/}
+        {/*  onClick={this.handleTripartiteContributions}*/}
+        {/*  overlay={*/}
+        {/*    <Menu onClick={this.handleMenuChange}>*/}
+        {/*      <Menu.Item key="bank_voucher_payment">{getLabel(111, "银行端凭证缴款")}</Menu.Item>*/}
+        {/*      <Menu.Item key="destory_voucher">{getLabel(111, "作废缴款凭证")}</Menu.Item>*/}
+        {/*    </Menu>*/}
+        {/*  }*/}
+        {/*  type="ghost">{getLabel(111, "三方缴款")}</Dropdown.Button>*/}
         <PaymentDialog
           {...paymentDialog}
           onCancel={this.handleCancel}
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js
index cf369c11..a1372b00 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js
@@ -388,9 +388,9 @@ class Index extends Component {
       <Button type="ghost"
               loading={loading.cancel}
               onClick={() => confirmDialog("cancel", () => this.handleOperateDeclare("cancel", { reportType }))}>{getLabel(111, "作废申报")}</Button>,
-      <Button type="ghost"
-              loading={loading.refreshingPay}
-              onClick={this.taxPaymentVoucherStatusSync}>{getLabel(111, "刷新缴款状态")}</Button>
+      // <Button type="ghost"
+      //         loading={loading.refreshingPay}
+      //         onClick={this.taxPaymentVoucherStatusSync}>{getLabel(111, "刷新缴款状态")}</Button>
     ));
     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 }), "*");