From c6d02c80c4dd32d50785fe5591b5918bbe2d163f 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, 13 Mar 2023 09:18:17 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97-?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/ledgerPage/components/ledgerBaseSetting.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js index 63d31658..cfe0f90b 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js @@ -290,7 +290,7 @@ const initPeriodStr = (periodStrType, types, fromDay) => { str = `至上上月最后一天`; } else { tmpDate = moment(new Date(`${moment(tmpDate).format("YYYY-MM")}-0${fromDay}`)) - .add(is_31H ? 30 : 29, "days"); + .add(is_31H ? 30 : 27, "days"); str = `至上月${moment(tmpDate).date()}号`; } break; @@ -302,7 +302,7 @@ const initPeriodStr = (periodStrType, types, fromDay) => { str = `至上月最后一天`; } else { tmpDate = moment(new Date(`${moment(tmpDate).format("YYYY-MM")}-0${fromDay}`)) - .add(is_31 ? 30 : 29, "days"); + .add(is_31 ? 30 : 27, "days"); str = `至本月${moment(tmpDate).date()}号`; } break; @@ -314,7 +314,7 @@ const initPeriodStr = (periodStrType, types, fromDay) => { str = `至本月最后一天`; } else { tmpDate = moment(new Date(`${moment(tmpDate).format("YYYY-MM")}-0${fromDay}`)) - .add(is_31K ? 30 : 29, "days"); + .add(is_31K ? 30 : 27, "days"); str = `至下月${moment(tmpDate).date()}号`; } break; From 39d526d59e64c4f97cf0aed8a5c680390904d46a 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, 15 Mar 2023 10:18:38 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../socialSecurityBenefits/archives/accumulationFundForm.js | 2 +- .../pages/socialSecurityBenefits/archives/otherForm.js | 2 +- .../socialSecurityBenefits/archives/socialSecurityForm.js | 2 +- pc4mobx/hrmSalary/stores/payroll.js | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js index ccd3ddc5..3f2465ab 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js @@ -149,7 +149,7 @@ export default class AccumulationFundForm extends React.Component {
} items={foundItems} col={2} showGroup needTigger={false}/> { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js index f489835e..4516e770 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js @@ -129,7 +129,7 @@ export default class OtherForm extends React.Component {
} items={otherItems} col={2} showGroup needTigger={false}/> { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js index 8cc679c8..0d96be4e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js @@ -139,7 +139,7 @@ export default class SocialSecurityForm extends React.Component {
} items={socialItems} col={2} showGroup needTigger={false}/> { diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js index 6f98abe1..a68f0ae8 100644 --- a/pc4mobx/hrmSalary/stores/payroll.js +++ b/pc4mobx/hrmSalary/stores/payroll.js @@ -506,7 +506,10 @@ export class payrollStore { @action grantPayroll = (params = {}) => { return new Promise((resolve, reject) => { + message.destroy(); + message.loading("正在发放中...", 0); API.grantPayroll(params).then(res => { + message.destroy(); if (res.status) { message.success("发送成功"); resolve(); @@ -522,7 +525,10 @@ export class payrollStore { @action withdrawPayroll = (params = {}) => { return new Promise((resolve, reject) => { + message.destroy(); + message.loading("正在撤回中...", 0); API.withdrawPayroll(params).then(res => { + message.destroy(); if (res.status) { message.success("撤回成功"); resolve(); From 79ea27233f5eef2083761396f76c67224881409f 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, 15 Mar 2023 14:36:09 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E6=94=BE=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payroll/payrollGrant/index.js | 4 +++- pc4mobx/hrmSalary/stores/payroll.js | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index a90c108b..71327ee1 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -250,7 +250,7 @@ export default class PayrollGrant extends React.Component { getSearchsAdQuick() { const { payrollStore } = this.props; - const { salarySendDetailBaseInfo } = payrollStore; + const { salarySendDetailBaseInfo, btnLoading } = payrollStore; const notShowGrantOrWithdraw = salarySendDetailBaseInfo.haveBackCalc === 1 && salarySendDetailBaseInfo.salaryAcctType === "0"; const { selectedKey } = this.state; const handleMenuClick = e => { @@ -284,6 +284,7 @@ export default class PayrollGrant extends React.Component { { key: "SELECT", show: "发放所选", selected: false }, { key: "PART", show: "部分发放", selected: false } ]} + btnProps={{loading: btnLoading}} btnOnClick={this.sendPayroll} menuOnClick={(key) => this.sendPayroll(key)} />, @@ -297,6 +298,7 @@ export default class PayrollGrant extends React.Component { { key: "recallSelected", show: "撤回所选", selected: false }, { key: "partialWithdrawal", show: "部分撤回", selected: false } ]} + btnProps={{loading: btnLoading}} btnOnClick={this.withdrawalPayroll} menuOnClick={(key) => this.withdrawalPayroll(key)} />, diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js index a68f0ae8..7a31dbd4 100644 --- a/pc4mobx/hrmSalary/stores/payroll.js +++ b/pc4mobx/hrmSalary/stores/payroll.js @@ -1,5 +1,6 @@ import { action, observable, toJS } from "mobx"; import { message } from "antd"; +import { WeaLoadingGlobal } from "ecCom"; import { WeaForm, WeaTableNew } from "comsMobx"; import * as API from "../apis/payroll"; // 引入API接口文件 @@ -14,6 +15,7 @@ export class payrollStore { @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据 @observable showSearchAd = false; // 高级搜索面板显示 @observable loading = true; // 数据加载状态 + @observable btnLoading = false; // 数据加载状态 // **** 模板页面 **** @observable templateStore = new TableStore(); // 模板设置列表 @@ -508,7 +510,12 @@ export class payrollStore { return new Promise((resolve, reject) => { message.destroy(); message.loading("正在发放中...", 0); + this.btnLoading = true; + WeaLoadingGlobal.start(); API.grantPayroll(params).then(res => { + this.btnLoading = false; + WeaLoadingGlobal.end(); + WeaLoadingGlobal.destroy(); message.destroy(); if (res.status) { message.success("发送成功"); @@ -517,6 +524,10 @@ export class payrollStore { message.error(res.errormsg || "发送失败"); reject(); } + }).catch(() => { + this.btnLoading = false + WeaLoadingGlobal.end(); + WeaLoadingGlobal.destroy(); }); }); }; @@ -527,7 +538,12 @@ export class payrollStore { return new Promise((resolve, reject) => { message.destroy(); message.loading("正在撤回中...", 0); + this.btnLoading = true; + WeaLoadingGlobal.start(); API.withdrawPayroll(params).then(res => { + this.btnLoading = false; + WeaLoadingGlobal.end(); + WeaLoadingGlobal.destroy(); message.destroy(); if (res.status) { message.success("撤回成功"); @@ -536,6 +552,10 @@ export class payrollStore { message.error(res.errormsg || "撤回失败"); reject(); } + }).catch(() => { + this.btnLoading = false + WeaLoadingGlobal.end(); + WeaLoadingGlobal.destroy(); }); }); }; From 2384398ce9b13bf7349080d87e19105ac0e8ca98 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, 15 Mar 2023 17:23:08 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=E5=88=97=E8=A1=A8=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../socialSecurityBenefits/programme/customBenefitsTable.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js index 79ade76e..58b51944 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js @@ -61,6 +61,10 @@ class CustomBenefitsTable extends Component { onChange={value => this.handleCustomBenefitsSwitch(record, value)} /> ); + case "welfareType": + return {record.welfareTypeSpan}; + case "paymentScopt": + return {record.paymentScopeSpan}; default: return
; } From 6babf486e374b1698e6909e7d6be4aa666c5fb45 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, 16 Mar 2023 17:03:24 +0800 Subject: [PATCH 05/24] =?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=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=90=88=E8=AE=A1=E8=A1=8C=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/calculate.js | 11 + .../standingBookDetail/components/index.less | 4 + .../standingBookDetail/components/normal.js | 250 ++++++------------ 3 files changed, 100 insertions(+), 165 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js index 371a8763..44b57717 100644 --- a/pc4mobx/hrmSalary/apis/calculate.js +++ b/pc4mobx/hrmSalary/apis/calculate.js @@ -509,3 +509,14 @@ export const updateLockStatus = (params) => { body: JSON.stringify(params) }).then(res => res.json()); }; +// 社保福利台账合计接口 +export const siaccountDetailCommonListSum = (params) => { + return fetch("/api/bs/hrmsalary/siaccount/detail/common/list/sum", { + method: "POST", + mode: "cors", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify(params) + }).then(res => res.json()); +}; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less index 9a76c465..1373bb3d 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less @@ -12,6 +12,10 @@ .tableWrapper { flex: 1; overflow: hidden; + + .ant-spin-nested-loading, .ant-spin-container { + height: 100%; + } } .topContent { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 4ba30018..b3b61565 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -7,14 +7,14 @@ import React, { Component } from "react"; import { Button, Icon, message, Modal, Spin, Tooltip } from "antd"; import { inject, observer } from "mobx-react"; -import { toJS } from "mobx"; -import { WeaInputSearch, WeaNewScroll, WeaTable } from "ecCom"; +import { WeaInputSearch } from "ecCom"; import { calcPageNo } from "../../../../util"; import { getQueryString } from "../../../../util/url"; import ProgressModal from "../../../../components/progressModal"; import AcctResultImportModal from "../../../calculateDetail/acctResult/importModal/acctResultImportModal"; import AdjustmentSlide from "./adjustmentSlide"; -import { getCalculateProgress } from "../../../../apis/calculate"; +import { getCalculateProgress, siaccountDetailCommonListSum } from "../../../../apis/calculate"; +import { sysConfCodeRule } from "../../../../apis/ruleconfig"; import RegEditDetial from "./regEditDetial"; import SupplementarySlide from "./supplementarySlide"; import _ from "lodash"; @@ -54,7 +54,9 @@ export default class NormalIndex extends Component { title: "", editId: "", visible: false - } + }, + showSum: false, + siaccountSum: {} }; this.timer = null; this.timerDelete = null; @@ -68,36 +70,85 @@ export default class NormalIndex extends Component { selectedKey === "1" ? this.getNormalList({ billMonth, current, paymentOrganization }) : this.getSupplementaryList({ billMonth, current, paymentOrganization }); + window.addEventListener("message", this.handleReceive, false); } + handleReceive = async ({ data }) => { + const { type, payload: { id, params } = {} } = data; + if (type === "init") { + const { selectedKey } = this.props; + const { status, data: sysData } = await this.sysConfCodeRule(); + const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum(); + this.setState({ + showSum: selectedKey === "1" && status && sysData === "1", + siaccountSum + }, () => this.postMessageToChild()); + } else if (type === "turn") { + if (id === "PAGEINFO") { + const { pageNum: current, size: pageSize } = params; + this.setState({ current, pageSize }, () => { + const { billMonth, paymentOrganization, selectedKey } = this.props; + const { current, pageSize } = this.state; + selectedKey === "1" ? + this.getNormalList({ + billMonth, current, pageSize, paymentOrganization + }) : + this.getSupplementaryList({ + billMonth, current, pageSize, paymentOrganization + }); + }); + } else if (id === "ROWSELECT") { + const { selectedRowKeys } = params; + this.setState({ selectedRowKeys }); + } else if (id === "EDIT") { + this.handleEditNormalStandingBook(params); + } + } + }; + sysConfCodeRule = () => { + return sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" }); + }; + siaccountDetailCommonListSum = () => { + const { billMonth, paymentOrganization } = this.props; + return siaccountDetailCommonListSum({ billMonth, paymentOrganization }); + }; + componentWillUnmount() { - // 清除轮询 if (this.timer) { clearInterval(this.timer); } if (this.timerDelete) { clearInterval(this.timerDelete); } + window.removeEventListener("message", this.handleReceive, false); } componentWillReceiveProps(nextProps) { if (nextProps.selectedKey != this.props.selectedKey) { const { billMonth, paymentOrganization } = nextProps; this.setState({ - current: 1 + current: 1, selectedRowKeys: [] }, () => { const { current } = this.state; nextProps.selectedKey === "1" ? this.getNormalList({ billMonth, current, paymentOrganization }) - : this.getSupplementaryList({ - billMonth, - current, - paymentOrganization - }); + : this.getSupplementaryList({ billMonth, current, paymentOrganization }); }); } } + postMessageToChild = () => { + const childFrameObj = document.getElementById("atdTable"); + const { current, pageSize, tableData, selectedRowKeys, showSum, siaccountSum } = this.state; + const { list: dataSource, total, columns } = tableData; + const pageInfo = { current, pageSize, total }; + childFrameObj.contentWindow.postMessage(JSON.stringify({ + dataSource, columns, pageInfo, + selectedRowKeys, showSum, siaccountSum, + showOperates: !getQueryString("type") + }), "*"); + }; + handleSearch(value) { const { billMonth, selectedKey, paymentOrganization } = this.props; const { current } = this.state; @@ -190,77 +241,30 @@ export default class NormalIndex extends Component { }); } }; - - getNormalList = (payload = {}) => { + getNormalList = async (payload = {}) => { + const { status, data: sysData } = await this.sysConfCodeRule(); + const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum(); const { getNormalList } = this.props.standingBookStore; getNormalList({ ...payload }).then(({ list, columns = [], total }) => { - columns = _.map(_.filter(columns, it => it.dataIndex !== "id"), it => { - if (it.dataIndex === "employeeId") { - it = { - ...it, - width: 150, - fixed: "left", - render: (text, r) => { - const { userName, employeeId } = r; - return ( - - {userName} - - ); - } - }; - it.title = "姓名"; - } - return { - ...it, - title: , - width: 150 - }; - }); this.setState({ - tableData: { - list, - columns, - total - } - }); + showSum: this.props.selectedKey === "1" && status && sysData === "1", + siaccountSum, + tableData: { list, total, columns } + }, () => this.postMessageToChild()); }); }; - getSupplementaryList = (payload = {}) => { + getSupplementaryList = async (payload = {}) => { + const { status, data: sysData } = await this.sysConfCodeRule(); + const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum(); const { getSupplementaryList } = this.props.standingBookStore; getSupplementaryList({ ...payload }).then(({ list, columns = [], total }) => { - columns = _.map(_.filter(columns, it => it.dataIndex !== "id"), it => { - if (it.dataIndex === "employeeId") { - it = { - ...it, - width: 150, - fixed: "left", - render: (text, r) => { - const { userName, employeeId } = r; - return ( - - {userName} - - ); - } - }; - it.title = "姓名"; - } - return { - ...it, - title: , - width: 150 - }; - }); this.setState({ - tableData: { - list, - columns, - total - } - }); + showSum: this.props.selectedKey === "1" && status && sysData === "1", + siaccountSum, + tableData: { list, columns, total } + }, () => this.postMessageToChild()); }); }; onSelectChange = selectedRowKeys => { @@ -355,7 +359,6 @@ export default class NormalIndex extends Component { }); }; - // 核算按钮点击 handleCommonAccountClick() { const { billMonth, selectedKey, paymentOrganization } = this.props; const { commonAccount } = this.props.standingBookStore; @@ -426,7 +429,6 @@ export default class NormalIndex extends Component { .origin}${urlObj[selectedKey]}?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`; window.open(url, "_self"); }; - handleEditNormalStandingBook = (record) => { const { userName, id: editId } = record; const { returnEditPersonSlide } = this.state; @@ -459,85 +461,8 @@ export default class NormalIndex extends Component { render() { const { remarks, billMonth, selectedKey, paymentOrganization, standingBookStore } = this.props; - const { selectedRowKeys, addProps, adjustSlide, importParams, returnEditPersonSlide } = this.state; + const { addProps, adjustSlide, importParams, returnEditPersonSlide } = this.state; const { loading } = standingBookStore; - let { list, columns, total } = this.state.tableData; - const rowSelection = { - selectedRowKeys, - onChange: this.onSelectChange - }; - const pagination = { - total, - current: this.state.current, - showTotal: total => `共 ${total} 条`, - showSizeChanger: true, - showQuickJumper: true, - pageSizeOptions: ["10", "20", "50", "100"], - onShowSizeChange: (current, pageSize) => { - this.setState({ current, pageSize }); - selectedKey === "1" - ? this.getNormalList({ billMonth, current, pageSize, paymentOrganization }) - : this.getSupplementaryList({ - billMonth, - current, - pageSize, - paymentOrganization - }); - }, - onChange: current => { - this.setState({ current }); - selectedKey === "1" - ? this.getNormalList({ - billMonth, current, - pageSize: this.state.pageSize, paymentOrganization - }) - : this.getSupplementaryList({ - billMonth, - current, - pageSize: this.state.pageSize, - paymentOrganization - }); - } - }; - columns = _.map(toJS(columns), item => { - if (item.dataIndex === "employeeId") { - return { ...item }; - } else if (item.dataIndex === "costCenter") { - return { - ...item, - render: (text, record) => { - const { costCenter } = record; - return {costCenter.name || ""}; - } - }; - } - return { - ...item, - render: (text) => { - return {text}; - } - }; - }); - !getQueryString("type") && (columns = [ - ...columns, - { - title: "操作", - dataIndex: "operate", - fixed: "right", - width: "120px", - render: (text, record) => { - return ( - - ); - } - } - ]); return (
{ @@ -683,19 +608,14 @@ export default class NormalIndex extends Component {
{/* table */}
- - - - - + +