Compare commits

..

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

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

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

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

Loading…
Cancel
Save