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

Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 

# Conflicts:
#	src/pages/calcTable/index.tsx
This commit is contained in:
lys 2024-10-22 15:34:15 +08:00
parent caa31ad1ba 632f42bf07
commit 5b17d10230
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ const index: FunctionComponent<Props> = (props) => {
{text}
</span>
<Icon type="icon-piliangfenpei" title={i18n["查看拓扑图"]} className={styles.diagramIcon} onClick={() => handleDiagramTd(item?.dataIndex, record?.id)} />
{record.lockItems.includes(item.dataIndex) ? <LockOutlined title={item.i18n["锁定的项目值"]} /> : null}
{record.lockItems && record.lockItems.includes(item.dataIndex) ? <LockOutlined title={item.i18n["锁定的项目值"]} /> : null}
</span>
</Dropdown>
);
@ -150,9 +150,6 @@ const index: FunctionComponent<Props> = (props) => {
}
});
};
const handleDiagramTd = (salaryItemId: string, acctEmpId: string) => {
window.parent.postMessage({ type: "turn", payload: { id: "DIAGRAM", params: { salaryItemId, acctEmpId } } }, "*");
};
const handleFormulaTd = (dataIndex: string) => {
window.parent.postMessage({ type: "turn", payload: { id: "FORMULA", params: { dataIndex } } }, "*");
};
@ -224,6 +221,9 @@ const index: FunctionComponent<Props> = (props) => {
}
/>
);
const handleDiagramTd = (salaryItemId: string, acctEmpId: string) => {
window.parent.postMessage({ type: "turn", payload: { id: "DIAGRAM", params: { salaryItemId, acctEmpId } } }, "*");
};
};
export default index;