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

Merge branch 'master' into release/2.19.1.2503.01-业务线个税

This commit is contained in:
lys 2025-04-24 16:58:10 +08:00
parent c5d5609a1f 45862052c7
commit 497c635d26
3 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/OCTable/index.tsx
View File

@ -65,10 +65,10 @@ const OCTable: FC = (props) => {
<span>{excelResultValue}</span>
</div>
{
showDifference &&
showDifference && !!parseInt(calculateDifference(acctResultValue, excelResultValue || 0)) &&
<div className={cs(styles["danger"], styles["comparison-single-row"])}>
<span>{lanObj["差值"]}：</span>
<span>{calculateDifference(acctResultValue, excelResultValue)}</span>
<span>{calculateDifference(acctResultValue, excelResultValue || 0)}</span>
</div>
}
</div>;
@ -104,7 +104,7 @@ const OCTable: FC = (props) => {
return <Table
rowKey="id" className={styles.tableWrapper}
columns={columns} dataSource={dataSource} bordered size="small"
scroll={{ x: 1200, y: `calc(100vh - 137px)` }}
scroll={{ x: 1200, y: `calc(100vh - 165px)` }}
pagination={{
...paginationFun(pageInfo, sizeChange, onChange, i18n),
size: "default"

4
src/pages/calcTable/index.tsx
View File

@ -245,8 +245,8 @@ const index: FunctionComponent<Props> = (props) => {
};
const rowSelection = {
columnWidth: 50,
columnTitle: isDetailTable ? "序号" : "",
renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable ? <span>{index + 1}</span> : originNode),
columnTitle: isDetailTable && _.isNil(showSee) ? "序号" : "",
renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable && _.isNil(showSee) ? <span>{index + 1}</span> : originNode),
selectedRowKeys,
preserveSelectedRowKeys: true,
onChange: (rowKeys: React.Key[]) => {

52
src/pages/unitTable/renderColsOpts.tsx
View File

@ -444,6 +444,58 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
return col;
})
];
} else if (type === "attendanceView") {
return [
..._.map(initialState, (g) => {
let col = { ...g, ellipsis: true };
switch (g.dataIndex) {
case "operate":
col = {
...col,
width: 176,
fixed: "right" // render: (__: string, record: any) => {
// let items: MenuProps["items"] = [
// {
// key: "DeleteList",
// label: i18n?.["删除"],
// onClick: () => postMessageToParent("DEL", record)
// },
// {
// key: "Log",
// label: i18n?.["操作日志"],
// onClick: () => postMessageToParent("log", record)
// }
// ];
// isSpecial && items.shift();
// return (
// <Space>
// <Button type="link" onClick={() => postMessageToParent("EDIT", record)}>
// {i18n?.["编辑"]}
// </Button>
// {isSpecial ? (
// <Button type="link" onClick={() => postMessageToParent("DEL", record)}>
// {i18n?.["删除"]}
// </Button>
// ) : (
// <Button type="link" onClick={() => postMessageToParent("VIEW", record)}>
// {i18n?.["查看明细"]}
// </Button>
// )}
// <Dropdown menu={{ items }} placement="bottomRight">
// <Button type="link" icon={<MoreOutlined />} />
// </Dropdown>
// </Space>
// );
// }
};
break;
default:
col = { ...col };
break;
}
return col;
})
];
}
return initialState;
}, [initialState, type, i18n, extraParams]);