From 793d7acefb8b690a05a753e43fe9e6a4736f4a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 11 Sep 2024 10:10:11 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/salaryFileTable/index.tsx | 144 ++++++++++++++-------------- 1 file changed, 74 insertions(+), 70 deletions(-) diff --git a/src/pages/salaryFileTable/index.tsx b/src/pages/salaryFileTable/index.tsx index 6185926..bf2f81e 100644 --- a/src/pages/salaryFileTable/index.tsx +++ b/src/pages/salaryFileTable/index.tsx @@ -24,9 +24,7 @@ const Index: FunctionComponent = (props) => { const [pageInfo, setPageInfo] = useState>({}); const [i18n, setI18n] = useState({}); const [runStatuses, setRunStatuses] = useState(""); - const [showOperateBtn, setShowOperateBtn] = useState(false); const [showDelSalaryFileBtn, setShowDelSalaryFileBtn] = useState(false);//待定薪、停薪员工 是否允许删除薪资档案 - const [DCChiefPermission, setDCChiefPermission] = useState(undefined);//二开权限（大成） useEffect(() => { window.parent.postMessage({ type: "init" }, "*"); @@ -40,10 +38,8 @@ const Index: FunctionComponent = (props) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { const { - columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {}, - selectedKey, showOperateBtn, showDelSalaryFileBtn, DCChiefPermission + columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {}, selectedKey, showDelSalaryFileBtn } = data; - setShowOperateBtn(showOperateBtn); setRunStatuses(selectedKey); setI18n(i18nRes); setPageInfo(pageInfo); @@ -51,7 +47,6 @@ const Index: FunctionComponent = (props) => { setSelectedRowKeys(selectedRowKeys); setColumns(columns); setShowDelSalaryFileBtn(showDelSalaryFileBtn); - setDCChiefPermission(DCChiefPermission); } }; const onChange = (current: number, pageSize: number) => { @@ -116,19 +111,22 @@ const Index: FunctionComponent = (props) => { } ]; !showDelSalaryFileBtn && (items = _.dropRight(items)); - return ( - { - (_.isNil(DCChiefPermission) || DCChiefPermission) ? + return ( + record?.opts.includes("admin") ? + : - - } - - - + + + + + + ); } }; break; @@ -145,18 +143,20 @@ const Index: FunctionComponent = (props) => { } ]; return ( - - { - (((_.isNil(DCChiefPermission) || DCChiefPermission) && runStatuses === "fixed") || runStatuses === "ext") ? - : - - } - - + + + + ); } }; @@ -177,14 +177,23 @@ const Index: FunctionComponent = (props) => { onClick: () => handleSalaryFileOperate("log", record) } ]; - return ( - - - - + + + + + + ); } }; break; @@ -193,54 +202,49 @@ const Index: FunctionComponent = (props) => { ...opts, render: (__: any, record: any) => { let stopItems: MenuProps["items"] = [ - { - key: "Log", - label: i18n["操作日志"], - onClick: () => handleSalaryFileOperate("log", record) - }, { key: "CancelSuspension", label: i18n["删除档案"], onClick: () => handleSalaryFileOperate("DEL-SALARY-FILES", record, [record?.id]) + }, + { + key: "Log", + label: i18n["操作日志"], + onClick: () => handleSalaryFileOperate("log", record) } ]; !showDelSalaryFileBtn && (stopItems = _.dropRight(stopItems)); - return ( - - - { - !_.isEmpty(stopItems) && - - + + { + !_.isEmpty(stopItems) && + + + + + ); } }; break; default: break; } - return showOperateBtn ? [..._.filter(columns, o => o.dataIndex !== "operate"), opts] : - [..._.filter(columns, o => o.dataIndex !== "operate"), { - ...opts, - render: (__: any, record: any) => ( - - { - (DCChiefPermission && (runStatuses === "pending" || runStatuses === "fixed")) ? - : - - } - - - ) - }]; + return [..._.filter(columns, o => o.dataIndex !== "operate"), opts]; } else { return []; } - }, [columns, runStatuses, i18n, showOperateBtn, showDelSalaryFileBtn, DCChiefPermission]); + }, [columns, runStatuses, i18n, showDelSalaryFileBtn]); return ( Date: Thu, 26 Sep 2024 16:16:01 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/salaryFileTable/index.tsx | 43 +++++++++++++--- src/pages/unitTable/renderColsOpts.tsx | 12 ++--- src/pages/welfareArchiveTable/index.tsx | 65 ++++++++++--------------- 3 files changed, 67 insertions(+), 53 deletions(-) diff --git a/src/pages/salaryFileTable/index.tsx b/src/pages/salaryFileTable/index.tsx index bf2f81e..1fc461a 100644 --- a/src/pages/salaryFileTable/index.tsx +++ b/src/pages/salaryFileTable/index.tsx @@ -124,7 +124,15 @@ const Index: FunctionComponent = (props) => { : - + handleSalaryFileOperate("log", record) + } + ] + }} placement="bottomRight"> + - + handleSalaryFileOperate("log", record) + } + ] + }} placement="bottomRight"> + - + handleSalaryFileOperate("log", record) + } + ] + }} placement="bottomRight"> + - + handleSalaryFileOperate("log", record) + } + ] + }} placement="bottomRight"> + ); + onClick={() => postMessageToParent((billStatus === "0" && record?.opts.includes("admin")) ? "CALC" : "VIEW", record)}>{text}); } }; break; @@ -72,15 +72,13 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, return ( { - !extraParams?.permission ? + !record?.opts.includes("admin") ? postMessageToParent("log", record) - }] + items: [ + { key: "Log", label: i18n?.["操作日志"], onClick: () => postMessageToParent("log", record) } + ] }} placement="bottomRight"> + handleWelfareOperate("log", record) }] + }} placement="bottomRight"> + - - + + - - - ) - }]; - }, [columns, runStatuses, i18n, showOperateBtn]); + return [...columns, opts]; + }, [columns, runStatuses, i18n]); return (
); }; From 78faf02e22d431622b57d1f9a84727141b7e18c5 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 16 Oct 2024 11:21:12 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/unitTable/index.less | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/pages/unitTable/index.less b/src/pages/unitTable/index.less index 852cac3..9c68a13 100644 --- a/src/pages/unitTable/index.less +++ b/src/pages/unitTable/index.less @@ -106,6 +106,28 @@ } } } + + .ant-checkbox-inner { + width: 14px; + height: 14px; + } + + .ant-table-header { + .ant-checkbox-checked { + .ant-checkbox-inner:after { + width: 5px !important; + } + } + + .ant-checkbox-inner:after { + width: 8px !important; + } + } + + .ant-checkbox-inner:after { + width: 5px; + height: 8px; + } } } From 5f37df75cc777644337e8db5928bb105dffc020a Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 15 Nov 2024 15:49:13 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feature/=E4=B8=9A=E5=8A=A1=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/unitTable/renderColsOpts.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index c87fc0e..4c27bd9 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -404,13 +404,15 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, onClick: () => postMessageToParent("log", record) } ]; - isSpecial && items.shift(); + (isSpecial || !record?.opts.includes("admin")) && items.shift(); return ( - - {isSpecial ? ( + {record?.opts.includes("admin") && ( + + )} + {isSpecial && record?.opts.includes("admin") ? ( From 8908b23300359138388754dce3325c12dc500b73 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 28 Feb 2025 13:38:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?feature/=E4=B8=9A=E5=8A=A1=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/unitTable/renderColsOpts.tsx | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index 4c27bd9..b56b20f 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -359,12 +359,20 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, render: (__: string, record: any) => { return ( - - + {record?.opts.includes("admin") ? ( + + + + + ) : ( + + )} ); } From e672532907865fdb681d2b2a5fadb0f53b724dd2 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 14 Apr 2025 16:44:32 +0800 Subject: [PATCH 06/10] =?UTF-8?q?feature/=E4=B8=9A=E5=8A=A1=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/standingbookTable/index.tsx | 184 +++++++++++--------------- 1 file changed, 78 insertions(+), 106 deletions(-) diff --git a/src/pages/standingbookTable/index.tsx b/src/pages/standingbookTable/index.tsx index f2ba017..24474ad 100644 --- a/src/pages/standingbookTable/index.tsx +++ b/src/pages/standingbookTable/index.tsx @@ -1,9 +1,8 @@ import React, { FC, useEffect, useState } from "react"; -import { Button, Spin, Table, Typography } from "antd"; +import { Button, Table, Typography } from "antd"; import { exceptStr, paginationFun } from "@/utils/common"; import { defaultPage, IPage } from "@/common/types"; import styles from "@/pages/atdTable/components/index.less"; -import API from "@/api"; const { Text } = Typography; const StandingbookTable: FC = (props) => { @@ -12,7 +11,6 @@ const StandingbookTable: FC = (props) => { const [dataSource, setDataSource] = useState>([]); const [pageInfo, setPageInfo] = useState(defaultPage); const [sumRow, setSumRow] = useState>({}); - const [showSumrow, setShowSumrow] = useState(false); useEffect(() => { window.parent.postMessage({ type: "init" }, "*"); @@ -24,134 +22,108 @@ const StandingbookTable: FC = (props) => { const receiveMessageFromIndex = async (event: any) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { - const { - columns, dataSource, pageInfo, showOperates, selectedRowKeys, - sumpayload, selectedKey - } = data; + const { columns, dataSource, pageInfo, showOperates, selectedRowKeys, sumRow } = data; const { current: pageNum, pageSize: size, total } = pageInfo; - const conventColumns = _.map(_.filter(columns, it => it.dataIndex !== "id"), item => { - const { dataIndex } = item; - if (dataIndex === "employeeId") { + const conventColumns = _.map( + _.filter(columns, (it) => it.dataIndex !== "id"), + (item) => { + const { dataIndex } = item; + if (dataIndex === "employeeId") { + return { + title: "姓名", + dataIndex, + fixed: "left", + width: 150, + render: (_: any, record: Partial) => {record?.userName} + }; + } return { - title: "姓名", dataIndex, fixed: "left", width: 150, - render: (_: any, record: Partial) => ( - {record?.userName} - ) + dataIndex, + width: 150, + title: }; } - return { - dataIndex, width: 150, - title: - }; - }); + ); setDataSource(dataSource); setColumns( - !showOperates ? conventColumns : - [ - ...conventColumns, - { - title: "操作", - dataIndex: "operate", - fixed: "right", - width: 120, - render: (_: any, record: any) => { - return ( - - ); + !showOperates + ? conventColumns + : [ + ...conventColumns, + { + title: "操作", + dataIndex: "operate", + fixed: "right", + width: 120, + render: (_: any, record: any) => { + return ( + + ); + } } - } - ] + ] ); setPageInfo({ pageNum, size, total }); setSelected(selectedRowKeys); - const confCode: any = await API.CalculateService.getSysconfcode({ code: "OPEN_ACCT_RESULT_SUM" }); - setShowSumrow(confCode.data.status && confCode.data.data === "1"); - if (confCode.data.status && confCode.data.data === "1") { - const sumRowlist: any = selectedKey === "1" ? await API.CalculateService.siaccountDetailCommonListSum(sumpayload) : - selectedKey === "3" ? await API.CalculateService.siaccountDetailSupplementaryListSum(sumpayload) : - selectedKey === "regression" ? await API.CalculateService.siaccountDetailRecessionListSum(sumpayload) : - selectedKey === "difference" ? await API.CalculateService.siaccountDetailBalanceListSum(sumpayload) : { - data: { - status: false, - data: { sumRow: {} } - } - }; - if (sumRowlist.data.status) { - if (!_.isEmpty(sumRowlist.data.data.sumRow)) { - setSumRow(sumRowlist.data.data.sumRow); - } else { - setSumRow({ [new Date().getTime()]: new Date().getTime() }); - } - } - if (sumRowlist.data.status && _.isNil(sumRowlist.data.data.sumRow)) { - setSumRow({ [new Date().getTime()]: new Date().getTime() }); - } - } + setSumRow(sumRow); } }; const handleEdit = (record: any) => { window.parent.postMessage({ type: "turn", payload: { id: "EDIT", params: { ...record } } }, "*"); }; - const sizeChange = (pageobj: IPage) => { - }; + const sizeChange = (pageobj: IPage) => {}; const onChange = (pageobj: IPage) => { setPageInfo({ ...pageInfo, ...pageobj }); - window.parent.postMessage( - { - type: "turn", - payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } - }, - "*" - ); + window.parent.postMessage({ type: "turn", payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } }, "*"); }; const rowSelection = { selectedRowKeys: selected, - columnWidth: 80, + columnWidth: 60, onChange: (selectedRowKeys: Array) => { setSelected(selectedRowKeys); - window.parent.postMessage( - { - type: "turn", - payload: { id: "ROWSELECT", params: { selectedRowKeys } } - }, - "*" - ); + window.parent.postMessage({ type: "turn", payload: { id: "ROWSELECT", params: { selectedRowKeys } } }, "*"); } }; - return
{ - if (_.isEmpty(columns) || !showSumrow) return; - return ( - - - { - _.isEmpty(sumRow) ? : - _.map([{}, ...columns], (item, index) => { - if (index === 0) { - return 总计; - } - return + return ( +
{ + if (_.isEmpty(sumRow)) return; + return ( + + + {_.map([{}, ...columns], (item, index) => { + if (index === 0) { + return ( + + 总计 + + ); + } + return ( + {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} - ; - }) - } - - - ); - }} - />; + + ); + })} + + + ); + }} + /> + ); }; export default StandingbookTable; From ed3e74621a0cc43d51b7a252eb318341adfe6433 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 25 Apr 2025 09:04:51 +0800 Subject: [PATCH 07/10] =?UTF-8?q?feature/=E4=B8=9A=E5=8A=A1=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/unitTable/renderColsOpts.tsx | 48 +++++++------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index 8a93515..48b8a1c 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -452,41 +452,19 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, 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 ( - // - // - // {isSpecial ? ( - // - // ) : ( - // - // )} - // - // + ))} + + ); + } }; break; default: From e2eb2f97a9c033cbbe396b8dda82312f91196e29 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 19 Jun 2025 09:10:07 +0800 Subject: [PATCH 08/10] =?UTF-8?q?feature/=E4=B8=9A=E5=8A=A1=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calcTable/index.tsx | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 52e4e4e..10ea310 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -5,8 +5,7 @@ * Date: 2023/9/14 */ import React, { FunctionComponent, useEffect, useState } from "react"; -import type { MenuProps } from "antd"; -import { Button, Dropdown, Space, Table, Tooltip, Typography } from "antd"; +import { Button, Checkbox, Dropdown, MenuProps, Space, Table, Tooltip, Typography } from "antd"; import { DeleteOutlined, LockOutlined, QuestionCircleOutlined, SettingOutlined, UnlockOutlined } from "@ant-design/icons"; import CustomTableTitle from "@/pages/calcTable/customTableTitle"; import CalcExplainFooter from "@/pages/calcTable/calcExplainFooter"; @@ -124,7 +123,17 @@ const index: FunctionComponent = (props) => { const convertColumns: any = (cols: any[]) => { return _.map(cols, (item) => { if (_.isNaN(parseInt(item.dataIndex))) { - return { ...item }; + // 医博肛肠二开 + if (item.dataIndex === "ybgc-custom") { + return { + ...item, + render: (text: string, record: any) => { + return handlePassed(record, e.target.checked)} />; + } + }; + } else { + return { ...item }; + } } else { return { ...item, @@ -231,6 +240,19 @@ const index: FunctionComponent = (props) => { const handleSetFeedback = (params: any) => { window.parent.postMessage({ type: "turn", payload: { id: "SETFEEDBACK", params } }, "*"); }; + // 医博二开 + const handlePassed = (params: any, calculateStatus: boolean) => { + setDataSource((pre) => { + pre = _.map(pre, (o) => { + if (o.id === params.id) { + return { ...o, calculateStatus: calculateStatus ? "1" : "0" }; + } + return o; + }); + return pre; + }); + window.parent.postMessage({ type: "turn", payload: { id: "CUSTPASSED", params: { ...params, calculateStatus: calculateStatus ? "1" : "0" } } }, "*"); + }; const sizeChange = (pageobj: IPage) => {}; const onChange = (pageobj: IPage) => { setPageInfo(() => { @@ -240,8 +262,8 @@ const index: FunctionComponent = (props) => { }; const rowSelection = { columnWidth: 50, - columnTitle: isDetailTable && _.isNil(showSee) ? "序号" : "", - renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable && _.isNil(showSee) ? {index + 1} : originNode), + columnTitle: isDetailTable && !showSee ? "序号" : "", + renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable && !showSee ? {index + 1} : originNode), selectedRowKeys, preserveSelectedRowKeys: true, onChange: (rowKeys: React.Key[]) => { From 2892f4c6ee32faff3e5b1a13f7e8f84296a419dc Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 19 Jun 2025 10:04:34 +0800 Subject: [PATCH 09/10] =?UTF-8?q?feature/=E4=B8=9A=E5=8A=A1=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calcTable/index.tsx | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 10ea310..b3a8e1a 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -14,6 +14,7 @@ import type { ColumnType } from "antd/lib/table"; import type { PaginationData } from "rc-pagination"; import { exceptStr, paginationFun } from "@/utils/common"; import { IPage } from "@/common/types"; +import Icon from "../../lib/CustomIcon"; import styles from "@/pages/atdTable/components/index.less"; interface OwnProps {} @@ -204,6 +205,38 @@ const index: FunctionComponent = (props) => { }) } ]); + item.rightClickType && + item.rightClickType.includes("MARK") && + (items = [ + ...items, + { + label: item.i18n["标记"], + key: "MARK", + icon: , + onClick: () => + handleSetMark({ + lockStatus: "LOCK", + acctEmpId: record?.id, + salaryItemId: item?.dataIndex + }) + } + ]); + item.rightClickType && + item.rightClickType.includes("UNMARK") && + (items = [ + ...items, + { + label: item.i18n["取消标记"], + key: "UNMARK", + icon: , + onClick: () => + handleSetUnMark({ + lockStatus: "UNLOCK", + acctEmpId: record?.id, + salaryItemId: item?.dataIndex + }) + } + ]); return ( @@ -211,6 +244,7 @@ const index: FunctionComponent = (props) => { {text} {record.lockItems && record.lockItems.includes(item.dataIndex) ? : null} + {record.markItems && record.markItems.includes(item.dataIndex) ? : null} {!_.isEmpty(record[`${item.dataIndex}_feedback`]) ? ( @@ -240,6 +274,13 @@ const index: FunctionComponent = (props) => { const handleSetFeedback = (params: any) => { window.parent.postMessage({ type: "turn", payload: { id: "SETFEEDBACK", params } }, "*"); }; + // 安徽国元信托有限责任公司薪酬二开-薪资核算项添加右击添加标记和取消标记的操作 + const handleSetMark = (params: any) => { + window.parent.postMessage({ type: "turn", payload: { id: "MARK", params } }, "*"); + }; + const handleSetUnMark = (params: any) => { + window.parent.postMessage({ type: "turn", payload: { id: "UNMARK", params } }, "*"); + }; // 医博二开 const handlePassed = (params: any, calculateStatus: boolean) => { setDataSource((pre) => { From 62708e104ab5ddfd64d23dd013102bbc04834021 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 4 Jul 2025 14:59:32 +0800 Subject: [PATCH 10/10] =?UTF-8?q?feature/=E4=B8=9A=E5=8A=A1=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calcTable/customTableTitle.tsx | 7 +++++-- src/pages/calcTable/index.tsx | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/pages/calcTable/customTableTitle.tsx b/src/pages/calcTable/customTableTitle.tsx index 1985999..81f6d9a 100644 --- a/src/pages/calcTable/customTableTitle.tsx +++ b/src/pages/calcTable/customTableTitle.tsx @@ -17,13 +17,14 @@ interface OwnProps { i18n?: any; pattern?: number; calcDetail?: boolean; //查看详情页面 + mzgOptPermission?: boolean; //二开美之高操作权限 children?: any; } type Props = OwnProps; const customTableTitle: FunctionComponent = (props) => { - const { dataIndex, title, onHandleFormulatd, i18n = {}, pattern, dataType, calcDetail, children } = props; + const { dataIndex, title, onHandleFormulatd, i18n = {}, pattern, dataType, calcDetail, children, mzgOptPermission } = props; const handleToggleSalaryItemVal = (salaryItemId: string, type: string, updateParams: any = {}) => { window.parent.postMessage({ type: "turn", payload: { id: "LOCKING", params: { lockType: type, salaryItemId, ...updateParams } } }, "*"); }; @@ -37,7 +38,9 @@ const customTableTitle: FunctionComponent = (props) => {
handleToggleSalaryItemVal(dataIndex as string, "LOCK")} /> handleToggleSalaryItemVal(dataIndex as string, "UNLOCK")} /> - handleToggleSalaryItemVal(dataIndex as string, "BATCHUPDATE", { pattern, salaryItemName: title, dataType })} /> + {!mzgOptPermission && ( + handleToggleSalaryItemVal(dataIndex as string, "BATCHUPDATE", { pattern, salaryItemName: title, dataType })} /> + )}
)} diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 20e52a6..15a6d1a 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -37,6 +37,7 @@ const index: FunctionComponent = (props) => { const [payload, setPayload] = useState(""); const [fixed, setFixed] = useState(true); const [sumRow, setSumRow] = useState>({}); //总计行数据 + const [mzgOptPermission, setMzgOptPermission] = useState(false); //美之高操作权限 false 默认可以编辑,true不可编辑 useEffect(() => { window.parent.postMessage({ type: "init" }, "*"); @@ -62,7 +63,8 @@ const index: FunctionComponent = (props) => { fixed = true, tableScrollHeight, sumRow, - optWidth + optWidth, + mzgOptPermission = false } = data; setSumRowlistUrl(sumRowlistUrl); setShowTotalCell(showTotalCell); @@ -76,6 +78,7 @@ const index: FunctionComponent = (props) => { setDataSource(dataSource); setSelectedRowKeys([...selectedRowKeys, ...rowKeys]); setTableScrollHeight(tableScrollHeight); + setMzgOptPermission(mzgOptPermission); setColumns([ ...convertColumns(_.map(columns, (o) => ({ ...o, i18n: i18nRes }))), { @@ -330,7 +333,7 @@ const index: FunctionComponent = (props) => { x: 1200, y: `calc(100vh - ${tableScrollHeight || (!showTotalCell ? 165 : 200)}px)` }} - columns={!isDetailTable || showSee ? columns : _.filter(columns, (o) => o.dataIndex !== "operate")} + columns={(!isDetailTable || showSee) && !mzgOptPermission ? columns : _.filter(columns, (o) => o.dataIndex !== "operate")} footer={() => (!isDetailTable ? : null)} pagination={ !_.isNil(pageInfo)