From 7c57f726a15ce1d5d75cde85960eb3c2181c5e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 21 Apr 2023 11:05:24 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/atdTable/components/index.less | 17 ++++++++++++----- src/pages/rankMapTable/index.tsx | 2 ++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 65e40a2..fd705a0 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -156,17 +156,24 @@ } } -:global{ - .rankMapWrapper{ - .ant-table-thead>tr>th{ +:global { + .rankMapWrapper { + .ant-table-thead > tr > th { background: #ED7D31; } } + .bg_1_Cols { - background: #ED7D31!important; + background: #ED7D31 !important; } + + th.bg_1_Cols { + height: 48px; + line-height: 48px; + } + .bg_2_Cols { - background: #DEE0E3!important; + background: #DEE0E3 !important; } } diff --git a/src/pages/rankMapTable/index.tsx b/src/pages/rankMapTable/index.tsx index 66c0c79..468671a 100644 --- a/src/pages/rankMapTable/index.tsx +++ b/src/pages/rankMapTable/index.tsx @@ -19,6 +19,7 @@ const RankMapTable: React.FC = () => { ...item, align: "center", className: colsIndex === "1" ? "bg_1_Cols" : colsIndex === "2" ? "bg_2_Cols" : "", + width: colsIndex === "1" && "60px", render: (text: string, _: any) => { return { children: {text}, @@ -63,6 +64,7 @@ const RankMapTable: React.FC = () => { _.forEach(_.reduce(columns, (pre: any, cur: any) => ([...pre, cur["dataIndex"]]), []), item => { tmpV = changeData(list, item); }); + console.log(columns); setCols(columns); setDataSource(tmpV); } From 59497e306b309c88659cf450de2b4a3728a6073b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 24 Apr 2023 09:37:05 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/config.js | 45 +++++++++++++------------ src/pages/reportTable/index.tsx | 59 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 22 deletions(-) create mode 100644 src/pages/reportTable/index.tsx diff --git a/src/layouts/config.js b/src/layouts/config.js index 535553c..86025f5 100644 --- a/src/layouts/config.js +++ b/src/layouts/config.js @@ -1,25 +1,26 @@ module.exports = { - name: '统一软件开发平台', + name: "统一软件开发平台", layoutConfig: { - '/home': 'blank', - '/manage/design/.*': 'blank', - '/manage/editor': 'blank', - '/calculateDetail.*': 'blank', - '/atdTable.*': 'blank', - '/previewTable.*': 'blank', - '/standingbookTable.*': 'blank', - '/fileTable.*': 'blank', - '/rankMapTable.*': 'blank', - '/manage.*': 'manage', - '/portal.*': 'template', - '/passport/oauth-in': 'blank', - '/passport/openid-in': 'blank', - '/passport/sign-in': 'user', - '/passport/chose-portal': 'user', - '/passport/RegisterResult': 'user', - '/403': 'blank', - '/404': 'blank', - '/500': 'blank', - '/': 'template', - }, + "/home": "blank", + "/manage/design/.*": "blank", + "/manage/editor": "blank", + "/calculateDetail.*": "blank", + "/atdTable.*": "blank", + "/previewTable.*": "blank", + "/standingbookTable.*": "blank", + "/fileTable.*": "blank", + "/rankMapTable.*": "blank", + "/reportTable.*": "blank", + "/manage.*": "manage", + "/portal.*": "template", + "/passport/oauth-in": "blank", + "/passport/openid-in": "blank", + "/passport/sign-in": "user", + "/passport/chose-portal": "user", + "/passport/RegisterResult": "user", + "/403": "blank", + "/404": "blank", + "/500": "blank", + "/": "template" + } }; diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx new file mode 100644 index 0000000..41e9c3a --- /dev/null +++ b/src/pages/reportTable/index.tsx @@ -0,0 +1,59 @@ +import React, { FC, useEffect, useState } from "react"; +import { Table, Typography } from "antd"; +import { exceptStr } from "@/utils/common"; +import styles from "@/pages/atdTable/components/index.less"; + +const { Text } = Typography; +const PreviewTable: FC = (props) => { + const [columns, setColumns] = useState>([]); + const [sumRow, setSumRow] = useState>({}); + const [dataSource, setDataSource] = useState>([]); + const [showSumrow, setShowSumrow] = useState(false); + + useEffect(() => { + window.parent.postMessage({ type: "init" }, "*"); + window.addEventListener("message", receiveMessageFromIndex, false); + return () => { + window.removeEventListener("message", receiveMessageFromIndex, false); + }; + }, []); + const receiveMessageFromIndex = (event: any) => { + const data: any = exceptStr(event.data); + if (!_.isEmpty(data)) { + const { columns, dataSource, countResult, showSum } = data; + setDataSource(dataSource); + setColumns(columns); + setShowSumrow(showSum); + setSumRow(countResult); + } + }; + return { + if (!showSumrow) return; + return ( + + + { + _.map(columns, (item, index) => { + if (index === 0) { + return 总计; + } + return + {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} + ; + }) + } + + + ); + }} + />; +}; + +export default PreviewTable; From ba6bb910159dce69314ccf7f47420f25dfa9b8b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 25 Apr 2023 09:59:07 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/reportTable/index.tsx | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx index 41e9c3a..12800fe 100644 --- a/src/pages/reportTable/index.tsx +++ b/src/pages/reportTable/index.tsx @@ -32,19 +32,30 @@ const PreviewTable: FC = (props) => { className={styles.tableWrapper} columns={columns} dataSource={dataSource} + pagination={false} bordered size="small" + scroll={{ x: 1200, y: `calc(100vh - 109px)` }} summary={() => { if (!showSumrow) return; + let totalColumns: any[] = []; + _.forEach(columns, it => { + if (!it.children) { + totalColumns.push(it); + } else { + totalColumns = [...totalColumns, ...it.children]; + } + }); return ( { - _.map(columns, (item, index) => { + _.map([{}, ...totalColumns], (item, index) => { if (index === 0) { - return 总计; + return 总计; } - return + return {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} ; }) From 1f0f016a56ea6648d4dcf15db4412f065ea5a4b1 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, 26 Apr 2023 17:26:33 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/calculate.service.ts | 20 ++++++++++ src/pages/previewTable/index.tsx | 43 ++++++++++++++------- src/pages/standingbookTable/index.tsx | 54 +++++++++++++++++++-------- 3 files changed, 89 insertions(+), 28 deletions(-) diff --git a/src/api/calculate.service.ts b/src/api/calculate.service.ts index 0de7712..29a29b9 100644 --- a/src/api/calculate.service.ts +++ b/src/api/calculate.service.ts @@ -35,6 +35,26 @@ class CalculateService extends BasicService { getRankInfo = async () => { return this.get(`/api/ais/tupu/getRankInfo`); }; + //获取社保福利台账-正常缴纳合计行数据 + siaccountDetailCommonListSum = async (data: any) => { + return this.post(`/api/bs/hrmsalary/siaccount/detail/common/list/sum`, data); + }; + //获取社保福利台账-正常缴纳合计行数据 + siaccountDetailSupplementaryListSum = async (data: any) => { + return this.post(`/api/bs/hrmsalary/siaccount/detail/supplementary/list/sum`, data); + }; + //获取社保福利台账-社保福利台账退差合计接口 + siaccountDetailRecessionListSum = async (data: any) => { + return this.post(`/api/bs/hrmsalary/siaccount/detail/recession/list/sum`, data); + }; + //获取社保福利台账-社保福利台账补差合计接口 + siaccountDetailBalanceListSum = async (data: any) => { + return this.post(`/api/bs/hrmsalary/siaccount/detail/balance/list/sum`, data); + }; + //工资单发放-查看详情页面列表合计行数据 + salaryBillSendSum = async (data: any) => { + return this.post(`/api/bs/hrmsalary/salaryBill/send/sum`, data); + }; //合计行 getAcctresultsum = async (params: any) => { const { departmentIds = "", positionIds = "", subcompanyIds = "", ...extraParams } = params || {}; diff --git a/src/pages/previewTable/index.tsx b/src/pages/previewTable/index.tsx index a1c7fc8..2a14459 100644 --- a/src/pages/previewTable/index.tsx +++ b/src/pages/previewTable/index.tsx @@ -1,8 +1,9 @@ import React, { FC, useEffect, useState } from "react"; -import { Table, Typography } from "antd"; +import { Spin, Table, Typography } from "antd"; import styles from "@/pages/atdTable/components/index.less"; import { exceptStr, paginationFun } from "@/utils/common"; import { defaultPage, IPage } from "@/common/types"; +import API from "@/api"; const { Text } = Typography; const PreviewTable: FC = (props) => { @@ -19,16 +20,30 @@ const PreviewTable: FC = (props) => { window.removeEventListener("message", receiveMessageFromIndex, false); }; }, []); - const receiveMessageFromIndex = (event: any) => { + const receiveMessageFromIndex = async (event: any) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { - const { columns, dataSource, pageInfo, salaryBillSendSum, showSum } = data; + const { columns, dataSource, pageInfo, sumpayload } = data; const { current: pageNum, pageSize: size, total } = pageInfo; setDataSource(dataSource); setColumns(columns); - setShowSumrow(showSum); - setSumRow(salaryBillSendSum); setPageInfo({ pageNum, size, total }); + 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 = await API.CalculateService.salaryBillSendSum(sumpayload); + if (sumRowlist.data.status) { + if (!_.isEmpty(sumRowlist.data.data.sumRow)) { + const tmpVSumRow= _.reduce(_.keys(sumRowlist.data.data.sumRow), (pre, cur) => (_.assign(pre, { [`${cur}_salaryItem`]: sumRowlist.data.data.sumRow[cur] })), {}) + setSumRow(tmpVSumRow); + } else { + setSumRow({ [new Date().getTime()]: new Date().getTime() }); + } + } + if (sumRowlist.data.status && _.isNil(sumRowlist.data.data.sumRow)) { + setSumRow({ [new Date().getTime()]: new Date().getTime() }); + } + } } }; const sizeChange = (pageobj: IPage) => { @@ -60,14 +75,16 @@ const PreviewTable: FC = (props) => { { - _.map(columns, (item, index) => { - if (index === 0) { - return 总计; - } - return - {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} - ; - }) + _.isEmpty(sumRow) ? : + _.map(columns, (item, index) => { + if (index === 0) { + return 总计; + } + return + {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} + ; + }) } diff --git a/src/pages/standingbookTable/index.tsx b/src/pages/standingbookTable/index.tsx index 0a25f50..8309ad3 100644 --- a/src/pages/standingbookTable/index.tsx +++ b/src/pages/standingbookTable/index.tsx @@ -1,8 +1,9 @@ import React, { FC, useEffect, useState } from "react"; -import { Button, Table, Typography } from "antd"; +import { Button, Spin, 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) => { @@ -20,12 +21,13 @@ const StandingbookTable: FC = (props) => { window.removeEventListener("message", receiveMessageFromIndex, false); }; }, []); - const receiveMessageFromIndex = (event: any) => { + const receiveMessageFromIndex = async (event: any) => { const data: any = exceptStr(event.data); + console.log("antd4", data); if (!_.isEmpty(data)) { const { columns, dataSource, pageInfo, showOperates, selectedRowKeys, - showSum, siaccountSum + sumpayload, selectedKey } = data; const { current: pageNum, pageSize: size, total } = pageInfo; const conventColumns = _.map(_.filter(columns, it => it.dataIndex !== "id"), item => { @@ -61,10 +63,31 @@ const StandingbookTable: FC = (props) => { } ] ); - setSelected(selectedRowKeys); - setShowSumrow(showSum); - setSumRow(siaccountSum); 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() }); + } + } } }; const handleEdit = (record: any) => { @@ -113,15 +136,16 @@ const StandingbookTable: FC = (props) => { { - _.map(columns, (item, index) => { - if (index === 0) { - return 总计; - } - return - {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} - ; - }) + _.isEmpty(sumRow) ? : + _.map(columns, (item, index) => { + if (index === 0) { + return 总计; + } + return + {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} + ; + }) } From b65038b77fe72e2270c0c774daee986b4f65dfb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 26 May 2023 15:36:08 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/config.js | 2 + src/pages/commonTable/index.tsx | 102 +++++++++++ src/pages/payrollFilesTable/index.tsx | 249 ++++++++++++++++++++++++++ src/pages/reportTable/index.tsx | 4 +- src/pages/standingbookTable/index.tsx | 1 - 5 files changed, 355 insertions(+), 3 deletions(-) create mode 100644 src/pages/commonTable/index.tsx create mode 100644 src/pages/payrollFilesTable/index.tsx diff --git a/src/layouts/config.js b/src/layouts/config.js index 86025f5..2ba0867 100644 --- a/src/layouts/config.js +++ b/src/layouts/config.js @@ -11,6 +11,8 @@ module.exports = { "/fileTable.*": "blank", "/rankMapTable.*": "blank", "/reportTable.*": "blank", + "/commonTable.*": "blank", + "/payrollFilesTable.*": "blank", "/manage.*": "manage", "/portal.*": "template", "/passport/oauth-in": "blank", diff --git a/src/pages/commonTable/index.tsx b/src/pages/commonTable/index.tsx new file mode 100644 index 0000000..840978f --- /dev/null +++ b/src/pages/commonTable/index.tsx @@ -0,0 +1,102 @@ +import React, { FC, useEffect, useState } from "react"; +import { Table, Tag, Typography } from "antd"; +import { exceptStr, paginationFun } from "@/utils/common"; +import styles from "@/pages/atdTable/components/index.less"; +import { defaultPage, IPage } from "@/common/types"; + +const { Text } = Typography; +const CommonTable: FC = (props) => { + const [columns, setColumns] = useState>([]); + const [sumRow, setSumRow] = useState>({}); + const [pageInfo, setPageInfo] = useState(defaultPage); + const [dataSource, setDataSource] = useState>([]); + const [showSumrow, setShowSumrow] = useState(false); + + useEffect(() => { + window.parent.postMessage({ type: "init" }, "*"); + window.addEventListener("message", receiveMessageFromIndex, false); + return () => { + window.removeEventListener("message", receiveMessageFromIndex, false); + }; + }, []); + const receiveMessageFromIndex = (event: any) => { + const data: any = exceptStr(event.data); + if (!_.isEmpty(data)) { + const { columns, dataSource, countResult, showSum, pageInfo } = data; + const { current: pageNum, pageSize: size, total } = pageInfo; + setDataSource(dataSource); + setColumns(_.map(columns, item => { + if (item.dataIndex === "salarySob") { + return { + ...item, + render: (text: string, r: { acctTimes?: number }) => { + return
+ {text} + {`第${r?.acctTimes}次`} +
; + } + }; + } + return { ...item }; + })); + setShowSumrow(showSum); + setSumRow(countResult); + setPageInfo({ pageNum, size, total }); + } + }; + const sizeChange = (pageobj: IPage) => { + }; + const onChange = (pageobj: IPage) => { + setPageInfo({ ...pageInfo, ...pageobj }); + window.parent.postMessage( + { + type: "turn", + payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } + }, + "*" + ); + }; + return
{ + if (!showSumrow) return; + let totalColumns: any[] = []; + _.forEach(columns, it => { + if (!it.children) { + totalColumns.push(it); + } else { + totalColumns = [...totalColumns, ...it.children]; + } + }); + return ( + + + { + _.map([...totalColumns], (item, index) => { + if (index === 0) { + return 总计; + } + return + {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} + ; + }) + } + + + ); + }} + />; +}; + +export default CommonTable; diff --git a/src/pages/payrollFilesTable/index.tsx b/src/pages/payrollFilesTable/index.tsx new file mode 100644 index 0000000..d362798 --- /dev/null +++ b/src/pages/payrollFilesTable/index.tsx @@ -0,0 +1,249 @@ +import React, { FC, useEffect, useState } from "react"; +import { Button, Dropdown, Menu, Space, Spin, Table, Typography } from "antd"; +import { DownOutlined } from "@ant-design/icons"; +import { exceptStr, paginationFun } from "@/utils/common"; +import styles from "@/pages/atdTable/components/index.less"; +import { defaultPage, IPage } from "@/common/types"; +import cs from "classnames"; + +const { Text } = Typography; +const payrollFilesTable: FC = (props) => { + const [columns, setColumns] = useState>([]); + const [sumRow, setSumRow] = useState({}); + const [pageInfo, setPageInfo] = useState(defaultPage); + const [dataSource, setDataSource] = useState>([]); + const [showSumrow, setShowSumrow] = useState(false); + const [selected, setSelected] = useState>([]); + + useEffect(() => { + window.parent.postMessage({ type: "init" }, "*"); + window.addEventListener("message", receiveMessageFromIndex, false); + return () => { + window.removeEventListener("message", receiveMessageFromIndex, false); + }; + }, []); + const receiveMessageFromIndex = (event: any) => { + const data: any = exceptStr(event.data); + if (!_.isEmpty(data)) { + const { + columns, + dataSource, + countResult, + showSum, + pageInfo, + showOperateBtn, + selectedKey, + selectedRowKeys + } = data; + const { current: pageNum, pageSize: size, total } = pageInfo; + setDataSource(dataSource); + setColumns(_.map(columns, item => { + if (item.dataIndex === "operate") { + return { + ...item, + render: (text: string, r: { id?: string }) => { + let dom = null; + if (!showOperateBtn) { + dom = ; + } else { + if (selectedKey === "pending") { + dom = + + + + + + + + + + } + > + 更多 + + ; + } else if (selectedKey === "fixed") { + dom = ; + } else if (selectedKey === "suspend") { + dom = + + + + + + + + + + } + > + 更多 + + ; + } else { + dom = + + + ; + } + } + return dom; + } + }; + } + return { ...item }; + })); + setShowSumrow(showSum); + setSumRow(_.isEmpty(countResult) ? { [new Date().getTime()]: new Date().getTime() } : countResult); + setPageInfo({ pageNum, size, total }); + setSelected(selectedRowKeys); + } + }; + const handleMenuClick = (event: any, id?: string) => { + window.parent.postMessage( + { + type: "turn", + payload: { id: "MOREOPT", params: { id, event } } + }, + "*" + ); + }; + const sizeChange = (pageobj: IPage) => { + }; + const onChange = (pageobj: IPage) => { + setPageInfo({ ...pageInfo, ...pageobj }); + window.parent.postMessage( + { + type: "turn", + payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } + }, + "*" + ); + }; + + const rowSelection = { + selectedRowKeys: selected, + onChange: (selectedRowKeys: Array) => { + setSelected(selectedRowKeys); + window.parent.postMessage( + { + type: "turn", + payload: { id: "ROWSELECTION", params: { selectedRowKeys } } + }, + "*" + ); + } + }; + return
{ + if (!showSumrow) return; + let totalColumns: any[] = []; + _.forEach(columns, it => { + if (!it.children) { + totalColumns.push(it); + } else { + totalColumns = [...totalColumns, ...it.children]; + } + }); + return ( + + + { + sumRow.loading ? : + _.map([...totalColumns], (item, index) => { + if (index === 0) { + return 总计; + } + return + {!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"} + ; + }) + } + + + ); + }} + />; +}; + +export default payrollFilesTable; diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx index 12800fe..3559119 100644 --- a/src/pages/reportTable/index.tsx +++ b/src/pages/reportTable/index.tsx @@ -4,7 +4,7 @@ import { exceptStr } from "@/utils/common"; import styles from "@/pages/atdTable/components/index.less"; const { Text } = Typography; -const PreviewTable: FC = (props) => { +const ReportTable: FC = (props) => { const [columns, setColumns] = useState>([]); const [sumRow, setSumRow] = useState>({}); const [dataSource, setDataSource] = useState>([]); @@ -67,4 +67,4 @@ const PreviewTable: FC = (props) => { />; }; -export default PreviewTable; +export default ReportTable; diff --git a/src/pages/standingbookTable/index.tsx b/src/pages/standingbookTable/index.tsx index 8309ad3..d1605d2 100644 --- a/src/pages/standingbookTable/index.tsx +++ b/src/pages/standingbookTable/index.tsx @@ -23,7 +23,6 @@ const StandingbookTable: FC = (props) => { }, []); const receiveMessageFromIndex = async (event: any) => { const data: any = exceptStr(event.data); - console.log("antd4", data); if (!_.isEmpty(data)) { const { columns, dataSource, pageInfo, showOperates, selectedRowKeys, From 5fddf15870b2e2f161c07ff6617ff18a5f7a42ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 26 May 2023 15:36:17 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/atdTable/components/index.less | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index fd705a0..065aef4 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -56,6 +56,27 @@ } } + .customSpan { + display: flex; + align-items: center; + width: 100%; + justify-content: space-between; + + span.title { + flex: 1; + margin-right: 4px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + :global { + .ant-tag { + margin-right: 0; + } + } + } + :global { .ant-btn-link { font-size: 12px; From c289b0eb117b4a01d8d793e414136af879cc707e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 26 May 2023 16:38:12 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/atdTable/components/antdTable.tsx | 30 ++++++++++----------- src/pages/atdTable/components/index.less | 24 ++++++++++++++++- src/pages/payrollFilesTable/index.tsx | 2 ++ 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/pages/atdTable/components/antdTable.tsx b/src/pages/atdTable/components/antdTable.tsx index 8eb8de7..2d94f5c 100644 --- a/src/pages/atdTable/components/antdTable.tsx +++ b/src/pages/atdTable/components/antdTable.tsx @@ -1,7 +1,7 @@ import React, { FC, useEffect, useState } from "react"; import { exceptStr, paginationFun } from "@/utils/common"; import { defaultPage, ILoading, IPage } from "@/common/types/page"; -import { message, Spin, Table, Typography } from "antd"; +import { Button, message, Spin, Table, Typography } from "antd"; import { LockOutlined, UnlockOutlined } from "@ant-design/icons"; import API from "@/api"; import styles from "./index.less"; @@ -66,7 +66,7 @@ const AntdTable: FC = (props) => { 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 = await API.CalculateService.getAcctresultsum({...extraParams["queryParams"]}); + const sumRowlist: any = await API.CalculateService.getAcctresultsum({ ...extraParams["queryParams"] }); if (sumRowlist.data.status && !_.isEmpty(sumRowlist.data.data.sumRow)) { setSumRow(sumRowlist.data.data.sumRow); } @@ -86,19 +86,19 @@ const AntdTable: FC = (props) => { title: "操作", render: (text: string, record: any) => { return ( - { - window.parent.postMessage( - { - type: "PC", - data: { id: "DELETE", data: record } - }, - "*" - ); - }} + ); } }]; @@ -278,7 +278,7 @@ const AntdTable: FC = (props) => { width: "100px", fixed: "right", render: (text: string, record: any) => { - return { + return ; } }); return tmpColumns; diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 065aef4..01aed87 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -78,8 +78,17 @@ } :global { - .ant-btn-link { + .ant-btn-link, .ant-dropdown-trigger { font-size: 12px; + color: #333; + } + + .ant-btn-link:hover { + color: #00a9ff; + + span { + text-decoration: underline; + } } .ant-table-tbody > tr.ant-table-row:hover > td { @@ -156,6 +165,19 @@ .moreIconWrapper { :global { + .ant-btn-link { + font-size: 12px; + color: #333; + } + + .ant-btn-link:hover { + color: #00a9ff; + + span { + text-decoration: underline; + } + } + .ant-popover-inner { min-width: 106px } diff --git a/src/pages/payrollFilesTable/index.tsx b/src/pages/payrollFilesTable/index.tsx index d362798..4afa0a9 100644 --- a/src/pages/payrollFilesTable/index.tsx +++ b/src/pages/payrollFilesTable/index.tsx @@ -70,6 +70,7 @@ const payrollFilesTable: FC = (props) => { 编辑 @@ -113,6 +114,7 @@ const payrollFilesTable: FC = (props) => { 编辑 From d8aa0397412f34b16ede441370257a0b80703257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 30 May 2023 09:51:04 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/atdTable/components/antdTable.tsx | 2 +- src/pages/commonTable/index.tsx | 2 +- src/pages/payrollFilesTable/index.tsx | 5 +++-- src/pages/standingbookTable/index.tsx | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/atdTable/components/antdTable.tsx b/src/pages/atdTable/components/antdTable.tsx index 2d94f5c..9c542f6 100644 --- a/src/pages/atdTable/components/antdTable.tsx +++ b/src/pages/atdTable/components/antdTable.tsx @@ -361,7 +361,7 @@ const AntdTable: FC = (props) => { _.isEmpty(sumRow) ? : _.map([{}, ...totalColumns], (item, index) => { if (index === 0) { - return 总计; + return 总计; } return {sumRow[item.dataIndex] || "-"} diff --git a/src/pages/commonTable/index.tsx b/src/pages/commonTable/index.tsx index 840978f..4acab2b 100644 --- a/src/pages/commonTable/index.tsx +++ b/src/pages/commonTable/index.tsx @@ -84,7 +84,7 @@ const CommonTable: FC = (props) => { { _.map([...totalColumns], (item, index) => { if (index === 0) { - return 总计; } return diff --git a/src/pages/payrollFilesTable/index.tsx b/src/pages/payrollFilesTable/index.tsx index 4afa0a9..d47ac2c 100644 --- a/src/pages/payrollFilesTable/index.tsx +++ b/src/pages/payrollFilesTable/index.tsx @@ -189,6 +189,7 @@ const payrollFilesTable: FC = (props) => { }; const rowSelection = { + columnWidth: 50, selectedRowKeys: selected, onChange: (selectedRowKeys: Array) => { setSelected(selectedRowKeys); @@ -231,9 +232,9 @@ const payrollFilesTable: FC = (props) => { { sumRow.loading ? : - _.map([...totalColumns], (item, index) => { + _.map([{},...totalColumns], (item, index) => { if (index === 0) { - return 总计; } return diff --git a/src/pages/standingbookTable/index.tsx b/src/pages/standingbookTable/index.tsx index d1605d2..595872b 100644 --- a/src/pages/standingbookTable/index.tsx +++ b/src/pages/standingbookTable/index.tsx @@ -138,7 +138,7 @@ const StandingbookTable: FC = (props) => { _.isEmpty(sumRow) ? : _.map(columns, (item, index) => { if (index === 0) { - return 总计; } return From bbf2a4ebdbd0845c6bd41266f945f4aacdc194ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 30 May 2023 17:06:33 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/atdTable/components/index.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/pages/atdTable/components/index.less b/src/pages/atdTable/components/index.less index 01aed87..928ff6c 100644 --- a/src/pages/atdTable/components/index.less +++ b/src/pages/atdTable/components/index.less @@ -117,6 +117,15 @@ } } + .ant-pagination-item-active { + background: var(--ant-primary-color); + border: none; + + & > a { + color: #FFF; + } + } + .ant-pagination-options { .ant-select { font-size: 12px; From cc3a671f7c4aa1248eb5f84177668458c2bf0fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 1 Jun 2023 13:36:29 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/standingbookTable/index.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/standingbookTable/index.tsx b/src/pages/standingbookTable/index.tsx index 595872b..56275fb 100644 --- a/src/pages/standingbookTable/index.tsx +++ b/src/pages/standingbookTable/index.tsx @@ -106,6 +106,7 @@ const StandingbookTable: FC = (props) => { }; const rowSelection = { selectedRowKeys: selected, + columnWidth: 80, onChange: (selectedRowKeys: Array) => { setSelected(selectedRowKeys); window.parent.postMessage( @@ -136,9 +137,9 @@ const StandingbookTable: FC = (props) => { { _.isEmpty(sumRow) ? : - _.map(columns, (item, index) => { + _.map([{}, ...columns], (item, index) => { if (index === 0) { - return 总计; } return From f9723da384574ce63092b99c3c03b7d553831f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 8 Jun 2023 14:55:22 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/reportTable/index.tsx | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx index 3559119..fd3859c 100644 --- a/src/pages/reportTable/index.tsx +++ b/src/pages/reportTable/index.tsx @@ -1,5 +1,5 @@ import React, { FC, useEffect, useState } from "react"; -import { Table, Typography } from "antd"; +import { Button, Table, Typography } from "antd"; import { exceptStr } from "@/utils/common"; import styles from "@/pages/atdTable/components/index.less"; @@ -22,9 +22,29 @@ const ReportTable: FC = (props) => { if (!_.isEmpty(data)) { const { columns, dataSource, countResult, showSum } = data; setDataSource(dataSource); - setColumns(columns); setShowSumrow(showSum); setSumRow(countResult); + setColumns(_.map(columns, item => { + return { + ...item, + children: _.map(item.children, child => { + return { + ...child, + render: (text: string, record: any) => { + return ; + } + }; + }) + }; + })); } }; return
Date: Mon, 19 Jun 2023 13:57:09 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4eae9e3..0824865 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "@types/react": "^17.0.2", "@types/react-dom": "^17.0.2", "@umijs/plugin-access": "2.4.2", - "umi-plugin-authorize": "^2.8.12", "@umijs/plugin-dva": "^0.13.0", "@umijs/plugin-initial-state": "^2.4.0", "@umijs/plugin-locale": "^0.15.0", @@ -70,6 +69,7 @@ "prettier": "^2.2.0", "typescript": "^4.3.5", "umi": "^3.5.20", + "umi-plugin-authorize": "^2.8.12", "yorkie": "^2.0.0" } } From 81c648f5ab126383a39dff1e42617ed2b569124c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 20 Jun 2023 16:47:34 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/payrollFilesTable/index.tsx | 9 +++++---- src/utils/common.js | 13 +++++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/pages/payrollFilesTable/index.tsx b/src/pages/payrollFilesTable/index.tsx index d47ac2c..dd02c76 100644 --- a/src/pages/payrollFilesTable/index.tsx +++ b/src/pages/payrollFilesTable/index.tsx @@ -1,7 +1,7 @@ import React, { FC, useEffect, useState } from "react"; import { Button, Dropdown, Menu, Space, Spin, Table, Typography } from "antd"; import { DownOutlined } from "@ant-design/icons"; -import { exceptStr, paginationFun } from "@/utils/common"; +import { convertColumns, exceptStr, paginationFun } from "@/utils/common"; import styles from "@/pages/atdTable/components/index.less"; import { defaultPage, IPage } from "@/common/types"; import cs from "classnames"; @@ -158,7 +158,7 @@ const payrollFilesTable: FC = (props) => { } }; } - return { ...item }; + return _.omitBy({ ...item }, item => !item); })); setShowSumrow(showSum); setSumRow(_.isEmpty(countResult) ? { [new Date().getTime()]: new Date().getTime() } : countResult); @@ -202,13 +202,14 @@ const payrollFilesTable: FC = (props) => { ); } }; + return
{ { sumRow.loading ? : - _.map([{},...totalColumns], (item, index) => { + _.map([{}, ...totalColumns], (item, index) => { if (index === 0) { return 总计; diff --git a/src/utils/common.js b/src/utils/common.js index 13c0b0e..be7dc7c 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -49,6 +49,15 @@ export const getPicSuffix = () => { return config.get("picSuffix"); }; +/** + * 数组中某项移至数组末尾 + * @returns {array} + */ +export const convertColumns = (array, fromIndex, toIndex) => { + array.splice(toIndex, 1, array.splice(fromIndex, 1)[0]); + return array; +}; + /** * 判断是否为JSON字符串 * @returns {string} @@ -76,8 +85,8 @@ export const paginationFun = (tableListPageObj, sizeChange, onChange) => { onChange({ pageNum: page, size, - total, + total }); - }, + } }; };