From 8a8ee53f7b9486c2272cab7f9d93b3f5bd6d1eb4 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, 8 Nov 2023 15:58:46 +0800
Subject: [PATCH] =?UTF-8?q?feature/=E4=BD=8E=E7=89=88=E6=9C=AC=E7=81=AB?=
 =?UTF-8?q?=E7=8B=90=E6=B5=8F=E8=A7=88=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/payrollFilesTable/index.tsx | 74 +++++++++++----------------
 src/pages/reportTable/index.tsx       | 24 ---------
 2 files changed, 30 insertions(+), 68 deletions(-)

diff --git a/src/pages/payrollFilesTable/index.tsx b/src/pages/payrollFilesTable/index.tsx
index cabac38..647a8bc 100644
--- a/src/pages/payrollFilesTable/index.tsx
+++ b/src/pages/payrollFilesTable/index.tsx
@@ -1,5 +1,5 @@
 import React, { FC, useEffect, useState } from "react";
-import { Button, Dropdown, Space, Spin, Table, Typography } from "antd";
+import { Button, Dropdown, Menu, Space, Spin, Table, Typography } from "antd";
 import { MoreOutlined } from "@ant-design/icons";
 import { convertColumns, exceptStr, paginationFun } from "@/utils/common";
 import styles from "@/pages/atdTable/components/index.less";
@@ -58,6 +58,20 @@ const payrollFilesTable: FC = (props) => {
                 </Button>;
               } else {
                 if (selectedKey === "pending") {
+                  const menu1 = (
+                    <Menu>
+                      <Menu.Item key="deletePendingTodo"><span style={{width: "100%", height: "100%"}}
+                                                            onClick={(e) => handleMenuClick({ key: "deletePendingTodo" }, r?.id)}>删除待办</span></Menu.Item>
+                      <Menu.Item key="deleteAchives"><span style={{width: "100%", height: "100%"}}
+                                                        onClick={(e) => handleMenuClick({ key: "deleteAchives" }, r?.id)}>删除档案</span></Menu.Item>
+                    </Menu>
+                  );
+                  const menu2 = (
+                    <Menu>
+                      <Menu.Item key="deletePendingTodo"><span style={{width: "100%", height: "100%"}}
+                                                            onClick={(e) => handleMenuClick({ key: "deletePendingTodo" }, r?.id)}>删除待办</span></Menu.Item>
+                    </Menu>
+                  );
                   dom = <Space>
                     <Button type="link" style={{ padding: "0" }}
                             onClick={() => window.parent.postMessage(
@@ -76,29 +90,7 @@ const payrollFilesTable: FC = (props) => {
                       设为发薪人员
                     </Button>
                     <Dropdown
-                      menu={{
-                        items: salaryArchiveDelete === "1" ? [
-                          {
-                            key: "deletePendingTodo",
-                            label: <a onClick={() => handleMenuClick({ key: "deletePendingTodo" }, r?.id)}>
-                              删除待办
-                            </a>
-                          },
-                          {
-                            key: "deleteAchives",
-                            label: <a onClick={() => handleMenuClick({ key: "deleteAchives" }, r?.id)}>
-                              删除档案
-                            </a>
-                          }
-                        ] : [
-                          {
-                            key: "deletePendingTodo",
-                            label: <a onClick={() => handleMenuClick({ key: "deletePendingTodo" }, r?.id)}>
-                              删除待办
-                            </a>
-                          }
-                        ]
-                      }} placement="bottomRight"
+                      overlay={salaryArchiveDelete === "1" ? menu1 : menu2} placement="bottomRight"
                       overlayClassName={styles.moreIconWrapper}
                     >
                       <MoreOutlined style={{ fontSize: 16 }}/>
@@ -115,6 +107,12 @@ const payrollFilesTable: FC = (props) => {
                     调薪
                   </Button>;
                 } else if (selectedKey === "suspend") {
+                  const menu3 = (
+                    <Menu>
+                      <Menu.Item key="deleteSuspendTodo"><span style={{width: "100%", height: "100%"}}
+                                                            onClick={(e) => handleMenuClick({ key: "deleteSuspendTodo" }, r?.id)}>删除待办</span></Menu.Item>
+                    </Menu>
+                  );
                   dom = <Space>
                     <Button type="link" style={{ padding: "0" }} onClick={() => window.parent.postMessage(
                       {
@@ -131,22 +129,19 @@ const payrollFilesTable: FC = (props) => {
                       停薪
                     </Button>
                     <Dropdown
-                      menu={{
-                        items: [
-                          {
-                            key: "deleteSuspendTodo",
-                            label: <a onClick={() => handleMenuClick({ key: "deleteSuspendTodo" }, r?.id)}>
-                              删除待办
-                            </a>
-                          }
-                        ]
-                      }} placement="bottomRight"
+                      overlay={menu3} placement="bottomRight"
                       overlayClassName={styles.moreIconWrapper}
                     >
                       <MoreOutlined style={{ fontSize: 16 }}/>
                     </Dropdown>
                   </Space>;
                 } else {
+                  const menu4 = (
+                    <Menu>
+                      <Menu.Item key="deleteAchives"><span style={{width: "100%", height: "100%"}}
+                                                        onClick={(e) => handleMenuClick({ key: "deleteAchives" }, r?.id)}>删除档案</span></Menu.Item>
+                    </Menu>
+                  );
                   dom = <Space>
                     <Button type="link" style={{ padding: "0" }} onClick={() => window.parent.postMessage(
                       {
@@ -164,16 +159,7 @@ const payrollFilesTable: FC = (props) => {
                     {
                       salaryArchiveDelete === "1" &&
                       <Dropdown placement="bottomRight" overlayClassName={styles.moreIconWrapper}
-                                menu={{
-                                  items: [
-                                    {
-                                      key: "deleteAchives",
-                                      label: <a onClick={() => handleMenuClick({ key: "deleteAchives" }, r?.id)}>
-                                        删除档案
-                                      </a>
-                                    }
-                                  ]
-                                }}
+                                overlay={menu4}
                       >
                         <MoreOutlined style={{ fontSize: 16 }}/>
                       </Dropdown>
diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx
index 61c14c0..ae8eecd 100644
--- a/src/pages/reportTable/index.tsx
+++ b/src/pages/reportTable/index.tsx
@@ -59,30 +59,6 @@ const ReportTable: FC = (props) => {
     bordered
     size="small"
     scroll={{ x: 1200, y: `calc(100vh - 109px)` }}
-    summary={() => {
-      if (!showSumrow) return;
-      let totalColumns: any[] = [];
-      _.forEach(columns, it => {
-        if (_.isEmpty(it.children)) {
-          totalColumns.push(it);
-        } else {
-          totalColumns = [...totalColumns, ...it.children];
-        }
-      });
-      return (
-        <Table.Summary fixed>
-          <Table.Summary.Row>
-            {
-              _.map(totalColumns, (item, index) => {
-                return <Table.Summary.Cell index={index} key={index} align="center">
-                  <Text type="danger">{!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"}</Text>
-                </Table.Summary.Cell>;
-              })
-            }
-          </Table.Summary.Row>
-        </Table.Summary>
-      );
-    }}
   />;
 };