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

Merge branch 'master' into custom-新弘农业/V2-薪资核算表格添加序号列

This commit is contained in:
黎永顺 2023-07-04 09:33:51 +08:00
parent 8a0388b460 a909047a44
commit 9afc9fcf47
7 changed files with 69236 additions and 69173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -21,11 +21,10 @@
},
"dependencies": {
"@ant-design/pro-layout": "6.32.1",
"@formily/antd": "^2.0.6",
"@types/lodash": "^4.14.172",
"@ztree/ztree_v3": "^3.5.42",
"ahooks": "^3.1.3",
"antd": "^4.17.3",
"antd": "^4.24.10",
"axios": "^0.22.0",
"fbemitter": "^3.0.0",
"js-base64": "^3.6.1",

69135
public/js/libs/antd/antd-with-locales.min.js vendored
View File

File diff suppressed because one or more lines are too long

69120
public/js/libs/antd/antd-with-locales.min_4.17.1.js Normal file
View File

File diff suppressed because it is too large Load Diff

6
public/js/libs/antd/antd.variable.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
public/js/libs/antd/antd.variable.min_4.17.1.css Normal file
View File

File diff suppressed because one or more lines are too long

22
src/pages/atdTable/components/index.less
View File

@ -187,6 +187,18 @@
}
}
.ant-dropdown-menu-title-content {
a {
font-size: 12px;
color: #333;
}
a:hover {
color: #00a9ff;
text-decoration: underline;
}
}
.ant-popover-inner {
min-width: 106px
}
@ -194,16 +206,6 @@
.ant-popover-inner-content {
padding: 0;
.ant-menu {
.ant-menu-item {
border-right: none;
height: 30px;
line-height: 30px;
text-align: center;
padding: 0;
font-size: 12px;
}
}
}
}
}

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

@ -1,6 +1,6 @@
import React, { FC, useEffect, useState } from "react";
import { Button, Dropdown, Menu, Space, Spin, Table, Typography } from "antd";
import { DownOutlined } from "@ant-design/icons";
import { Button, Dropdown, 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";
import { defaultPage, IPage } from "@/common/types";
@ -33,7 +33,8 @@ const payrollFilesTable: FC = (props) => {
pageInfo,
showOperateBtn,
selectedKey,
selectedRowKeys
selectedRowKeys,
salaryArchiveDelete
} = data;
const { current: pageNum, pageSize: size, total } = pageInfo;
setDataSource(dataSource);
@ -69,27 +70,38 @@ const payrollFilesTable: FC = (props) => {
>
编辑
</Button>
<Dropdown
overlayClassName={styles.moreIconWrapper}
overlay={
<Menu>
<Menu.Item key="payroll">
<Button type="link" style={{ padding: "0", fontSize: 12 }}
onClick={() => handleMenuClick({ key: "payroll" }, r?.id)}
>
设为发薪人员
</Button>
</Menu.Item>
<Menu.Item key="deletePendingTodo">
<Button type="link" style={{ padding: "0", fontSize: 12 }}
onClick={() => handleMenuClick({ key: "deletePendingTodo" }, r?.id)}>
删除待办
</Button>
</Menu.Item>
</Menu>
}
<Button type="link" style={{ padding: "0" }}
onClick={() => handleMenuClick({ key: "payroll" }, r?.id)}
>
<a>更多<DownOutlined/></a>
设为发薪人员
</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"
overlayClassName={styles.moreIconWrapper}
>
<MoreOutlined style={{ fontSize: 16 }}/>
</Dropdown>
</Space>;
} else if (selectedKey === "fixed") {
@ -113,27 +125,25 @@ const payrollFilesTable: FC = (props) => {
)}>
编辑
</Button>
<Dropdown
overlayClassName={styles.moreIconWrapper}
overlay={
<Menu>
<Menu.Item key="payroll">
<Button type="link" style={{ padding: "0", fontSize: 12 }}
onClick={() => handleMenuClick({ key: "stopSalary" }, r?.id)}
>
停薪
</Button>
</Menu.Item>
<Menu.Item key="deletePendingTodo">
<Button type="link" style={{ padding: "0", fontSize: 12 }}
onClick={() => handleMenuClick({ key: "deleteSuspendTodo" }, r?.id)}>
删除待办
</Button>
</Menu.Item>
</Menu>
}
<Button type="link" style={{ padding: "0", fontSize: 12 }}
onClick={() => handleMenuClick({ key: "stopSalary" }, r?.id)}
>
<a>更多<DownOutlined/></a>
停薪
</Button>
<Dropdown
menu={{
items: [
{
key: "deleteSuspendTodo",
label: <a onClick={() => handleMenuClick({ key: "deleteSuspendTodo" }, r?.id)}>
删除待办
</a>
}
]
}} placement="bottomRight"
overlayClassName={styles.moreIconWrapper}
>
<MoreOutlined style={{ fontSize: 16 }}/>
</Dropdown>
</Space>;
} else {
@ -151,6 +161,23 @@ const payrollFilesTable: FC = (props) => {
onClick={() => handleMenuClick({ key: "view" }, r as string)}>
查看
</Button>
{
salaryArchiveDelete === "1" &&
<Dropdown placement="bottomRight" overlayClassName={styles.moreIconWrapper}
menu={{
items: [
{
key: "deleteAchives",
label: <a onClick={() => handleMenuClick({ key: "deleteAchives" }, r?.id)}>
删除档案
</a>
}
]
}}
>
<MoreOutlined style={{ fontSize: 16 }}/>
</Dropdown>
}
</Space>;
}
}