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

Compare commits

base: qt:5812022207d7d289c301a9a8659160597a2a4de8
Branches Tags
qt:feature/threejs
qt:feature/2.9.42310.01-薪资项目拓扑图
qt:feature/业务线管理
qt:master
qt:release/2.19.1.2503.01-业务线个税
qt:feature/核算表格双击编辑
qt:custom/鲁控数字-薪资核算列表页面批量编辑
qt:feature/V2-系统多语言
qt:feature/低版本火狐浏览器
qt:custom-新弘农业/V2-薪资核算表格添加序号列
qt:custom-人事报表/V2-demo
..
compare: qt:1dd9bc997b5f93de83fd7c61087f80da41a230f5
Branches Tags
qt:feature/threejs
qt:feature/2.9.42310.01-薪资项目拓扑图
qt:feature/业务线管理
qt:master
qt:release/2.19.1.2503.01-业务线个税
qt:feature/核算表格双击编辑
qt:custom/鲁控数字-薪资核算列表页面批量编辑
qt:feature/V2-系统多语言
qt:feature/低版本火狐浏览器
qt:custom-新弘农业/V2-薪资核算表格添加序号列
qt:custom-人事报表/V2-demo

No commits in common. '5812022207d7d289c301a9a8659160597a2a4de8' and '1dd9bc997b5f93de83fd7c61087f80da41a230f5' have entirely different histories.
5812022207 ... 1dd9bc997b

3 changed files with 117 additions and 151 deletions
Show Stats

173
src/pages/salaryFileTable/index.tsx
Unescape Escape View File

