From 9cacf05b6d718b04f3d9a80062128aa56b8ec580 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, 4 Apr 2023 17:13:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E4=BA=A7=E5=93=81-?= =?UTF-8?q?=E5=BE=80=E6=9C=9F=E7=B4=AF=E8=AE=A1=E6=83=85=E5=86=B5=EF=BC=88?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E3=80=81=E8=96=AA=E9=87=91=EF=BC=89=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E4=BA=BA=E5=85=AC=E7=A7=AF=E9=87=91=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B9=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96=E6=A8=A1?= =?UTF-8?q?=E5=9D=97bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acctResult/importModal/selectFieldModal.js | 5 ++++- pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js | 2 +- .../pages/dataAcquisition/otherDeduct/columns.js | 9 +++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js index bacbe74c..f288cc35 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js @@ -109,7 +109,10 @@ export default class SelectFieldModal extends React.Component { // 添加按钮点击回调 handleAddClick = async () => { - const { status } = await this.cacheImportField(); + //薪资核算详情页面的导入表单字段缓存功能 + if (window.location.hash.indexOf("calculateDetail") !== -1) { + const { status } = await this.cacheImportField(); + } this.props.onAdd(this.fieldData); this.props.onCancel(); }; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js index 8bc29bd1..579cb872 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js @@ -154,7 +154,7 @@ class DataTables extends Component { dataSource={dataSource} pagination={pagination} loading={loading.query} - xWidth={getColumns.length * 120} + xWidth={getColumns.length * 150} />; } } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js index cb2efd8f..6f542381 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js @@ -103,6 +103,15 @@ export const dataCollectCondition = [ labelcol: 8, value: "", viewAttr: 2 + }, + { + conditionType: "INPUT", + domkey: ["privatePension"], + fieldcol: 14, + label: "个人养老金", + labelcol: 8, + value: "", + viewAttr: 2 } ], title: "数据采集", From a336a63b73e1def79416568c30dddf6b504830bd 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, 4 Apr 2023 17:14:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E4=BA=A7=E5=93=81-?= =?UTF-8?q?=E5=BE=80=E6=9C=9F=E7=B4=AF=E8=AE=A1=E6=83=85=E5=86=B5=EF=BC=88?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E3=80=81=E8=96=AA=E9=87=91=EF=BC=89=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E4=BA=BA=E5=85=AC=E7=A7=AF=E9=87=91=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B9=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96=E6=A8=A1?= =?UTF-8?q?=E5=9D=97bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/calculate.js | 11 +++++++++++ .../standingBookDetail/components/normal.js | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js index e44dfc25..31f7bdf6 100644 --- a/pc4mobx/hrmSalary/apis/calculate.js +++ b/pc4mobx/hrmSalary/apis/calculate.js @@ -520,6 +520,17 @@ export const siaccountDetailCommonListSum = (params) => { body: JSON.stringify(params) }).then(res => res.json()); }; +// 社保福利台账补缴合计接口 +export const siaccountDetailSupplementaryListSum = (params) => { + return fetch("/api/bs/hrmsalary/siaccount/detail/supplementary/list/sum", { + method: "POST", + mode: "cors", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify(params) + }).then(res => res.json()); +}; // 导入薪资核算添加表头字段缓存 export const cacheImportField = (params) => { return fetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheImportField", { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index b3b61565..8124cd25 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -13,7 +13,7 @@ import { getQueryString } from "../../../../util/url"; import ProgressModal from "../../../../components/progressModal"; import AcctResultImportModal from "../../../calculateDetail/acctResult/importModal/acctResultImportModal"; import AdjustmentSlide from "./adjustmentSlide"; -import { getCalculateProgress, siaccountDetailCommonListSum } from "../../../../apis/calculate"; +import { getCalculateProgress, siaccountDetailCommonListSum, siaccountDetailSupplementaryListSum } from "../../../../apis/calculate"; import { sysConfCodeRule } from "../../../../apis/ruleconfig"; import RegEditDetial from "./regEditDetial"; import SupplementarySlide from "./supplementarySlide"; @@ -112,6 +112,10 @@ export default class NormalIndex extends Component { const { billMonth, paymentOrganization } = this.props; return siaccountDetailCommonListSum({ billMonth, paymentOrganization }); }; + siaccountDetailSupplementaryListSum = () => { + const { billMonth, paymentOrganization } = this.props; + return siaccountDetailSupplementaryListSum({ billMonth, paymentOrganization }); + }; componentWillUnmount() { if (this.timer) { @@ -255,7 +259,7 @@ export default class NormalIndex extends Component { }; getSupplementaryList = async (payload = {}) => { const { status, data: sysData } = await this.sysConfCodeRule(); - const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum(); + const { data: { sumRow: siaccountSum } } = await this.siaccountDetailSupplementaryListSum(); const { getSupplementaryList } = this.props.standingBookStore; getSupplementaryList({ ...payload From 444857a0d8d6033e805301b56ff4a736d2669f66 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, 6 Apr 2023 11:24:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E8=A1=A8=E6=A0=BC=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/calculate.js | 22 +++ .../standingBookDetail/components/index.less | 3 + .../standingBookDetail/components/normal.js | 16 +- .../standingBookDetail/components/regList.js | 161 ++++++++---------- .../components/regression.js | 4 +- 5 files changed, 107 insertions(+), 99 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js index 31f7bdf6..013bddee 100644 --- a/pc4mobx/hrmSalary/apis/calculate.js +++ b/pc4mobx/hrmSalary/apis/calculate.js @@ -531,6 +531,28 @@ export const siaccountDetailSupplementaryListSum = (params) => { body: JSON.stringify(params) }).then(res => res.json()); }; +// 社保福利台账退差合计接口 +export const siaccountDetailRecessionListSum = (params) => { + return fetch("/api/bs/hrmsalary/siaccount/detail/recession/list/sum", { + method: "POST", + mode: "cors", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify(params) + }).then(res => res.json()); +}; +// 社保福利台账补差合计接口 +export const siaccountDetailBalanceListSum = (params) => { + return fetch("/api/bs/hrmsalary/siaccount/detail/balance/list/sum", { + method: "POST", + mode: "cors", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify(params) + }).then(res => res.json()); +}; // 导入薪资核算添加表头字段缓存 export const cacheImportField = (params) => { return fetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheImportField", { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less index 1373bb3d..9ed9d668 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less @@ -77,6 +77,9 @@ .tableWrapper { flex: 1; overflow: hidden; + .ant-spin-nested-loading, .ant-spin-container { + height: 100%; + } } .tdEllipsis { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 8124cd25..8efddabf 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -13,7 +13,11 @@ import { getQueryString } from "../../../../util/url"; import ProgressModal from "../../../../components/progressModal"; import AcctResultImportModal from "../../../calculateDetail/acctResult/importModal/acctResultImportModal"; import AdjustmentSlide from "./adjustmentSlide"; -import { getCalculateProgress, siaccountDetailCommonListSum, siaccountDetailSupplementaryListSum } from "../../../../apis/calculate"; +import { + getCalculateProgress, + siaccountDetailCommonListSum, + siaccountDetailSupplementaryListSum +} from "../../../../apis/calculate"; import { sysConfCodeRule } from "../../../../apis/ruleconfig"; import RegEditDetial from "./regEditDetial"; import SupplementarySlide from "./supplementarySlide"; @@ -78,9 +82,11 @@ export default class NormalIndex extends Component { if (type === "init") { const { selectedKey } = this.props; const { status, data: sysData } = await this.sysConfCodeRule(); - const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum(); + const { data: { sumRow: siaccountSum } } = selectedKey === "1" ? + await this.siaccountDetailCommonListSum() : + await this.siaccountDetailSupplementaryListSum(); this.setState({ - showSum: selectedKey === "1" && status && sysData === "1", + showSum: status && sysData === "1", siaccountSum }, () => this.postMessageToChild()); } else if (type === "turn") { @@ -251,7 +257,7 @@ export default class NormalIndex extends Component { const { getNormalList } = this.props.standingBookStore; getNormalList({ ...payload }).then(({ list, columns = [], total }) => { this.setState({ - showSum: this.props.selectedKey === "1" && status && sysData === "1", + showSum: status && sysData === "1", siaccountSum, tableData: { list, total, columns } }, () => this.postMessageToChild()); @@ -265,7 +271,7 @@ export default class NormalIndex extends Component { ...payload }).then(({ list, columns = [], total }) => { this.setState({ - showSum: this.props.selectedKey === "1" && status && sysData === "1", + showSum: status && sysData === "1", siaccountSum, tableData: { list, columns, total } }, () => this.postMessageToChild()); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js index 50eea2cc..3c24e94e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js @@ -5,9 +5,11 @@ * Date: 2022/11/23 */ import React, { Component } from "react"; -import { WeaTable } from "ecCom"; +import { Spin } from "antd"; import { getQueryString } from "../../../../util/url"; import * as API from "../../../../apis/standingBook"; +import { sysConfCodeRule } from "../../../../apis/ruleconfig"; +import { siaccountDetailBalanceListSum, siaccountDetailRecessionListSum } from "../../../../apis/calculate"; import "./index.less"; const APIFox = { @@ -25,6 +27,8 @@ class RegList extends Component { loading: { query: false }, + showSum: false, + siaccountSum: {}, pageInfo: { current: 1, pageSize: 10, @@ -35,14 +39,67 @@ class RegList extends Component { componentDidMount() { this.recessionList(); + window.addEventListener("message", this.handleReceive, false); } + handleReceive = async ({ data }) => { + const { type: listType, onEdit, onChangeRowkey } = this.props; + const { type, payload: { id, params } = {} } = data; + if (type === "init") { + const { status, data: sysData } = await this.sysConfCodeRule(); + const { data: { sumRow: siaccountSum } } = listType === "regression" ? + await this.siaccountDetailRecessionListSum() : + await this.siaccountDetailBalanceListSum(); + this.setState({ + showSum: status && sysData === "1", + siaccountSum + }, () => this.postMessageToChild()); + } else if (type === "turn") { + if (id === "PAGEINFO") { + const { pageNum: current, size: pageSize } = params; + this.setState({ pageInfo: { ...this.state.pageInfo, current, pageSize } }, () => this.recessionList()); + } else if (id === "ROWSELECT") { + const { selectedRowKeys } = params; + this.setState({ selectedRowKeys }); + onChangeRowkey(selectedRowKeys); + } else if (id === "EDIT") { + onEdit(params); + } + } + }; + postMessageToChild = () => { + const childFrameObj = document.getElementById("atdTable"); + const { pageInfo, dataSource, columns, selectedRowKeys, showSum, siaccountSum } = this.state; + childFrameObj.contentWindow.postMessage(JSON.stringify({ + dataSource, columns, pageInfo, + selectedRowKeys, showSum, siaccountSum, + showOperates: !getQueryString("type") + }), "*"); + }; + sysConfCodeRule = () => { + return sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" }); + }; + siaccountDetailRecessionListSum = () => { + const billMonth = getQueryString("billMonth"); + const paymentOrganization = getQueryString("paymentOrganization"); + return siaccountDetailRecessionListSum({ billMonth, paymentOrganization }); + }; + siaccountDetailBalanceListSum = () => { + const billMonth = getQueryString("billMonth"); + const paymentOrganization = getQueryString("paymentOrganization"); + return siaccountDetailBalanceListSum({ billMonth, paymentOrganization }); + }; + componentWillReceiveProps(nextProps, nextContext) { if (nextProps.visible !== this.props.visible) { this.recessionList(); } } + componentWillUnmount() { + window.removeEventListener("message", this.handleReceive, false); + } + handleResetSelectRowKeys = (selectedRowKeys) => { this.setState({ selectedRowKeys }); }; @@ -68,105 +125,25 @@ class RegList extends Component { this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, - columns: _.map(_.filter(columns, it => it.dataIndex !== "id"), items => { - if (items.dataIndex === "employeeId") { - return { - ...items, - width: 110, - title: "姓名", - render: (text, r) => { - const { userName } = r; - return ( - {userName} - ); - } - }; - } else if (items.dataIndex === "costCenter") { - return { - ...items, - width: 110, - render: (text, r) => { - const { costCenter } = r; - return ( - {costCenter.name || ""} - ); - } - }; - } - return { - ...items, - title: , - width: 120, - render: (text) => { - return {text}; - } - }; - }) - }); + columns + }, () => this.postMessageToChild()); } }).catch(() => { this.setState({ loading: { ...loading, query: false } }); }); }; - handleChangeRow = (selectedRowKeys) => { - const { onChangeRowkey } = this.props; - this.setState({ selectedRowKeys }); - onChangeRowkey(selectedRowKeys); - }; render() { - const { loading, pageInfo, selectedRowKeys, dataSource, columns } = this.state; - const { onEdit } = this.props; - const pagination = { - ...pageInfo, - showTotal: total => `共 ${total} 条`, - showQuickJumper: true, - showSizeChanger: true, - pageSizeOptions: ["10", "20", "50", "100"], - onShowSizeChange: (current, pageSize) => { - this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => { - this.recessionList(); - }); - }, - onChange: (current) => { - this.setState({ pageInfo: { ...pageInfo, current } }, () => { - this.recessionList(); - }); - } - }; - const rowSelection = { - selectedRowKeys, - onChange: this.handleChangeRow - }; + const { loading } = this.state; return ( - { - return ( -
- onEdit(record)} - >编辑 -
- ); - } - } - ] : [...columns]} - dataSource={dataSource} - loading={loading.query} - pagination={pagination} - rowSelection={rowSelection} - scroll={{ x: 900 }} - /> + +