+
@@ -115,16 +126,16 @@ const GlobalHeaderRight: React.FC<{}> = (props) => {
-
-
+
{data?.fullName}
-
-
history.push('/Dashboard')}/>
+ history.push('/Dashboard')}/>
- -
-
toLogout()}/>
+ -
+ toLogout()}/>
{/* = ({providerId, visible
}
pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/Agency/AgencyManager/components/SelectProvider.tsx b/src/pages/Agency/AgencyManager/components/SelectProvider.tsx
index 8a300af..d0ca5ae 100644
--- a/src/pages/Agency/AgencyManager/components/SelectProvider.tsx
+++ b/src/pages/Agency/AgencyManager/components/SelectProvider.tsx
@@ -5,6 +5,7 @@ import { getProviderToAgencyPage } from '../service';
// import './styles.less';
import { getDicData } from '@/utils/session';
import TextArea from 'antd/lib/input/TextArea';
+import tableProps from '@/utils/tableProps';
interface SelectProviderProps {
onSelect?: (record: any) => void;
@@ -125,8 +126,7 @@ const SelectProvider: React.FC = ({ onSelect, visible = fal
}
pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/Agency/AgencyManager/index.tsx b/src/pages/Agency/AgencyManager/index.tsx
index 0f738fa..7c7e939 100644
--- a/src/pages/Agency/AgencyManager/index.tsx
+++ b/src/pages/Agency/AgencyManager/index.tsx
@@ -18,6 +18,7 @@ import weekday from 'dayjs/plugin/weekday'
import weekOfYear from 'dayjs/plugin/weekOfYear'
import weekYear from 'dayjs/plugin/weekYear'
import EntrustedProject from './components/EntrustedProject';
+import tableProps from '@/utils/tableProps';
dayjs.extend(customParseFormat)
dayjs.extend(advancedFormat)
@@ -428,8 +429,7 @@ marginBottom: '1.5rem'
]
}
pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/Archive/ProjectArchive/components/SecondProTable.tsx b/src/pages/Archive/ProjectArchive/components/SecondProTable.tsx
index 91a507f..618299c 100644
--- a/src/pages/Archive/ProjectArchive/components/SecondProTable.tsx
+++ b/src/pages/Archive/ProjectArchive/components/SecondProTable.tsx
@@ -7,6 +7,7 @@ import { getSecondFileList, selectParam2, updateSecondFile } from '../service';
import { handleDelete, handleUpdate } from '../utils';
import CreateDocument from './CreateDocument';
import Details from './Details';
+import tableProps from '@/utils/tableProps';
interface SecondProTableProps {
//一级列表数据
@@ -182,7 +183,7 @@ const SecondProTable: React.FC = (props) => {
};
})
}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, hideOnSinglePage: true, }}
+ {...tableProps}
/>
= () => {
//一级标段目录行数据
const [firstDataRecord, setFirstDataRecord] = useState();
@@ -209,13 +210,7 @@ const ProjectArchive: React.FC<{}> = () => {
},
},
}}
- pagination={{
- showQuickJumper: true,
- showSizeChanger: false,
- defaultPageSize: 10,
- size: 'small',
- hideOnSinglePage: true
- }}
+ {...tableProps}
actionRef={firstActionRef}
params={{ projectId: getProId() }}
request={async (params) =>
diff --git a/src/pages/Auction/Auction/components/AuctionProjectBidding.tsx b/src/pages/Auction/Auction/components/AuctionProjectBidding.tsx
index 53f86cd..9b44a34 100644
--- a/src/pages/Auction/Auction/components/AuctionProjectBidding.tsx
+++ b/src/pages/Auction/Auction/components/AuctionProjectBidding.tsx
@@ -20,6 +20,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import React, {useEffect, useRef, useState} from "react";
import {annoAuction} from '../service'
import { queryingPagingData } from '@/utils/PageUtils';
+import tableProps from '@/utils/tableProps';
@@ -125,7 +126,7 @@ useEffect(() => {
dataSource={dataSource}
//request={params => queryingPagingData('/v1/innerShot/annoAuction/'+auctionId, 'get', params)}
rowKey="id"
- pagination={{defaultPageSize:10}}
+ {...tableProps}
options={false}
size="small"
toolBarRender={false}
diff --git a/src/pages/Auction/AuctionAnnouncementData/components/AuctionAnnouncementData.tsx b/src/pages/Auction/AuctionAnnouncementData/components/AuctionAnnouncementData.tsx
index 745474b..9486ebe 100644
--- a/src/pages/Auction/AuctionAnnouncementData/components/AuctionAnnouncementData.tsx
+++ b/src/pages/Auction/AuctionAnnouncementData/components/AuctionAnnouncementData.tsx
@@ -16,7 +16,7 @@ import {
Upload, Table, Select
} from "antd"
import { Link, history } from 'umi';
-import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+
import React, { useEffect, useRef, useState } from "react"
import style from './style.less'
import moment from "moment";
diff --git a/src/pages/Auction/AuctionInfoupdateManage/components/AuctionInfoupdateManage.tsx b/src/pages/Auction/AuctionInfoupdateManage/components/AuctionInfoupdateManage.tsx
index eb79cdc..347b00d 100644
--- a/src/pages/Auction/AuctionInfoupdateManage/components/AuctionInfoupdateManage.tsx
+++ b/src/pages/Auction/AuctionInfoupdateManage/components/AuctionInfoupdateManage.tsx
@@ -15,7 +15,7 @@ import {
Spin,
Upload
} from "antd"
-import ProTable, { ActionType } from '@ant-design/pro-table';
+
import React, {useEffect, useRef, useState} from "react"
import style from './style.less'
import { fabuById,addNotice,getPageInfo} from '../service'
diff --git a/src/pages/Auction/AuctionList/components/AuctionInfoupdateManage.tsx b/src/pages/Auction/AuctionList/components/AuctionInfoupdateManage.tsx
index d823f22..c5048e6 100644
--- a/src/pages/Auction/AuctionList/components/AuctionInfoupdateManage.tsx
+++ b/src/pages/Auction/AuctionList/components/AuctionInfoupdateManage.tsx
@@ -15,7 +15,7 @@ import {
Spin,
Upload
} from "antd"
-import ProTable, { ActionType } from '@ant-design/pro-table';
+
import React, {useEffect, useRef, useState} from "react"
import style from './style.less'
import { fabuById,addNotice,getPageInfo} from '../service'
diff --git a/src/pages/Auction/AuctionList/components/AuctionList.tsx b/src/pages/Auction/AuctionList/components/AuctionList.tsx
index 0a11555..9b12d94 100644
--- a/src/pages/Auction/AuctionList/components/AuctionList.tsx
+++ b/src/pages/Auction/AuctionList/components/AuctionList.tsx
@@ -9,6 +9,7 @@ import { getProId } from '@/utils/session';
import { commonMessage } from '@/utils/MessageUtils';
import moment from 'moment';
import { btnAuthority } from '@/utils/authority';
+import tableProps from '@/utils/tableProps';
const AuctionList: React.FC<{}> = () => {
const projectId = getProId();
//操作数据后刷新列表
@@ -192,6 +193,7 @@ const AuctionList: React.FC<{}> = () => {
options={false}
search={false}
rowKey="id"
+ {...tableProps}
/>
= () => {
});
})
}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
toolBarRender={false}
/>
diff --git a/src/pages/Auction/AuctionManage/components/AuctionInfoManage.tsx b/src/pages/Auction/AuctionManage/components/AuctionInfoManage.tsx
index 0106c1b..49c6013 100644
--- a/src/pages/Auction/AuctionManage/components/AuctionInfoManage.tsx
+++ b/src/pages/Auction/AuctionManage/components/AuctionInfoManage.tsx
@@ -16,7 +16,7 @@ import {
Upload, Table
} from "antd"
import { Link, history } from 'umi';
-import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+
import React, { useEffect, useRef, useState } from "react"
import style from './style.less'
import { getPage } from '../service'
diff --git a/src/pages/Auction/AuctionManage/components/filesDownComponents.tsx b/src/pages/Auction/AuctionManage/components/filesDownComponents.tsx
index 4c76ccd..d8377c0 100644
--- a/src/pages/Auction/AuctionManage/components/filesDownComponents.tsx
+++ b/src/pages/Auction/AuctionManage/components/filesDownComponents.tsx
@@ -25,7 +25,7 @@ import request from '@/utils/request';
import FileDown from '@/utils/Download';
import {existingProblem} from "@/pages/Evaluation/expert/ReviewResults/Jury/service";
import {commonMessage} from "@/utils/MessageUtils";
-
+import tableProps from '@/utils/tableProps';
interface filesDownComponents {
modalVisible: boolean;
@@ -257,7 +257,7 @@ const checkRelationRef = useRef();
columns={columns}
request={params => DownLordList(pkId,params)}
rowKey="id"
-
+ {...tableProps}
/>
diff --git a/src/pages/Auction/AuctionManagerProject/components/AuctionManagerProject.tsx b/src/pages/Auction/AuctionManagerProject/components/AuctionManagerProject.tsx
index 3039381..9fa25da 100644
--- a/src/pages/Auction/AuctionManagerProject/components/AuctionManagerProject.tsx
+++ b/src/pages/Auction/AuctionManagerProject/components/AuctionManagerProject.tsx
@@ -7,6 +7,7 @@ import { auctionFollowUpAProjectManager, getDicData, getSessionUserData } from '
import { getUrlParam, getUrlRelativePath, isEmpty, proTableValueEnum } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
import { createHiddenForm } from '@/utils/CustomerService' //智慧客服
+import tableProps from '@/utils/tableProps';
const AuctionMyLookingForInnerShot: React.FC<{}> = () => {
const [form] = Form.useForm();
@@ -176,8 +177,7 @@ const AuctionMyLookingForInnerShot: React.FC<{}> = () => {
];
const pagination: any= {
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
defaultCurrent: current ? Number(current) : 1
}
diff --git a/src/pages/Auction/AuctionMyLookingForInnerShot/components/AuctionMyLookingForInnerShot.tsx b/src/pages/Auction/AuctionMyLookingForInnerShot/components/AuctionMyLookingForInnerShot.tsx
index 82ee6fb..394e8c0 100644
--- a/src/pages/Auction/AuctionMyLookingForInnerShot/components/AuctionMyLookingForInnerShot.tsx
+++ b/src/pages/Auction/AuctionMyLookingForInnerShot/components/AuctionMyLookingForInnerShot.tsx
@@ -7,6 +7,7 @@ import StopReason from "../../NoticeModal/stopReason";
import { getDicData } from '@/utils/session';
import { proTableValueEnum } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
+import tableProps from '@/utils/tableProps';
const AuctionMyLookingForInnerShot: React.FC<{}> = () => {
const [form] = Form.useForm();
@@ -178,7 +179,7 @@ const AuctionMyLookingForInnerShot: React.FC<{}> = () => {
});
})
}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
toolBarRender={false}
/>
diff --git a/src/pages/Auction/AuctionParticipantsData/components/AuctionParticipantsData.tsx b/src/pages/Auction/AuctionParticipantsData/components/AuctionParticipantsData.tsx
index 61f64a0..55745ea 100644
--- a/src/pages/Auction/AuctionParticipantsData/components/AuctionParticipantsData.tsx
+++ b/src/pages/Auction/AuctionParticipantsData/components/AuctionParticipantsData.tsx
@@ -3,6 +3,7 @@ import React from "react";
import { queryingPagingData } from '@/utils/PageUtils';
import { getProId } from '@/utils/session';
import ExtendUpload from '@/utils/ExtendUpload';
+import tableProps from '@/utils/tableProps';
const AuctionParticipantsData: React.FC = () => {
//项目id
@@ -51,7 +52,7 @@ const AuctionParticipantsData: React.FC = () => {
columns={columns}
request={params => queryingPagingData('/api/biz-service-ebtp-auction/v1/bidders/getBiddersList/getPage/' + tpId, 'post', params)}
rowKey="id"
- pagination={{ defaultPageSize: 10 }}
+ {...tableProps}
options={false}
size="small"
toolBarRender={false}
diff --git a/src/pages/Auction/AuctionParticipateDetail/components/AuctionViewAuctions.tsx b/src/pages/Auction/AuctionParticipateDetail/components/AuctionViewAuctions.tsx
index b46855b..ab0add2 100644
--- a/src/pages/Auction/AuctionParticipateDetail/components/AuctionViewAuctions.tsx
+++ b/src/pages/Auction/AuctionParticipateDetail/components/AuctionViewAuctions.tsx
@@ -20,6 +20,7 @@ import { getAuctionViewAuctions, getRedisBidData, putOrderBidPrice, updatetOnloo
import AuctionImage from '../../AuctionViewAuctions/components/AuctionImage';
import CountDownUtils from '../../AuctionViewAuctions/components/CountDownUtils';
import { insertBidders } from '../../AuctionLookingForInnerShot/service';
+import tableProps from '@/utils/tableProps';
const { TabPane } = Tabs;
const layout = {
@@ -599,7 +600,7 @@ const AuctionViewAuctions: React.FC = () => {
columns={cjColumns}
search={false}
options={false}
- pagination={{ defaultPageSize: 10 }}
+ {...tableProps}
rowKey="id"
/>
diff --git a/src/pages/Auction/AuctionProjectBidding/components/AuctionProjectBidding.tsx b/src/pages/Auction/AuctionProjectBidding/components/AuctionProjectBidding.tsx
index 2ab2d57..baadbea 100644
--- a/src/pages/Auction/AuctionProjectBidding/components/AuctionProjectBidding.tsx
+++ b/src/pages/Auction/AuctionProjectBidding/components/AuctionProjectBidding.tsx
@@ -3,6 +3,7 @@ import React, { useEffect, useState } from "react";
import { annoAuction } from '../service';
import ProTable from "@ant-design/pro-table";
import { getProId } from "@/utils/session";
+import tableProps from '@/utils/tableProps';
const AuctionProjectBidding: React.FC<{}> = () => {
@@ -105,7 +106,7 @@ const AuctionProjectBidding: React.FC<{}> = () => {
columns={columns}
dataSource={dataSource}
rowKey="id"
- pagination={{ defaultPageSize: 10 }}
+ {...tableProps}
options={false}
size="small"
search={false}
diff --git a/src/pages/Auction/AuctionResults/components/AuctionResults.tsx b/src/pages/Auction/AuctionResults/components/AuctionResults.tsx
index a074277..6b907f6 100644
--- a/src/pages/Auction/AuctionResults/components/AuctionResults.tsx
+++ b/src/pages/Auction/AuctionResults/components/AuctionResults.tsx
@@ -4,6 +4,7 @@ import React, { useEffect, useState } from "react";
import { getBidStatus, getPageListByUniqueId, launchAgainInnerShot, updateAuctionStatus, modifyProgramme, synchronizationBiddingResults } from '../service'
import { getSessionProjectData } from '@/utils/session';
import { btnAuthority } from '@/utils/authority';
+import tableProps from '@/utils/tableProps';
const AuctionResults: React.FC<{}> = () => {
const [form] = Form.useForm();
@@ -154,7 +155,7 @@ const AuctionResults: React.FC<{}> = () => {
});
})
}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
/>
@@ -195,7 +196,7 @@ const AuctionResults: React.FC<{}> = () => {
});
})
}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
/>
= (props) => {
pageSize: dataSourceNum,
current: dataSourcePage,
total: dataSourceAllNum,
- defaultPageSize: 10,
- showQuickJumper: true,
- pageSizeOptions: ['10', '20', '50'],
+ ...tableProps.pagination,
onShowSizeChange: ((current, size) => setDataSourceNum(size)),
onChange: ((page, pageSize) => setDataSourcePage(page))
}}
@@ -799,7 +798,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
options={false}
columns={ChangeNoticeListcolumns}
dataSource={ChangeNoticeListdataSource}
- pagination={{ hideOnSinglePage: true, pageSize: 50 }}
+ {...tableProps}
loading={pageloading}
/>
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingDocumentList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingDocumentList.tsx
index 604b39f..251063c 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingDocumentList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingDocumentList.tsx
@@ -15,6 +15,7 @@ import {
import { getProId, getProMethod } from "@/utils/session";
import { btnAuthority } from "@/utils/authority";
+import tableProps from "@/utils/tableProps"
interface DataItem {
@@ -244,8 +245,7 @@ const BiddingDocumentList: React.FC<{}> = (props) => {
pageSize: dataSourceNum,
current: dataSourcePage,
total: dataSourceAllNum,
- showQuickJumper: true,
- pageSizeOptions: ['10', '20', '50'],
+ ...tableProps.pagination,
onShowSizeChange: ((current, size) => setDataSourceNum(size)),
onChange: ((page, pageSize) => setDataSourcePage(page))
}}
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
index d049888..984821f 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
@@ -19,6 +19,7 @@ import {
import '@/assets/ld_style.less'
import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table"
import React, { useEffect, useRef, useState } from "react"
+import tableProps from "@/utils/tableProps"
import {
GetNoticeMsg,
@@ -963,9 +964,7 @@ const BiddingInvitation: React.FC = (props) => {
}
rowKey="bsId"
onLoad={(data: any) => { setexpandedRowKeys([data?.[0]?.bsId]) }}
- pagination={{
- showQuickJumper: true,
- }}
+ {...tableProps}
expandable={{
expandedRowKeys: expandedRowKeys,
expandedRowRender: expandedRowRender,
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
index b661cee..d3ec70c 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
@@ -22,6 +22,7 @@ import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
import { checkObjectId } from '@/utils/DownloadUtils';
import ReasonMemo from './ReasonMemo';
import ApprovalModal from '@/components/ApprovalModal';
+import tableProps from "@/utils/tableProps"
/*
* 招标公告开始
@@ -528,8 +529,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
pageSize: dataSourceNum,
current: dataSourcePage,
total: dataSourceAllNum,
- defaultPageSize: 10,
- pageSizeOptions: ['10', '20', '50'],
+ ...tableProps.pagination,
onShowSizeChange: (current, size) => setDataSourceNum(size),
onChange: (page, pageSize) => setDataSourcePage(page),
}}
diff --git a/src/pages/Bid/CostConfig/index.tsx b/src/pages/Bid/CostConfig/index.tsx
index c7aaf35..06a65a1 100644
--- a/src/pages/Bid/CostConfig/index.tsx
+++ b/src/pages/Bid/CostConfig/index.tsx
@@ -7,6 +7,7 @@ import { getPage, saveData, } from './services';
import { getProId, getProMethod } from '@/utils/session';
import { getURLInformation } from '@/utils/CommonUtils'
import { btnAuthority } from '@/utils/authority';
+import tableProps from '@/utils/tableProps';
const costConfig: React.FC<{}> = () => {
const roomType = getURLInformation('roomType');//预审1 后审2
@@ -347,7 +348,7 @@ const costConfig: React.FC<{}> = () => {
// toolBarRender={() => tools}
tableAlertRender={false}
options={false}
- pagination={{ defaultPageSize: 20, showSizeChanger: false, }}
+ {...tableProps}
/>
diff --git a/src/pages/Bid/ResponseFormat/components/EditResponseFormat/components/ItemizedTemplate/ItemizedSelectTemplate.tsx b/src/pages/Bid/ResponseFormat/components/EditResponseFormat/components/ItemizedTemplate/ItemizedSelectTemplate.tsx
index fdc27d0..da25bd3 100644
--- a/src/pages/Bid/ResponseFormat/components/EditResponseFormat/components/ItemizedTemplate/ItemizedSelectTemplate.tsx
+++ b/src/pages/Bid/ResponseFormat/components/EditResponseFormat/components/ItemizedTemplate/ItemizedSelectTemplate.tsx
@@ -4,6 +4,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { comfirmItemizedSeleTemplate, deleteItemizedTemplate, getItemizedTemplateData } from '../../../../service';
import { getDefId } from '@/utils/session';
import { getURLInformation } from '@/utils/CommonUtils';
+import tableProps from '@/utils/tableProps';
interface ItemizedSelectTemplateProps {
modalVisible: boolean;
@@ -160,7 +161,7 @@ const ItemizedSelectTemplate: React.FC = (props) =>
})
}}
columns={columns}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}
+ {...tableProps}
/>
diff --git a/src/pages/Bid/ResponseFormat/components/EditResponseFormat/components/SelectTemplate.tsx b/src/pages/Bid/ResponseFormat/components/EditResponseFormat/components/SelectTemplate.tsx
index 0ddc6b4..af874c5 100644
--- a/src/pages/Bid/ResponseFormat/components/EditResponseFormat/components/SelectTemplate.tsx
+++ b/src/pages/Bid/ResponseFormat/components/EditResponseFormat/components/SelectTemplate.tsx
@@ -4,6 +4,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { comfirmSeleTemplate, deleteTemplate, getTemplateData } from '../../../service';
import { getURLInformation } from '@/utils/CommonUtils';
import { getDefId } from '@/utils/session';
+import tableProps from '@/utils/tableProps';
interface SelectTemplateProps {
modalVisible: boolean;
@@ -162,7 +163,7 @@ const SelectTemplate: React.FC = (props) => {
})
}}
columns={columns}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}
+ {...tableProps}
/>
diff --git a/src/pages/Bid/ResponseFormat/index.tsx b/src/pages/Bid/ResponseFormat/index.tsx
index 83b7d60..73cef1d 100644
--- a/src/pages/Bid/ResponseFormat/index.tsx
+++ b/src/pages/Bid/ResponseFormat/index.tsx
@@ -16,6 +16,7 @@ import {
} from './utils';
import { getURLInformation } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
+import tableProps from '@/utils/tableProps';
/**
* 应答格式列表
@@ -298,10 +299,9 @@ const ResponseFormat: React.FC<{}> = () => {
}}
onReset={() => setPage({ pageSize: 10, pageNo: 1 })}
pagination={{
- pageSize: 10,
+ ...tableProps.pagination,
onChange: (page, pageSize) => setPage({ pageSize: pageSize, pageNo: page }),
onShowSizeChange: (current, pageSize) => setPage({ pageSize: pageSize, pageNo: current }),
- showSizeChanger: false,
}}
rowKey="id"
dateFormatter="string"
diff --git a/src/pages/Bid/ReviewConfig/Config/components/detailed.tsx b/src/pages/Bid/ReviewConfig/Config/components/detailed.tsx
index 6f0ace9..7497cc4 100644
--- a/src/pages/Bid/ReviewConfig/Config/components/detailed.tsx
+++ b/src/pages/Bid/ReviewConfig/Config/components/detailed.tsx
@@ -9,6 +9,7 @@ import '@/assets/xsy_style.less'
import { getDefId, getSessionProjectData } from '@/utils/session';
import FileDown from '@/utils/Download';
import { btnAuthority } from '@/utils/authority';
+import tableProps from '@/utils/tableProps';
//新增、保存
const save = async (fields: any) => {
@@ -1623,7 +1624,7 @@ const Detailed: React.FC<{}> = () => {
options={false}
search={false}
tableAlertRender={false}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
)
@@ -1664,7 +1665,7 @@ const Detailed: React.FC<{}> = () => {
options={false}
search={false}
tableAlertRender={false}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
)
@@ -1705,7 +1706,7 @@ const Detailed: React.FC<{}> = () => {
options={false}
search={false}
tableAlertRender={false}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
)
@@ -2306,8 +2307,7 @@ const Detailed: React.FC<{}> = () => {
})
}
pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
onChange: (page, pageSize) => {
let data = pageTemData;
data.pageNo = page;
@@ -2357,7 +2357,7 @@ const Detailed: React.FC<{}> = () => {
};
return result;
})}
- pagination={{ defaultPageSize: 10 }}//默认显示条数
+ {...tableProps}
/>
= (props) => {
};
return result;
})}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
diff --git a/src/pages/Bid/ReviewConfig/Config/components/first.tsx b/src/pages/Bid/ReviewConfig/Config/components/first.tsx
index f7a5c07..7242352 100644
--- a/src/pages/Bid/ReviewConfig/Config/components/first.tsx
+++ b/src/pages/Bid/ReviewConfig/Config/components/first.tsx
@@ -7,6 +7,7 @@ import { getURLInformation } from '@/utils/CommonUtils'
import '@/assets/xsy_style.less'
import FileDown from '@/utils/Download';
import { btnAuthority } from '@/utils/authority';
+import tableProps from '@/utils/tableProps';
//保存模板
const saveT = async (fields: any) => {
@@ -946,7 +947,7 @@ const First: React.FC<{}> = () => {
options={false}
search={false}
tableAlertRender={false}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
@@ -984,7 +985,7 @@ const First: React.FC<{}> = () => {
options={false}
search={false}
tableAlertRender={false}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
)
@@ -1021,7 +1022,7 @@ const First: React.FC<{}> = () => {
options={false}
search={false}
tableAlertRender={false}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
)
@@ -1058,7 +1059,7 @@ const First: React.FC<{}> = () => {
options={false}
search={false}
tableAlertRender={false}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
)
@@ -1464,7 +1465,7 @@ const First: React.FC<{}> = () => {
};
return result;
})}
- pagination={{ defaultPageSize: 10, showSizeChanger: false, }}//默认显示条数
+ {...tableProps}
/>
= () => {
})
}
pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
onChange: (page, pageSize) => {
let data = pageTemData;
data.pageNo = page;
diff --git a/src/pages/Bid/ReviewConfig/Config/components/templeteBtns.tsx b/src/pages/Bid/ReviewConfig/Config/components/templeteBtns.tsx
index 7b2f8a9..5353337 100644
--- a/src/pages/Bid/ReviewConfig/Config/components/templeteBtns.tsx
+++ b/src/pages/Bid/ReviewConfig/Config/components/templeteBtns.tsx
@@ -2,6 +2,7 @@ import { btnAuthority } from "@/utils/authority";
import FileDown from "@/utils/Download";
import { UploadOutlined } from "@ant-design/icons";
import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import { Button, Col, Dropdown, Form, Input, Menu, message, Modal, Row, Spin, Upload } from "antd";
import React, { useRef, useState } from "react";
import { getTemPage, saveT, useT } from "./service";
@@ -246,8 +247,7 @@ const TempleteBtns: React.FC = (props) => {
})
}
pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
onChange: (page, pageSize) => {
let data = pageTemData;
data.pageNo = page;
diff --git a/src/pages/Bid/ReviewConfig/List/index.tsx b/src/pages/Bid/ReviewConfig/List/index.tsx
index 5483b5b..330b2d9 100644
--- a/src/pages/Bid/ReviewConfig/List/index.tsx
+++ b/src/pages/Bid/ReviewConfig/List/index.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useRef, useState } from 'react';
import { Modal, Button, Form, Row, Col, Checkbox, message, Radio, Popconfirm, Spin } from 'antd';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { addItem, getPage, delOne, getSections, useConfig, usePage } from './services';
import { Link } from 'umi';
import { getProId, getProMethod } from '@/utils/session';
@@ -231,7 +232,7 @@ const List: React.FC<{}> = () => {
return result;
})}
pagination={{
- defaultPageSize: 10,
+ ...tableProps.pagination,
onChange: (page, pageSize) => setPageData({ pageNo: page, pageSize: pageSize }),
}}
/>
diff --git a/src/pages/Bid/Supplier/InvitationDetails/components/InvitationDetails.tsx b/src/pages/Bid/Supplier/InvitationDetails/components/InvitationDetails.tsx
index d35f898..23c8393 100644
--- a/src/pages/Bid/Supplier/InvitationDetails/components/InvitationDetails.tsx
+++ b/src/pages/Bid/Supplier/InvitationDetails/components/InvitationDetails.tsx
@@ -1,5 +1,6 @@
import React, { useEffect, useState } from 'react';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Card, Checkbox, Form, Input, message, Modal, Spin, Tabs } from 'antd';
import { acceptInvi, annoList, getNoticeInfo } from '../service';
import '@/utils/lq.style.less';
@@ -236,7 +237,7 @@ const InvitationDetails: React.FC = () => {
columns={columns}
dataSource={tableList}
rowKey="id"
- pagination={{ defaultPageSize: 10 }}
+ {...tableProps}
options={false}
search={false}
size="small"
diff --git a/src/pages/BidEvaluation/components/JuryList.tsx b/src/pages/BidEvaluation/components/JuryList.tsx
index a58aa88..892c14b 100644
--- a/src/pages/BidEvaluation/components/JuryList.tsx
+++ b/src/pages/BidEvaluation/components/JuryList.tsx
@@ -1,6 +1,7 @@
import React, { useRef, useState } from 'react';
import { Button, Card } from 'antd';
import ProTable, { ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { ProColumns } from '@ant-design/pro-table/es';
import { getProjectTypeCode } from '@/utils/CommonUtils';
import { fetchJuryList } from '@/services/bidev';
@@ -104,7 +105,7 @@ const JuryList: React.FC<{}> = () => {
};
})
}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}
+ {...tableProps}
/>
{recordData == undefined ? null : (
= (props) => {
columns={columnsGys}
dataSource={gysData}
pagination={{
- defaultPageSize: 10,
+ ...tableProps.pagination,
total: pageData.total,
- showSizeChanger: false,
onChange: (page, pageSize) => pageDataSet({ ...pageData, pageNum: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ ...pageData, pageNum: current, pageSize: size }),
}}
@@ -328,10 +328,7 @@ const SimpleUpload: React.FC<{}> = (props) => {
data: msg.data?.records, success: msg?.success, total: msg?.data.total,
}
}}
- pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
- }}
+ {...tableProps}
/>
diff --git a/src/pages/BidEvaluation/manager.js b/src/pages/BidEvaluation/manager.js
index b32c064..15f38bd 100644
--- a/src/pages/BidEvaluation/manager.js
+++ b/src/pages/BidEvaluation/manager.js
@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
import { Divider, Button, Form, Card, Tabs, Table, Tooltip, Input, Select, Row, Col, message, Modal, Popconfirm, Tag, InputNumber } from 'antd';
import { history } from 'umi';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getDictBidMethodDict, getProMethod, getRoomId, getDefId, getQuotationMethodById } from '@/utils/session';
import { saveLeaderId, getJuryData, checkOpenBidSupplier, getPackageList, createReviewRoom, closingReviewRoom } from './components/service';
import './index.less';
@@ -436,9 +437,7 @@ class manager extends PureComponent {
const pagination = {
current: pageNo,
total: managerList && managerList.total,
- showSizeChanger: false,
- // showQuickJumper: true,
- defaultPageSize: 10,
+ ...tableProps.pagination,
// showTotal: (total,range) => `共 ${total} 条记录，第${range.slice(',')[0]}-${range.slice(',')[1]}条`,
onChange: (page, pageSize) => {
this.setState({
diff --git a/src/pages/Calibration/BidAssessmentResults/components/currentTable.tsx b/src/pages/Calibration/BidAssessmentResults/components/currentTable.tsx
index 8c40e3a..3c116b7 100644
--- a/src/pages/Calibration/BidAssessmentResults/components/currentTable.tsx
+++ b/src/pages/Calibration/BidAssessmentResults/components/currentTable.tsx
@@ -1,5 +1,6 @@
import React, { useState } from "react";
import ProTable, { ProColumns } from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import { Collapse, Modal } from "antd";
import { getBidAssessmentResultList } from "@/pages/Calibration/BidAssessmentResults/service";
@@ -93,9 +94,7 @@ const currentTable: React.FC = (props) => {
}
}
}
-
- // dataSource={[]}
- // pagination={{pageSize: 50}} scroll={{y: 240}}
+ {...tableProps}
loading={pageloading}
/>
diff --git a/src/pages/Calibration/BidAssessmentResults/index.tsx b/src/pages/Calibration/BidAssessmentResults/index.tsx
index 3027407..00f2b7a 100644
--- a/src/pages/Calibration/BidAssessmentResults/index.tsx
+++ b/src/pages/Calibration/BidAssessmentResults/index.tsx
@@ -16,6 +16,7 @@ import {
Checkbox
} from "antd";
import ProTable from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import { getBidAssessmentResultList, getBidAssessmentResultsList, pushBidAssessmentResult, saveResult ,saveReviewResultDetail} from "./service"
import CurrentTable from "./components/currentTable"
import { getDefId, getProId, getProMethod } from "@/utils/session";
@@ -568,10 +569,7 @@ const BidAssessmentResults: React.FC<{}> = (props) => {
}}>保存
]}
- pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
- }}
+ {...tableProps}
/>
)
}}
diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx
index 65f1f31..205b664 100644
--- a/src/pages/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/Calibration/BidPublicityResult/index.tsx
@@ -1,5 +1,6 @@
import { UnorderedListOutlined } from "@ant-design/icons"
import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table"
+import tableProps from '@/utils/tableProps';
import { Button, Card, Divider, Drawer, message, Modal, Popconfirm, Spin, Table } from "antd"
import React, { useEffect, useRef, useState } from "react"
import {
@@ -470,7 +471,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
pageSize: dataSourceNum,
current: dataSourcePage,
total: dataSourceAllNum,
- pageSizeOptions: ['10', '20', '50'],
+ ...tableProps.pagination,
onShowSizeChange: ((current, size) => setDataSourceNum(size)),
onChange: ((page, pageSize) => setDataSourcePage(page))
}}
diff --git a/src/pages/Calibration/BidReceiveCalibrationResult/index.tsx b/src/pages/Calibration/BidReceiveCalibrationResult/index.tsx
index 0581b91..9384156 100644
--- a/src/pages/Calibration/BidReceiveCalibrationResult/index.tsx
+++ b/src/pages/Calibration/BidReceiveCalibrationResult/index.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react';
import { Button, Card, Collapse, Input, List, message, Modal, Space, Spin } from "antd";
import ProTable from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import { getBidAssessmentResultsList } from "./service"
import { getDefId, getProId, getProMethod } from "@/utils/session";
import { isEmpty } from '@/utils/CommonUtils';
@@ -231,8 +232,7 @@ const BidReceiveCalibrationResult: React.FC<{}> = (props) => {
}}
pagination={{
- showSizeChanger: false,
- defaultPageSize: 10,
+ ...tableProps.pagination,
}}
/>
diff --git a/src/pages/Calibration/ProjectManager/ResultNotice/components/FinisCalibrationListModal.tsx b/src/pages/Calibration/ProjectManager/ResultNotice/components/FinisCalibrationListModal.tsx
index a75372c..5069570 100644
--- a/src/pages/Calibration/ProjectManager/ResultNotice/components/FinisCalibrationListModal.tsx
+++ b/src/pages/Calibration/ProjectManager/ResultNotice/components/FinisCalibrationListModal.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react';
import { Modal, Spin } from 'antd';
import ProTable from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import { getDefId, getProMethod } from "@/utils/session";
@@ -117,6 +118,7 @@ const FinisCalibrationListModal: React.FC = (props) =
selectedRowKeys: selectedRowsState,
onChange: (_, selectedRows) => setSelectedRows(_),
}}
+ {...tableProps}
/>
diff --git a/src/pages/Calibration/ProjectManager/ResultNotice/components/FwftzsSendModal.tsx b/src/pages/Calibration/ProjectManager/ResultNotice/components/FwftzsSendModal.tsx
index 5ef3f86..15c9998 100644
--- a/src/pages/Calibration/ProjectManager/ResultNotice/components/FwftzsSendModal.tsx
+++ b/src/pages/Calibration/ProjectManager/ResultNotice/components/FwftzsSendModal.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react';
import { Modal, Spin } from 'antd';
import ProTable from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import { getDefId, getProMethod } from "@/utils/session";
interface FwftzsModalProps {
@@ -131,7 +132,7 @@ const FwftzsModal: React.FC = (props) => {
selectedRowKeys: selectedRowsState,
onChange: (_, selectedRows) => setSelectedRows(_),
}}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}
+ {...tableProps}
/>
diff --git a/src/pages/Calibration/ProjectManager/ResultNotice/components/JgtzsSendModal.tsx b/src/pages/Calibration/ProjectManager/ResultNotice/components/JgtzsSendModal.tsx
index f807488..a040963 100644
--- a/src/pages/Calibration/ProjectManager/ResultNotice/components/JgtzsSendModal.tsx
+++ b/src/pages/Calibration/ProjectManager/ResultNotice/components/JgtzsSendModal.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
import { Modal, Spin } from 'antd';
import { getDefId, getProMethod } from "@/utils/session";
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
interface JgtzsModalProps {
@@ -137,7 +138,7 @@ const JgtzsModal: React.FC = (props) => {
defaultChecked:true,
}),*/
}}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}
+ {...tableProps}
/>
diff --git a/src/pages/Calibration/ProjectManager/ResultNotice/components/ReasultTable.tsx b/src/pages/Calibration/ProjectManager/ResultNotice/components/ReasultTable.tsx
index 91e9edc..455e0e6 100644
--- a/src/pages/Calibration/ProjectManager/ResultNotice/components/ReasultTable.tsx
+++ b/src/pages/Calibration/ProjectManager/ResultNotice/components/ReasultTable.tsx
@@ -13,6 +13,7 @@ import {
import { isEmpty } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getProMethod } from '@/utils/session';
import JgtzsModal from './JgtzsModal';
import FwftzsModal from './FwftzsModal';
@@ -277,7 +278,7 @@ const Index: React.FC = (props) => {
> 发送服务费通知书
]}
- pagination={{ defaultPageSize: 10 }}
+ {...tableProps}
/>
{jgtzsValues ? (
= (props) => {
})
}
size="small"
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}
+ {...tableProps}
/>
{previewJgtzsFormVisible ?
= (props) => {
)
}
size="small"
- pagination={{defaultPageSize: 10,showSizeChanger: false}}
+ {...tableProps}
/>
{previewJgtzsFormVisible ? (
= () => {
})
}
rowKey="id"
- pagination={{
- pageSize: 10,
- }}
+ {...tableProps}
dateFormatter="string"
/>
= () => {
})
}
rowKey="id"
- pagination={{
- pageSize: 10,
- }}
+ {...tableProps}
dateFormatter="string"
/>
= () => {
})
}
rowKey="id"
- pagination={{
- pageSize: 10,
- }}
+ {...tableProps}
dateFormatter="string"
/>
{
columns={columns}
request={request}
rowKey="contractCode"
- pagination={{
- pageSize: 10,
- showSizeChanger: true,
- pageSizeOptions: ['10', '20', '50', '100'],
- }}
+ {...tableProps}
// 移除操作按钮
options={false}
search={false}
diff --git a/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
index 6c1227b..1c5271a 100644
--- a/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
+++ b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
@@ -1,6 +1,7 @@
import React, { useState, useRef } from 'react';
import { message, PageHeader, Button, Spin } from 'antd';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getPage, handleAlarm } from './service';
import ViewEvalAlarmUpdateModal from '../../Evaluation/BidControl/BidControlManager/components/ViewEvalAlarmUpdateModal';
import { btnAuthority } from '@/utils/authority';
@@ -180,8 +181,7 @@ const AbnormalAalarm: React.FC<{}> = () => {
})
}
pagination={{
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/ElecEvaluation/Device/index.tsx b/src/pages/ElecEvaluation/Device/index.tsx
index 816eb1e..530c2b6 100644
--- a/src/pages/ElecEvaluation/Device/index.tsx
+++ b/src/pages/ElecEvaluation/Device/index.tsx
@@ -1,6 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { Button, Spin, Tabs, Tree} from 'antd';
import ProTable, { ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { deviceList, getplaceareaList, roomList } from './service';
import '@/assets/ld_style.less';
import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
@@ -247,8 +248,7 @@ const Index: React.FC<{}> = () => {
}}
pagination={{
defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
}} //默认显示条数
toolBarRender={false}
/>
diff --git a/src/pages/ElecEvaluation/DeviceManage/index.tsx b/src/pages/ElecEvaluation/DeviceManage/index.tsx
index 2f2fc67..f87d10e 100644
--- a/src/pages/ElecEvaluation/DeviceManage/index.tsx
+++ b/src/pages/ElecEvaluation/DeviceManage/index.tsx
@@ -6,7 +6,7 @@ import '@/assets/ld_style.less';
import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
import ProCard from "@ant-design/pro-card";
import DeviceForm from './DeviceForm';
-
+import tableProps from '@/utils/tableProps';
const deviceTypeEnum = {
'resource_door': { text: '门禁设备' },
@@ -291,8 +291,7 @@ const DeviceManage: React.FC<{}> = () => {
}}
pagination={{
defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
}} //默认显示条数
toolBarRender={false}
/>
diff --git a/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx b/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
index 56a5a61..cc377d6 100644
--- a/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
+++ b/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
@@ -1,6 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { Button, message, Card } from 'antd';
import ProTable, { ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { reserveList, roomList, cancelReserve } from './service';
import '@/assets/ld_style.less';
import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
@@ -226,8 +227,7 @@ const MyReserve: React.FC<{}> = () => {
}}
pagination={{
defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
}} //默认显示条数
toolBarRender={false}
/>
diff --git a/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
index fd98438..1bd6ceb 100644
--- a/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
+++ b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
@@ -1,6 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { Button, Tabs, message, Card } from 'antd';
import ProTable, { ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { reserveList, roomList, cancelReserve } from './service';
import '@/assets/ld_style.less';
import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
@@ -337,8 +338,7 @@ const Index: React.FC<{}> = () => {
pagination={{
// defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
defaultCurrent: 1,
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
}} //默认显示条数
toolBarRender={false}
/>
@@ -408,8 +408,7 @@ const Index: React.FC<{}> = () => {
pagination={{
// defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
defaultCurrent: 1,
- defaultPageSize: 10,
- showSizeChanger: false,
+ ...tableProps.pagination,
}} //默认显示条数
toolBarRender={false}
/>
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
index 2685a6c..d527846 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
@@ -1,5 +1,6 @@
import React, { useEffect, useRef, useState } from 'react';
import ProTable, { ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getList } from './service';
import { Card, Spin } from 'antd';
import PersonReportModal from './components/PersonReportModal';
@@ -147,7 +148,7 @@ const PersonReport: React.FC<{}> = () => {
})
});
}}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
/>
{/* 报道详情Modal */}
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx
index f3c01d7..b394bef 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
import { Form, Modal, Spin, Button, Popconfirm, message, DatePicker } from 'antd';
import { getAuthorizeList, cancelAuthorize, addAuthorize } from '../service';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import moment from 'moment';
import { dateTimeFormatter } from '@/utils/DateUtils';
@@ -276,7 +277,7 @@ const AuthorizeModal: React.FC = (props) => {
search={false}
rowKey="id"
dataSource={authorizeList}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
/>
= (props) => {
setLoading(false);
})
}}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}
+ {...tableProps}
/>
diff --git a/src/pages/Invoice/Supplier/components/CommonContact.tsx b/src/pages/Invoice/Supplier/components/CommonContact.tsx
index 3777ea7..f13d59c 100644
--- a/src/pages/Invoice/Supplier/components/CommonContact.tsx
+++ b/src/pages/Invoice/Supplier/components/CommonContact.tsx
@@ -1,4 +1,5 @@
import ProTable, { ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Drawer } from 'antd';
import React from 'react';
import { CommonProps } from '../data';
@@ -48,7 +49,7 @@ const CommonContact: React.FC = (props) => {
>
await getCommonAddressList({...params,pageNo: params?.current}).then((res) => {
let data = res.data.records;
diff --git a/src/pages/Invoice/Supplier/components/CommonInvoice.tsx b/src/pages/Invoice/Supplier/components/CommonInvoice.tsx
index 465a4ea..c41c55f 100644
--- a/src/pages/Invoice/Supplier/components/CommonInvoice.tsx
+++ b/src/pages/Invoice/Supplier/components/CommonInvoice.tsx
@@ -1,4 +1,5 @@
import ProTable, { ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Drawer } from 'antd';
import React from 'react';
import { CommonProps } from '../data';
@@ -51,7 +52,7 @@ const CommonInvoice: React.FC = (props) => {
>
await getCommonInvoiceList({...params,pageNo: params?.current}).then((res) => {
let data = res.data.records;
diff --git a/src/pages/Invoice/Supplier/index.tsx b/src/pages/Invoice/Supplier/index.tsx
index 6b3cd0e..106391a 100644
--- a/src/pages/Invoice/Supplier/index.tsx
+++ b/src/pages/Invoice/Supplier/index.tsx
@@ -1,6 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { Button, Card, message } from 'antd';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { addInvoice, getList } from './service';
import EditInvoiceSupplier from './components/EditInvoiceSupplier';
import { handleUpdate } from './utils';
@@ -206,7 +207,7 @@ const InvoiceSupplier: React.FC<{}> = () => {
search={{ labelWidth: 70, span: 6 }}
onReset={() => setPage({ pageSize: 10, pageNo: 1 })}
pagination={{
- defaultPageSize: 10,
+ ...tableProps.pagination,
onChange: (page, pageSize) => setPage({ pageSize: pageSize, pageNo: page }),
onShowSizeChange: (current, pageSize) => setPage({ pageSize: pageSize, pageNo: current }),
}} //默认显示条数
diff --git a/src/pages/ListTableList/index.tsx b/src/pages/ListTableList/index.tsx
index f66fe2a..63c6b92 100644
--- a/src/pages/ListTableList/index.tsx
+++ b/src/pages/ListTableList/index.tsx
@@ -3,6 +3,7 @@ import { Button, Divider, message, Input, Drawer } from 'antd';
import React, { useState, useRef } from 'react';
import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import ProDescriptions from '@ant-design/pro-descriptions';
import CreateForm from './components/CreateForm';
import UpdateForm, { FormValueType } from './components/UpdateForm';
@@ -176,6 +177,7 @@ const TableList: React.FC<{}> = () => {
rowSelection={{
onChange: (_, selectedRows) => setSelectedRows(selectedRows),
}}
+ {...tableProps}
/>
{selectedRowsState?.length > 0 && (
= () => {
rowKey="key"
type="form"
columns={columns}
+ {...tableProps}
/>
{stepFormValues && Object.keys(stepFormValues).length ? (
diff --git a/src/pages/Login/img/bg.png b/src/pages/Login/img/bg.png
new file mode 100644
index 0000000..d771f94
Binary files /dev/null and b/src/pages/Login/img/bg.png differ
diff --git a/src/pages/Login/internal.less b/src/pages/Login/internal.less
index 5ba938b..d5b1ea0 100644
--- a/src/pages/Login/internal.less
+++ b/src/pages/Login/internal.less
@@ -1,100 +1,136 @@
-.loginContainer {
- display: flex;
- justify-content: center;
- align-items: center;
- min-height: 100vh;
- background-color: #f5f7fa;
- padding: 20px;
-}
+@bg: './img/bg.png';
-.loginCard {
- width: 100%;
- max-width: 480px;
- box-shadow: 0 4px 24px rgba(0, 0, 0, 0.1);
- border-radius: 8px;
-
- :global {
- .ant-card-body {
- padding: 40px 48px;
+.loginContainer {
+ position: relative;
+ min-height: 100vh;
+ background-image: url(@bg);
+ background-size: 100% 100%;
+ background-position: left;
+ background-repeat: no-repeat;
+
+ .loginCard {
+ width: 485px;
+ box-shadow: 0 4px 24px rgba(0, 0, 0, 0.1);
+ border-radius: 8px;
+ position: absolute;
+ top: 53%;
+ left: 59%;
+ transform: translateY(-50%);
+
+ .tabs-ink-bar {
+ position: absolute;
+ top: 154px;
+ left: 32px;
+ width: 124px;
+ height: 2px;
+ background-color: @primary-color;
+ transition: width 0.3s, left 0.3s, right 0.3s;
+ }
+ :global {
+ .ant-card-body {
+ padding: 26px 35px 34px 32px;
+ }
+ .ant-tabs {
+ .ant-tabs-nav::before {
+ border: none;
+ }
+ .ant-tabs-nav-list {
+ width: 100%;
+ gap: 22px;
+
+ .ant-tabs-tab {
+ margin: 0 !important;
+ width: 127px;
+ justify-content: center;
+ font-size: 16px;
+ line-height: 24px;
+ font-family: Roboto, sans-serif;
+ }
+ .ant-tabs-ink-bar {
+ display: none;
+ }
+ }
+ }
}
}
}
.loginTabs {
:global {
+
// 自定义标签页样式
.ant-tabs-tab {
font-size: 16px;
padding: 12px 24px;
margin: 0 8px !important;
-
+
&:hover {
color: #1890ff;
}
}
-
+
.ant-tabs-tab-active {
background-color: #1890ff;
color: #fff !important;
border-radius: 4px;
-
+
.ant-tabs-tab-btn {
color: #fff !important;
}
}
-
+
// 移除底部边框
.ant-tabs-nav::before {
border: none;
}
-
+
.ant-tabs-ink-bar {
display: none;
}
-
+
// 表单样式
.ant-form-item {
margin-bottom: 24px;
}
-
+
// 登录按钮样式
.ant-btn-primary {
height: 48px;
font-size: 16px;
border-radius: 4px;
-
+
&:hover {
background-color: #40a9ff;
border-color: #40a9ff;
}
}
-
+
// 输入框样式
.ant-input-affix-wrapper {
border-radius: 4px;
-
+
&:hover {
border-color: #40a9ff;
}
-
+
&:focus,
&-focused {
border-color: #1890ff;
box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
}
}
-
+
.ant-input {
border-radius: 4px;
-
+
&:hover {
border-color: #40a9ff;
}
-
+
&:focus {
border-color: #1890ff;
box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
}
}
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/pages/MainPage/ProjectManager/index.less b/src/pages/MainPage/ProjectManager/index.less
index 5964d3e..21bbb4a 100644
--- a/src/pages/MainPage/ProjectManager/index.less
+++ b/src/pages/MainPage/ProjectManager/index.less
@@ -2,13 +2,13 @@
.dashboard{
width:100%;
- height:calc(~"100% - 56px");
+ height:calc(~"100% - 80px");
min-width: 1090px;
min-height: 775px;
.topt{
width:100%;
height:43%;
- background:#FFFFFF;
+ background:#F0F2F5;
padding:10px 10px 10px 10px;
margin-bottom: 10px;
border-radius: 5px;
diff --git a/src/pages/Opening/ProjectManager/OpenList/index.tsx b/src/pages/Opening/ProjectManager/OpenList/index.tsx
index 5c2241b..92bac48 100644
--- a/src/pages/Opening/ProjectManager/OpenList/index.tsx
+++ b/src/pages/Opening/ProjectManager/OpenList/index.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useRef, useState, } from 'react';
import { Spin, message, Popconfirm, Button, Modal } from 'antd';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { updateState, getList, getListGys, getMan, getListStatus } from './service';
import { getProId, getSessionRoleData, getProMethod } from '@/utils/session';
import FileDown from '@/utils/Download';
@@ -252,7 +253,7 @@ const Sing: React.FC<{}> = () => {
rowSelection={false}
options={false}
pagination={{
- defaultPageSize: 10,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
total: data.total,
pageSize: pageData.pageSize,
diff --git a/src/pages/PartyMemberTopic/Management/EventMaintenance/index.tsx b/src/pages/PartyMemberTopic/Management/EventMaintenance/index.tsx
index 8bf67ed..bdcbbb8 100644
--- a/src/pages/PartyMemberTopic/Management/EventMaintenance/index.tsx
+++ b/src/pages/PartyMemberTopic/Management/EventMaintenance/index.tsx
@@ -1,6 +1,7 @@
import { PlusOutlined } from '@ant-design/icons';
import { ActionType, ProColumns } from '@ant-design/pro-table';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Card, message, Popconfirm } from 'antd';
import React, { useState } from 'react';
import { useRef } from 'react';
@@ -208,9 +209,7 @@ const EventMaintenance: React.FC<{}> = () => {
}}
rowKey="id"
options={false}
- pagination={{
- pageSize: 10,
- }}
+ {...tableProps}
search={{
defaultCollapsed: false,//默认展开
}}
diff --git a/src/pages/PartyMemberTopic/Management/OpinionCollection/index.tsx b/src/pages/PartyMemberTopic/Management/OpinionCollection/index.tsx
index 4efc959..1fc3ff6 100644
--- a/src/pages/PartyMemberTopic/Management/OpinionCollection/index.tsx
+++ b/src/pages/PartyMemberTopic/Management/OpinionCollection/index.tsx
@@ -1,6 +1,7 @@
import { UploadOutlined } from '@ant-design/icons';
import { ActionType, ProColumns } from '@ant-design/pro-table';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Card, Space, Typography } from 'antd';
import React, { useState } from 'react';
import { useRef } from 'react';
@@ -149,9 +150,7 @@ const OpinionCollection: React.FC<{}> = () => {
}}
rowKey="id"
options={false}
- pagination={{
- pageSize: 10,
- }}
+ {...tableProps}
search={{
span: 6,
defaultCollapsed: false,//默认展开
diff --git a/src/pages/Project/EntrustAssign/manager/index.tsx b/src/pages/Project/EntrustAssign/manager/index.tsx
index a0a2cbd..0ec19d9 100644
--- a/src/pages/Project/EntrustAssign/manager/index.tsx
+++ b/src/pages/Project/EntrustAssign/manager/index.tsx
@@ -1,6 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
import { message, Modal, Col, Input, Form, Row, PageHeader, TreeSelect, Button, Spin, Upload } from 'antd';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { multipleTypeTransform, proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
import { getPage, agreeEntrust, queryEntrust, recallEntrust, refuseEntrust, aginstEntrust, assignEntrust, queryTree } from './service';
import './styles.less';
@@ -561,9 +562,9 @@ const entrust: React.FC<{}> = () => {
= (props) => {
}
}
pagination={{
- defaultPageSize: 10,
+ ...tableProps.pagination,
defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
- size: "small",
- showSizeChanger: false,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/Project/ProjectManage/PackageDivided/index.tsx b/src/pages/Project/ProjectManage/PackageDivided/index.tsx
index c1c14a9..6b3ee5d 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/index.tsx
+++ b/src/pages/Project/ProjectManage/PackageDivided/index.tsx
@@ -1,5 +1,6 @@
import { queryingPagingData } from '@/utils/PageUtils';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
import { getProjectById } from '../ProjectManager/ProjectDocumentation/service';
@@ -165,7 +166,7 @@ const PackageDivided: React.FC = (props) => {
projectId: values?.id,
}}
className="common"
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}
+ {...tableProps}
//调用分页方法
request={(params) =>
queryingPagingData(
diff --git a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
index fd5f49d..7e8e450 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
@@ -5,6 +5,7 @@ import { checkObjectId } from '@/utils/DownloadUtils';
import { getProMethod } from '@/utils/session';
import { InfoCircleOutlined } from '@ant-design/icons';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Drawer, message, Modal, Popconfirm } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
import {
@@ -327,7 +328,7 @@ const MoreEvaluation: React.FC = (props) => {
}}
rowKey="id"
pagination={{
- pageSize: 10,
+ ...tableProps.pagination,
}}
dateFormatter="string"
/>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/index.tsx b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/index.tsx
index 61b9649..de14640 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/index.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/index.tsx
@@ -1,5 +1,6 @@
import React, { useEffect, useRef, useState } from 'react';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getStartReviewTime, getSectionList, getBidOpenTime } from './service';
import { changeDict } from './utils';
import MoreEvaluation from './components/MoreEvaluation';
@@ -322,8 +323,7 @@ const HomePageSectionList: React.FC<{}> = () => {
}
rowKey="id"
pagination={{
- pageSize: 10,
- showSizeChanger: false
+ ...tableProps.pagination,
}}
dateFormatter="string"
/>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ObjectionComplaint/index.tsx b/src/pages/Project/ProjectManage/ProjectManager/ObjectionComplaint/index.tsx
index a0f7cd9..b010839 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ObjectionComplaint/index.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ObjectionComplaint/index.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
import '@/utils/lq.style.less';
import { Button, Input, Form, Modal, Row, Col, Select, Card, Checkbox } from 'antd';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { queryingPagingData } from '@/utils/PageUtils';
import { replyDissent } from './service';
import { commonMessage } from '@/utils/MessageUtils';
@@ -115,12 +116,11 @@ const MentionDoubtReply: React.FC<{}> = () => {
render: (_: any, record: any) => [
String(record.dissentStatus) === '3' ?
[
- ,
+ ,
] :
[
- ,
+ ,
]
- //
]
},
];
@@ -356,7 +356,7 @@ const MentionDoubtReply: React.FC<{}> = () => {
queryingPagingData('/api/biz-service-ebtp-tender/v1/clarifydissent/dissents', 'post', params)}
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
index 5428687..7d7c60a 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
@@ -6,6 +6,7 @@ import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
import { getApprProcessList } from '@/utils/SeleApprovalProcess/service';
import { getDicData, getProId } from '@/utils/session';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Drawer, message, Popconfirm } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
import {
@@ -576,9 +577,7 @@ const ExceptionHandling: React.FC = (props) => {
}) : { data: [], success: false }
}
rowKey="id"
- pagination={{
- pageSize: 10,
- }}
+ {...tableProps}
dateFormatter="string"
/>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod7.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod7.tsx
index 10e78c0..e6ae1a3 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod7.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod7.tsx
@@ -6,6 +6,7 @@ import { Form, Input, Select } from 'antd';
import { ProcurementMethodItem, updateUtils } from '../utils';
import { getId7 } from '../service';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getDicData } from '@/utils/session';
import { getDictName, isEmpty, multipleTypeTransform, proTableValueEnum } from '@/utils/CommonUtils';
@@ -191,7 +192,7 @@ const ProjectDocumentation: React.FC
- 
+
-
- 采购平台供应商统一管理系统
- CHINA COSCO SHIPPING CORPORATION LIMITED
+
+ 中远海运集团采购信息系统
+ COSCO SHIPPING Group Procurement Information System
+
+
+ 
+
+
+ {roleData?.roleName}
+ {roleData?.roleCode}
注:
diff --git a/src/pages/Auction/AuctionViewAuctions/components/AuctionViewAuctions.tsx b/src/pages/Auction/AuctionViewAuctions/components/AuctionViewAuctions.tsx index 68ff3e2..80136d5 100644 --- a/src/pages/Auction/AuctionViewAuctions/components/AuctionViewAuctions.tsx +++ b/src/pages/Auction/AuctionViewAuctions/components/AuctionViewAuctions.tsx @@ -19,6 +19,7 @@ import { getProId, getSessionRoleData } from '@/utils/session'; import { pictureDisplayPath } from '@/utils/DownloadUtils'; import { algebraicAddition, digitalConversionAmount } from '@/utils/NumberUtils'; import { getFilelist } from '@/services/download_'; +import tableProps from '@/utils/tableProps'; const { TabPane } = Tabs; //定时器间隔时间 @@ -501,7 +502,7 @@ const AuctionViewAuctions: React.FC = () => { columns={cjColumns} search={false} options={false} - pagination={{ defaultPageSize: 10 }} + {...tableProps} rowKey="id" /> diff --git a/src/pages/Auction/Notice/components/AuctionAnnouncementData.tsx b/src/pages/Auction/Notice/components/AuctionAnnouncementData.tsx index 7053cd4..a5e11c7 100644 --- a/src/pages/Auction/Notice/components/AuctionAnnouncementData.tsx +++ b/src/pages/Auction/Notice/components/AuctionAnnouncementData.tsx @@ -16,7 +16,7 @@ import { Upload, Table, Select } from "antd" import {Link, history} from 'umi'; -import ProTable, {ActionType, ProColumns} from '@ant-design/pro-table'; + import React, {useEffect, useRef, useState} from "react" import style from './style.less' import moment from "moment"; diff --git a/src/pages/Auction/Notice/components/AuctionInfoupdateManage.tsx b/src/pages/Auction/Notice/components/AuctionInfoupdateManage.tsx index e17abe6..3f6ea2b 100644 --- a/src/pages/Auction/Notice/components/AuctionInfoupdateManage.tsx +++ b/src/pages/Auction/Notice/components/AuctionInfoupdateManage.tsx @@ -15,7 +15,7 @@ import { Spin, Upload } from "antd" -import ProTable, {ActionType} from '@ant-design/pro-table'; + import React, {useEffect, useRef, useState} from "react" import style from './style.less' import {fabuById, addNotice, getPageInfo, insertMsg} from '../service' diff --git a/src/pages/Auction/Notice/components/AuctionList.tsx b/src/pages/Auction/Notice/components/AuctionList.tsx index 6129921..2890d28 100644 --- a/src/pages/Auction/Notice/components/AuctionList.tsx +++ b/src/pages/Auction/Notice/components/AuctionList.tsx @@ -9,6 +9,7 @@ import ExtendUpload from "@/utils/ExtendUpload"; import { getURLInformation } from '@/utils/CommonUtils' import { Space, Button, Card, Divider, Drawer, message, Modal, Spin, Table } from 'antd'; import { Link, history } from 'umi'; +import tableProps from '@/utils/tableProps'; const AuctionList: React.FC<{}> = () => { //操作数据后刷新列表 @@ -240,6 +241,7 @@ const AuctionList: React.FC<{}> = () => { columns={columns} dataSource={columnsKbData} rowKey="id" + {...tableProps} />
@@ -290,7 +291,7 @@ const AuthorizeModal: React.FC = (props) => {
search={false}
rowKey="id"
dataSource={unAuthorizeList}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
/>
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
index 4e78980..88050d8 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
@@ -1,5 +1,6 @@
import React, { useEffect, useRef, useState } from 'react';
import ProTable, { ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getGroupPageList, saveSiteGroup, delSiteGroup } from '../service';
import { Button, Form, message, Spin, Popconfirm } from 'antd';
import SiteGroupModal from './SiteGroupModal';
@@ -147,7 +148,7 @@ const GroupPermission: React.FC<{}> = () => {
})
});
}}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
/>
{/* 新增及编辑Modal */}
{
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
index c81f220..b6b4d62 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
@@ -1,5 +1,6 @@
import React, { useEffect, useRef, useState } from 'react';
import ProTable, { ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getUserList, saveSiteUser, delSiteUser, getGroupList } from '../service';
import { Button, Form, message, Spin, Popconfirm } from 'antd';
import SiteUserModal from './SiteUserModal';
@@ -185,7 +186,7 @@ const UserPermission: React.FC<{}> = () => {
})
});
}}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ {...tableProps}
/>
{/* 新增及编辑银行账号Modal */}
{
diff --git a/src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx b/src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx
index e35ca8b..6be37b4 100644
--- a/src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx
+++ b/src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx
@@ -1,5 +1,6 @@
import { isNotEmpty } from '@/utils/CommonUtils';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Spin, message, Popconfirm } from 'antd';
import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
@@ -215,11 +216,7 @@ const AreasManage: React.FC<{}> = () => {
}
}
pagination={{
- defaultPageSize: 10,
- pageSizeOptions: [10, 20, 30, 50],
- defaultCurrent: 1,
- size: "small",
- showSizeChanger: true,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx b/src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx
index 528149d..2aa55b6 100644
--- a/src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx
+++ b/src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx
@@ -1,5 +1,6 @@
import { isNotEmpty } from '@/utils/CommonUtils';
import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Spin, message, Popconfirm } from 'antd';
import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
@@ -273,11 +274,7 @@ const PlaceManage: React.FC<{}> = () => {
}
}
pagination={{
- defaultPageSize: 10,
- pageSizeOptions: [10, 20, 30, 50],
- defaultCurrent: 1,
- size: "small",
- showSizeChanger: true,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
index 0c4430e..8181e6c 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
@@ -1,5 +1,6 @@
import { isNotEmpty } from '@/utils/CommonUtils';
import ProTable, { ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Spin, message } from 'antd';
import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
@@ -174,11 +175,7 @@ const OnlineSupervision: React.FC<{}> = () => {
}
}
pagination={{
- defaultPageSize: 10,
- pageSizeOptions: [10, 20, 30, 50],
- defaultCurrent: 1,
- size: "small",
- showSizeChanger: true,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
index 83c7055..a837717 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
@@ -1,5 +1,6 @@
import { isNotEmpty } from '@/utils/CommonUtils';
import ProTable, { ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Spin } from 'antd';
import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
@@ -163,11 +164,7 @@ const ReservedItems: React.FC<{}> = () => {
}
}
pagination={{
- defaultPageSize: 10,
- pageSizeOptions: [10, 20, 30, 50],
- defaultCurrent: 1,
- size: "small",
- showSizeChanger: true,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
index 7ec7f08..2f4ad26 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
@@ -1,5 +1,6 @@
import { isNotEmpty } from '@/utils/CommonUtils';
import ProTable, { ProColumns } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { Button, Spin, message, Card } from 'antd';
import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
@@ -176,11 +177,7 @@ const PostSupervision: React.FC<{}> = () => {
}
}
pagination={{
- defaultPageSize: 10,
- pageSizeOptions: [10, 20, 30, 50],
- defaultCurrent: 1,
- size: "small",
- showSizeChanger: true,
+ ...tableProps.pagination,
onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
}}
diff --git a/src/pages/Evaluation/BidAbnormal/index.tsx b/src/pages/Evaluation/BidAbnormal/index.tsx
index 3add0d6..ba7a3a8 100644
--- a/src/pages/Evaluation/BidAbnormal/index.tsx
+++ b/src/pages/Evaluation/BidAbnormal/index.tsx
@@ -2,6 +2,7 @@ import React, { useState, useRef } from 'react';
import { Space, Button, message, Modal, Form, Input, Spin } from 'antd';
import '@/assets/ld_style.less';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { getQuestion, addQuestion, dellQuestion, changeQuestion, changeResult, getExpert } from './service';
import { getRoomId, getRoomStatus } from '@/utils/session';
import { btnAuthority } from '@/utils/authority';
@@ -200,7 +201,7 @@ const Index: React.FC<{}> = () => {
});
})
}
- pagination={{ defaultPageSize: 10 }}//默认显示条数
+ {...tableProps}
toolBarRender={false}
search={false}
bordered
diff --git a/src/pages/Evaluation/BiddingDocumentsDecrypt/components/viewOfTenderDocuments.tsx b/src/pages/Evaluation/BiddingDocumentsDecrypt/components/viewOfTenderDocuments.tsx
index 19d4b93..8087177 100644
--- a/src/pages/Evaluation/BiddingDocumentsDecrypt/components/viewOfTenderDocuments.tsx
+++ b/src/pages/Evaluation/BiddingDocumentsDecrypt/components/viewOfTenderDocuments.tsx
@@ -3,6 +3,7 @@ import { Button, Card, Col, List, message, Modal, Pagination, Row, Spin, Tree }
import PDF from 'react-pdf-js'
import { getFieleTree, getFileNode } from '../service'
import ProTable from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import { DownloadOutlined } from "@ant-design/icons/lib";
import { getProMethod, getRoomId } from "@/utils/session";
import '../index.less';
@@ -334,6 +335,7 @@ const viewOfTenderDocuments: React.FC<{}> = () => {
dataSource={zipListTable}
// request={params => }
rowKey={"id"}
+ {...tableProps}
/>
: []}
{displayBox == "structure" ?
@@ -344,6 +346,7 @@ const viewOfTenderDocuments: React.FC<{}> = () => {
columns={structureColumns}
dataSource={structureData}
rowKey={() => Math.random()}
+ {...tableProps}
/>
{(structureDataMore != null && structureDataMore != "") ?
= () => {
columns={structureColumnsMore}
dataSource={structureDataMore}
rowKey={() => Math.random()}
+ {...tableProps}
/>
: ""}
diff --git a/src/pages/Evaluation/BiddingDocumentsDecrypt/components/viewOfTenderDocumentsSecond.tsx b/src/pages/Evaluation/BiddingDocumentsDecrypt/components/viewOfTenderDocumentsSecond.tsx
index 55cbf71..3e206f2 100644
--- a/src/pages/Evaluation/BiddingDocumentsDecrypt/components/viewOfTenderDocumentsSecond.tsx
+++ b/src/pages/Evaluation/BiddingDocumentsDecrypt/components/viewOfTenderDocumentsSecond.tsx
@@ -3,6 +3,7 @@ import { Button, Card, Col, List, message, Modal, Pagination, Row, Spin, Tree }
import PDF from 'react-pdf-js'
import { getDataList, getFieleTree, getFieleTree4List, getFileNode } from '../service'
import ProTable from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import { DownloadOutlined } from "@ant-design/icons/lib";
import '../index.less';
import styles from '../index.less';
@@ -355,6 +356,7 @@ const viewOfTenderDocumentsSecond: React.FC<{}> = () => {
dataSource={zipListTable}
// request={params => }
rowKey={"id"}
+ {...tableProps}
/>
: null}
{displayBox == "structure" ?
@@ -365,6 +367,7 @@ const viewOfTenderDocumentsSecond: React.FC<{}> = () => {
columns={structureColumns}
dataSource={structureData}
rowKey={Math.random().toString()}
+ {...tableProps}
/>
{(structureDataMore != null && structureDataMore != "") ?
= () => {
columns={structureColumnsMore}
dataSource={structureDataMore}
rowKey={Math.random().toString()}
+ {...tableProps}
/>
: null}
diff --git a/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx b/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
index 83d049b..1ce8c24 100644
--- a/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
+++ b/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
@@ -5,6 +5,7 @@ import ProForm, {
ProFormDateTimePicker,
} from '@ant-design/pro-form';
import ProTable from "@ant-design/pro-table";
+import tableProps from '@/utils/tableProps';
import {
AlertOutlined,
ClockCircleOutlined,
@@ -458,9 +459,7 @@ const BiddingDocumentsDecrypt: React.FC = (props)
}
]}
dataSource={item.registerInfoVOList}
- pagination={{
- defaultPageSize: 10
- }}
+ {...tableProps}
/>
)}
/>
diff --git a/src/pages/Evaluation/expert/ClarificationOfTheBid/components/ClarificationOfTheBid.tsx b/src/pages/Evaluation/expert/ClarificationOfTheBid/components/ClarificationOfTheBid.tsx
index 62bcb32..2c96e52 100644
--- a/src/pages/Evaluation/expert/ClarificationOfTheBid/components/ClarificationOfTheBid.tsx
+++ b/src/pages/Evaluation/expert/ClarificationOfTheBid/components/ClarificationOfTheBid.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
import '@/utils/lq.style.less';
import { Button, Input, Form, Modal, DatePicker, Checkbox, message, Card } from 'antd';
import ProTable from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import { datePickerDisabledDate, datePickerDisabledTime, dateTimeFormatter, echoDateTimeFormatter, saveDateTimeFormatter, showTimeDefaultValue } from '@/utils/DateUtils';
import { evaluationquestionIinsert, evaluationquestionSend, evaluationquestionUpdate, getAssessroomSuppliers } from '../service';
import { commonMessage, saveMessage } from '@/utils/MessageUtils';
@@ -420,7 +421,7 @@ const ClarificationOfTheBid: React.FC = () => {
request={params => queryingPagingData('/api/biz-service-ebtp-tender/v1/evaluationquestion/list', 'post', params)}
search={false}
options={false}
- pagination={{ defaultPageSize: 10 }}
+ {...tableProps}
toolBarRender={() => [
diff --git a/src/pages/Invoice/Manager/index.tsx b/src/pages/Invoice/Manager/index.tsx
index 1120448..4a50161 100644
--- a/src/pages/Invoice/Manager/index.tsx
+++ b/src/pages/Invoice/Manager/index.tsx
@@ -1,6 +1,7 @@
import React, { useRef, useState } from 'react';
import { Button, Popconfirm, Card, Spin } from 'antd';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
+import tableProps from '@/utils/tableProps';
import FileDown from '@/utils/Download';
import ViewInvoiceFormModal from './components/ViewInvoiceFormModal';
@@ -256,7 +257,7 @@ const Invoice: React.FC