@ -24,7 +24,9 @@ const Index: FunctionComponent<Props> = (props) => {
const [pageInfo, setPageInfo] = useState<Partial<PaginationData>>({}); const [pageInfo, setPageInfo] = useState<Partial<PaginationData>>({});
const [i18n, setI18n] = useState<any>({}); const [i18n, setI18n] = useState<any>({});
const [runStatuses, setRunStatuses] = useState<string>(""); const [runStatuses, setRunStatuses] = useState<string>("");
const [showOperateBtn, setShowOperateBtn] = useState<boolean>(false);
const [showDelSalaryFileBtn, setShowDelSalaryFileBtn] = useState<boolean>(false);//待定薪、停薪员工 是否允许删除薪资档案 const [showDelSalaryFileBtn, setShowDelSalaryFileBtn] = useState<boolean>(false);//待定薪、停薪员工 是否允许删除薪资档案
const [DCChiefPermission, setDCChiefPermission] = useState<undefined>(undefined);//二开权限（大成）
useEffect(() => { useEffect(() => {
window.parent.postMessage({ type: "init" }, "*"); window.parent.postMessage({ type: "init" }, "*");
@ -38,8 +40,10 @@ const Index: FunctionComponent<Props> = (props) => {
const data: any = exceptStr(event.data); const data: any = exceptStr(event.data);
if (!_.isEmpty(data)) { if (!_.isEmpty(data)) {
const { const {
columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {}, selectedKey, showDelSalaryFileBtn columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {},
selectedKey, showOperateBtn, showDelSalaryFileBtn, DCChiefPermission
} = data; } = data;
setShowOperateBtn(showOperateBtn);
setRunStatuses(selectedKey); setRunStatuses(selectedKey);
setI18n(i18nRes); setI18n(i18nRes);
setPageInfo(pageInfo); setPageInfo(pageInfo);
@ -47,6 +51,7 @@ const Index: FunctionComponent<Props> = (props) => {
setSelectedRowKeys([...rowKeys, ...selectedRowKeys]); setSelectedRowKeys([...rowKeys, ...selectedRowKeys]);
setColumns(columns); setColumns(columns);
setShowDelSalaryFileBtn(showDelSalaryFileBtn); setShowDelSalaryFileBtn(showDelSalaryFileBtn);
setDCChiefPermission(DCChiefPermission);
} }
}; };
const onChange = (current: number, pageSize: number) => { const onChange = (current: number, pageSize: number) => {
@ -108,30 +113,19 @@ const Index: FunctionComponent<Props> = (props) => {
} }
]; ];
!showDelSalaryFileBtn && (items = _.dropRight(items)); !showDelSalaryFileBtn && (items = _.dropRight(items));
return ( return (<Space>
record?.opts.includes("admin") ? {
<Space> (_.isNil(DCChiefPermission) || DCChiefPermission) ?
<Button type="link"
onClick={() => handleSalaryFileOperate("EDIT", record)}>{i18n["编辑"]}</Button>
<Button type="link"
onClick={() => handleSalaryFileOperate("ADD-TO-SALARYPAYMENT", record, [record?.id])}>{i18n["设为发薪人员"]}</Button>
<Dropdown menu={{ items }} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/>
</Dropdown>
</Space> : <Space>
<Button type="link" <Button type="link"
onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button> onClick={() => handleSalaryFileOperate("EDIT", record)}>{i18n["编辑"]}</Button> :
<Dropdown menu={{ <Button type="link" onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button>
items: [ }
{ <Button type="link"
key: "Log", label: i18n["操作日志"], onClick: () => handleSalaryFileOperate("log", record) onClick={() => handleSalaryFileOperate("ADD-TO-SALARYPAYMENT", record, [record?.id])}>{i18n["设为发薪人员"]}</Button>
} <Dropdown menu={{ items }} placement="bottomRight">
] <Button type="link" icon={<MoreOutlined/>}/>
}} placement="bottomRight"> </Dropdown>
<Button type="link" icon={<MoreOutlined/>}/> </Space>);
</Dropdown>
</Space>
);
} }
}; };
break; break;
@ -148,27 +142,18 @@ const Index: FunctionComponent<Props> = (props) => {
} }
]; ];
return ( return (
record?.opts.includes("admin") ? <Space>
<Space> {
<Button type="link" (((_.isNil(DCChiefPermission) || DCChiefPermission) && runStatuses === "fixed") || runStatuses === "ext") ?
onClick={() => handleSalaryFileOperate("CHANGE-SALARY", record)}>{i18n["调薪"]}</Button> <Button type="link"
<Dropdown menu={{ items }} placement="bottomRight"> onClick={() => handleSalaryFileOperate("CHANGE-SALARY", record)}>{i18n["调薪"]}</Button> :
<Button type="link" icon={<MoreOutlined/>}/> <Button type="link"
</Dropdown> onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button>
</Space> : }
<Space> <Dropdown menu={{ items }} placement="bottomRight">
<Button type="link" <Button type="link" icon={<MoreOutlined/>}/>
onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button> </Dropdown>
<Dropdown menu={{ </Space>
items: [
{
key: "Log", label: i18n["操作日志"], onClick: () => handleSalaryFileOperate("log", record)
}
]
}} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/>
</Dropdown>
</Space>
); );
} }
}; };
@ -189,30 +174,14 @@ const Index: FunctionComponent<Props> = (props) => {
onClick: () => handleSalaryFileOperate("log", record) onClick: () => handleSalaryFileOperate("log", record)
} }
]; ];
return ( return (<Space>
record?.opts.includes("admin") ? <Button type="link" onClick={() => handleSalaryFileOperate("EDIT", record)}>{i18n["编辑"]}</Button>
<Space> <Button type="link"
<Button type="link" onClick={() => handleSalaryFileOperate("EDIT", record)}>{i18n["编辑"]}</Button> onClick={() => handleSalaryFileOperate("SALARY-SUSPENSION", record, [record?.id])}>{i18n["停薪"]}</Button>
<Button type="link" <Dropdown menu={{ items: downsizingItems }} placement="bottomRight">
onClick={() => handleSalaryFileOperate("SALARY-SUSPENSION", record, [record?.id])}>{i18n["停薪"]}</Button> <Button type="link" icon={<MoreOutlined/>}/>
<Dropdown menu={{ items: downsizingItems }} placement="bottomRight"> </Dropdown>
<Button type="link" icon={<MoreOutlined/>}/> </Space>);
</Dropdown>
</Space> :
<Space>
<Button type="link"
onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button>
<Dropdown menu={{
items: [
{
key: "Log", label: i18n["操作日志"], onClick: () => handleSalaryFileOperate("log", record)
}
]
}} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/>
</Dropdown>
</Space>
);
} }
}; };
break; break;
@ -221,56 +190,54 @@ const Index: FunctionComponent<Props> = (props) => {
...opts, ...opts,
render: (__: any, record: any) => { render: (__: any, record: any) => {
let stopItems: MenuProps["items"] = [ let stopItems: MenuProps["items"] = [
{
key: "CancelSuspension",
label: i18n["删除档案"],
onClick: () => handleSalaryFileOperate("DEL-SALARY-FILES", record, [record?.id])
},
{ {
key: "Log", key: "Log",
label: i18n["操作日志"], label: i18n["操作日志"],
onClick: () => handleSalaryFileOperate("log", record) onClick: () => handleSalaryFileOperate("log", record)
},
{
key: "CancelSuspension",
label: i18n["删除档案"],
onClick: () => handleSalaryFileOperate("DEL-SALARY-FILES", record, [record?.id])
} }
]; ];
!showDelSalaryFileBtn && (stopItems = _.dropRight(stopItems)); !showDelSalaryFileBtn && (stopItems = _.dropRight(stopItems));
return ( return (<Space>
record?.opts.includes("admin") ? <Button type="link" onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button>
<Space> <Button type="link"
<Button type="link" onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button> onClick={() => handleSalaryFileOperate("CANCEL-SALARY-SUSPENSION", record, [record?.id])}>{i18n["取消停薪"]}</Button>
<Button type="link" {
onClick={() => handleSalaryFileOperate("CANCEL-SALARY-SUSPENSION", record, [record?.id])}>{i18n["取消停薪"]}</Button> !_.isEmpty(stopItems) &&
{ <Dropdown menu={{ items: stopItems }} placement="bottomRight">
!_.isEmpty(stopItems) && <Button type="link" icon={<MoreOutlined/>}/>
<Dropdown menu={{ items: stopItems }} placement="bottomRight"> </Dropdown>
<Button type="link" icon={<MoreOutlined/>}/> }
</Dropdown> </Space>);
}
</Space> :
<Space>
<Button type="link"
onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button>
<Dropdown menu={{
items: [
{
key: "Log", label: i18n["操作日志"], onClick: () => handleSalaryFileOperate("log", record)
}
]
}} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/>
</Dropdown>
</Space>
);
} }
}; };
break; break;
default: default:
break; break;
} }
return [..._.filter(columns, o => o.dataIndex !== "operate"), opts]; return showOperateBtn ? [..._.filter(columns, o => o.dataIndex !== "operate"), opts] :
[..._.filter(columns, o => o.dataIndex !== "operate"), {
...opts,
render: (__: any, record: any) => (
<Space>
{
(DCChiefPermission && (runStatuses === "pending" || runStatuses === "fixed")) ?
<Button type="link"
onClick={() => handleSalaryFileOperate(runStatuses === "fixed" ? "CHANGE-SALARY" : "EDIT", record)}>{runStatuses === "fixed" ? i18n["调薪"] : i18n["编辑"]}</Button> :
<Button type="link" onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button>
}
<Button type="link" onClick={() => handleSalaryFileOperate("log", record)}>{i18n["操作日志"]}</Button>
</Space>
)
}];
} else { } else {
return []; return [];
} }
}, [columns, runStatuses, i18n, showDelSalaryFileBtn]); }, [columns, runStatuses, i18n, showOperateBtn, showDelSalaryFileBtn, DCChiefPermission]);
return (<Table return (<Table
rowKey="id" size="small" className={styles.tableWrapper} rowKey="id" size="small" className={styles.tableWrapper}
columns={cols} dataSource={dataSource} rowSelection={rowSelection} columns={cols} dataSource={dataSource} rowSelection={rowSelection}

36
src/pages/unitTable/renderColsOpts.tsx
Unescape Escape View File

@ -27,7 +27,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
render: (text: string, record: any) => { render: (text: string, record: any) => {
const { billStatus } = record; const { billStatus } = record;
return ( return (
<Button type="link" onClick={() => postMessageToParent(billStatus === "0" && record?.opts.includes("admin") ? "CALC" : "VIEW", record)}> <Button type="link" onClick={() => postMessageToParent(billStatus === "0" && extraParams?.permission ? "CALC" : "VIEW", record)}>
{text} {text}
</Button> </Button>
); );
@ -84,7 +84,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
]; ];
return ( return (
<Space> <Space>
{!record?.opts.includes("admin") ? ( {!extraParams?.permission ? (
<Space> <Space>
<Button type="link" onClick={() => postMessageToParent("VIEW", record)}> <Button type="link" onClick={() => postMessageToParent("VIEW", record)}>
{i18n?.["查看"]} {i18n?.["查看"]}
@ -359,20 +359,12 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
render: (__: string, record: any) => { render: (__: string, record: any) => {
return ( return (
<Space> <Space>
{record?.opts.includes("admin") ? ( <Button type="link" onClick={() => postMessageToParent("EDIT", record)}>
<Space> {i18n?.["编辑"]}
<Button type="link" onClick={() => postMessageToParent("EDIT", record)}> </Button>
{i18n?.["编辑"]} <Button type="link" onClick={() => postMessageToParent("DEL", record)}>
</Button> {i18n?.["删除"]}
<Button type="link" onClick={() => postMessageToParent("DEL", record)}> </Button>
{i18n?.["删除"]}
</Button>
</Space>
) : (
<Button type="link" onClick={() => postMessageToParent("VIEW", record)}>
{i18n?.["查看"]}
</Button>
)}
</Space> </Space>
); );
} }
@ -412,15 +404,13 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
onClick: () => postMessageToParent("log", record) onClick: () => postMessageToParent("log", record)
} }
]; ];
(isSpecial || !record?.opts.includes("admin")) && items.shift(); isSpecial && items.shift();
return ( return (
<Space> <Space>
{record?.opts.includes("admin") && ( <Button type="link" onClick={() => postMessageToParent("EDIT", record)}>
<Button type="link" onClick={() => postMessageToParent("EDIT", record)}> {i18n?.["编辑"]}
{i18n?.["编辑"]} </Button>
</Button> {isSpecial ? (
)}
{isSpecial && record?.opts.includes("admin") ? (
<Button type="link" onClick={() => postMessageToParent("DEL", record)}> <Button type="link" onClick={() => postMessageToParent("DEL", record)}>
{i18n?.["删除"]} {i18n?.["删除"]}
</Button> </Button>

59
src/pages/welfareArchiveTable/index.tsx
Unescape Escape View File

@ -25,6 +25,7 @@ const Index: FunctionComponent<Props> = (props) => {
const [pageInfo, setPageInfo] = useState<Partial<PaginationData>>({}); const [pageInfo, setPageInfo] = useState<Partial<PaginationData>>({});
const [i18n, setI18n] = useState<any>({}); const [i18n, setI18n] = useState<any>({});
const [runStatuses, setRunStatuses] = useState<string>(""); const [runStatuses, setRunStatuses] = useState<string>("");
const [showOperateBtn, setShowOperateBtn] = useState<boolean>(false);
useEffect(() => { useEffect(() => {
window.parent.postMessage({ type: "init" }, "*"); window.parent.postMessage({ type: "init" }, "*");
@ -37,7 +38,11 @@ const Index: FunctionComponent<Props> = (props) => {
const receiveMessageFromIndex = (event: any) => { const receiveMessageFromIndex = (event: any) => {
const data: any = exceptStr(event.data); const data: any = exceptStr(event.data);
if (!_.isEmpty(data)) { if (!_.isEmpty(data)) {
const { columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {}, runStatuses } = data; const {
columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {},
runStatuses, showOperateBtn
} = data;
setShowOperateBtn(showOperateBtn);
setRunStatuses(runStatuses); setRunStatuses(runStatuses);
setI18n(i18nRes); setI18n(i18nRes);
setPageInfo(pageInfo); setPageInfo(pageInfo);
@ -82,14 +87,6 @@ const Index: FunctionComponent<Props> = (props) => {
}; };
const cols: any = useMemo(() => { const cols: any = useMemo(() => {
let opts: any = { title: i18n["操作"], dataIndex: "operate", fixed: "right", width: 185 }; let opts: any = { title: i18n["操作"], dataIndex: "operate", fixed: "right", width: 185 };
const UnAuthOpts = (record: any) => (<Space>
<Button type="link" onClick={() => handleWelfareOperate("VIEW", record)}>{i18n["查看"]}</Button>
<Dropdown menu={{
items: [{ key: "Log", label: i18n["操作日志"], onClick: () => handleWelfareOperate("log", record) }]
}} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/>
</Dropdown>
</Space>);
switch (runStatuses) { switch (runStatuses) {
case "1": case "1":
opts = { opts = {
@ -112,13 +109,13 @@ const Index: FunctionComponent<Props> = (props) => {
onClick: () => handleWelfareOperate("log", record) onClick: () => handleWelfareOperate("log", record)
} }
]; ];
return (record?.opts.includes("admin") ? <Space> return (<Space>
<Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button> <Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button>
<Button type="link" onClick={() => handleWelfareOperate("ADD-TO-PAY", record)}>{i18n["增员"]}</Button> <Button type="link" onClick={() => handleWelfareOperate("ADD-TO-PAY", record)}>{i18n["增员"]}</Button>
<Dropdown menu={{ items }} placement="bottomRight"> <Dropdown menu={{ items }} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/> <Button type="link" icon={<MoreOutlined/>}/>
</Dropdown> </Dropdown>
</Space> : UnAuthOpts(record)); </Space>);
} }
}; };
break; break;
@ -134,12 +131,13 @@ const Index: FunctionComponent<Props> = (props) => {
onClick: () => handleWelfareOperate("log", record) onClick: () => handleWelfareOperate("log", record)
} }
]; ];
return (record?.opts.includes("admin") ? <Space> return (
<Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button> <Space>
<Dropdown menu={{ items }} placement="bottomRight"> <Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button>
<Button type="link" icon={<MoreOutlined/>}/> <Dropdown menu={{ items }} placement="bottomRight">
</Dropdown> <Button type="link" icon={<MoreOutlined/>}/>
</Space> : UnAuthOpts(record)); </Dropdown>
</Space>);
} }
}; };
break; break;
@ -159,14 +157,14 @@ const Index: FunctionComponent<Props> = (props) => {
onClick: () => handleWelfareOperate("log", record) onClick: () => handleWelfareOperate("log", record)
} }
]; ];
return (record?.opts.includes("admin") ? <Space> return (<Space>
<Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button> <Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button>
<Button type="link" <Button type="link"
onClick={() => handleWelfareOperate("STAY-DEL-TO-STOP", record)}>{i18n["减员"]}</Button> onClick={() => handleWelfareOperate("STAY-DEL-TO-STOP", record)}>{i18n["减员"]}</Button>
<Dropdown menu={{ items: downsizingItems }} placement="bottomRight"> <Dropdown menu={{ items: downsizingItems }} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/> <Button type="link" icon={<MoreOutlined/>}/>
</Dropdown> </Dropdown>
</Space> : UnAuthOpts(record)); </Space>);
} }
}; };
break; break;
@ -186,27 +184,38 @@ const Index: FunctionComponent<Props> = (props) => {
onClick: () => handleWelfareOperate("log", record) onClick: () => handleWelfareOperate("log", record)
} }
]; ];
return (record?.opts.includes("admin") ? <Space> return (<Space>
<Button type="link" onClick={() => handleWelfareOperate("VIEW", record)}>{i18n["查看"]}</Button> <Button type="link" onClick={() => handleWelfareOperate("VIEW", record)}>{i18n["查看"]}</Button>
<Button type="link" <Button type="link"
onClick={() => handleWelfareOperate("DEL-ARCHIVE", record)}>{i18n["删除档案"]}</Button> onClick={() => handleWelfareOperate("DEL-ARCHIVE", record)}>{i18n["删除档案"]}</Button>
<Dropdown menu={{ items: stopItems }} placement="bottomRight"> <Dropdown menu={{ items: stopItems }} placement="bottomRight">
<Button type="link" icon={<MoreOutlined/>}/> <Button type="link" icon={<MoreOutlined/>}/>
</Dropdown> </Dropdown>
</Space> : UnAuthOpts(record)); </Space>);
} }
}; };
break; break;
default: default:
break; break;
} }
return [...columns, opts]; return showOperateBtn ? [...columns, opts] : [...columns, {
}, [columns, runStatuses, i18n]); ...opts,
render: (__: any, record: any) => (
<Space>
<Button type="link" onClick={() => handleWelfareOperate("VIEW", record)}>{i18n["查看"]}</Button>
<Button type="link" onClick={() => handleWelfareOperate("log", record)}>{i18n["操作日志"]}</Button>
</Space>
)
}];
}, [columns, runStatuses, i18n, showOperateBtn]);
return (<Table return (<Table
rowKey="baseInfoId" size="small" className={styles.tableWrapper} rowKey="baseInfo" size="small" className={styles.tableWrapper}
columns={cols} dataSource={dataSource} rowSelection={rowSelection} columns={cols} dataSource={dataSource} rowSelection={rowSelection}
scroll={{ x: 1200, y: `calc(100vh - 103px)` }} scroll={{ x: 1200, y: `calc(100vh - 103px)` }}
pagination={{ ...paginationAction(pageInfo, i18n, onChange), size: "default" }} pagination={{
...paginationAction(pageInfo, i18n, onChange),
size: "default"
}}
/>); />);
}; };

Write Preview
Loading…
Cancel
Save