qt
/
salary-management-oneself
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature/低版本火狐浏览器

This commit is contained in:
黎永顺 2023-11-08 15:58:46 +08:00
parent e6e93f8fc4
commit 8a8ee53f7b
2 changed files with 30 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/pages/payrollFilesTable/index.tsx
View File

@ -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>

24
src/pages/reportTable/index.tsx
View File

@ -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>
);
}}
/>;
};