Merge branch '20230128-供应商多的时候加载时间相对长,需增加加载等待动效效果' into 'release_20230210'
1.28 供应商多的时候加载时间相对长,需增加加载等待动效效果 See merge request eshop/fe_service_ebtp_frontend!150
This commit is contained in:
@ -1,5 +1,5 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import { Collapse, Table, PageHeader, Empty, Card } from 'antd';
|
import { Collapse, Table, PageHeader, Empty, Card, Spin } from 'antd';
|
||||||
import { getList } from '../service';
|
import { getList } from '../service';
|
||||||
import { getProMethod, getRoomId } from '@/utils/session';
|
import { getProMethod, getRoomId } from '@/utils/session';
|
||||||
import FileDown from '@/utils/Download';
|
import FileDown from '@/utils/Download';
|
||||||
@ -15,6 +15,7 @@ interface ViewRishFormModalProps {
|
|||||||
const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
|
const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
|
||||||
|
|
||||||
const [rishList, setDataList] = useState([]);
|
const [rishList, setDataList] = useState([]);
|
||||||
|
const [loading, setLoading] = useState<boolean>(false);
|
||||||
|
|
||||||
let name1 = "投标";
|
let name1 = "投标";
|
||||||
let proDict = getProMethod();
|
let proDict = getProMethod();
|
||||||
@ -61,12 +62,15 @@ const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
|
|||||||
const getWarningList = async () => {
|
const getWarningList = async () => {
|
||||||
let roomId = getRoomId();//sessionStorage.getItem('roomId');//sessionStorage.getItem('roomId')
|
let roomId = getRoomId();//sessionStorage.getItem('roomId');//sessionStorage.getItem('roomId')
|
||||||
//ip mac
|
//ip mac
|
||||||
|
setLoading(true);
|
||||||
await getList(roomId).then((res) => {
|
await getList(roomId).then((res) => {
|
||||||
if (res.success === true) {
|
if (res.success === true) {
|
||||||
if (res.data !== null && res.data.length > 0) {
|
if (res.data !== null && res.data.length > 0) {
|
||||||
setDataList(res.data)
|
setDataList(res.data)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}).finally(() => {
|
||||||
|
setLoading(false);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,71 +84,73 @@ const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
|
|||||||
<>
|
<>
|
||||||
<Collapse onChange={callback} defaultActiveKey={props?.activeKey ? ['1'] : []}>
|
<Collapse onChange={callback} defaultActiveKey={props?.activeKey ? ['1'] : []}>
|
||||||
<Collapse.Panel header={`${name1}文件制作地址日志信息查看`} key="1">
|
<Collapse.Panel header={`${name1}文件制作地址日志信息查看`} key="1">
|
||||||
{rishList?.length == 0
|
<Spin spinning={loading}>
|
||||||
? <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
|
{rishList?.length == 0
|
||||||
: <>
|
? <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
|
||||||
<PageHeader
|
: <>
|
||||||
title={`功能主要展示客户端工具制作${name1}文件时,电脑本机IP地址和MAC地址日志信息,此信息仅供参考。`}
|
<PageHeader
|
||||||
extra={[
|
title={`功能主要展示客户端工具制作${name1}文件时,电脑本机IP地址和MAC地址日志信息,此信息仅供参考。`}
|
||||||
<FileDown
|
extra={[
|
||||||
key="downLoadFile"
|
<FileDown
|
||||||
type="xlsx"
|
key="downLoadFile"
|
||||||
apiUrl={downLoadFile()}
|
type="xlsx"
|
||||||
style={{ "float": "right" }}
|
apiUrl={downLoadFile()}
|
||||||
fileName={`${name1}文件制作地址日志信息`}
|
style={{ "float": "right" }}
|
||||||
btnName="导出Excel"
|
fileName={`${name1}文件制作地址日志信息`}
|
||||||
method="GET"
|
btnName="导出Excel"
|
||||||
form={null}
|
method="GET"
|
||||||
/>
|
form={null}
|
||||||
]}
|
/>
|
||||||
>
|
]}
|
||||||
</PageHeader>
|
>
|
||||||
|
</PageHeader>
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
(proDict == "procurement_mode_5" || proDict == "procurement_mode_6") ? rishList?.map((item: any, index: any) => {
|
(proDict == "procurement_mode_5" || proDict == "procurement_mode_6") ? rishList?.map((item: any, index: any) => {
|
||||||
return (
|
return (
|
||||||
<Collapse onChange={callback}>
|
<Collapse onChange={callback}>
|
||||||
<Collapse.Panel header={"第" + item.turnSort + "次应答"} key={item.turnSort}>
|
<Collapse.Panel header={"第" + item.turnSort + "次应答"} key={item.turnSort}>
|
||||||
<p>MAC地址相同的供应商信息如下: </p>
|
<p>MAC地址相同的供应商信息如下: </p>
|
||||||
<Table
|
<Table
|
||||||
size='small'
|
size='small'
|
||||||
columns={macColumns}//表格
|
columns={macColumns}//表格
|
||||||
dataSource={item.sameMacList}
|
dataSource={item.sameMacList}
|
||||||
pagination={false}//分页
|
pagination={false}//分页
|
||||||
></Table>
|
></Table>
|
||||||
<p style={{ color: 'red' }}>提醒:根据《关于进一步防范围标串标风险的通知》(WTZ2019110816765),如不同供应商的MAC地址相同,则可能存在围标、串标风险,请项目经理及评委给予注意!</p>
|
<p style={{ color: 'red' }}>提醒:根据《关于进一步防范围标串标风险的通知》(WTZ2019110816765),如不同供应商的MAC地址相同,则可能存在围标、串标风险,请项目经理及评委给予注意!</p>
|
||||||
<p></p>
|
<p></p>
|
||||||
<Table
|
<Table
|
||||||
size='small'
|
size='small'
|
||||||
columns={ipColumns}
|
columns={ipColumns}
|
||||||
dataSource={item.tfileWarningList}
|
dataSource={item.tfileWarningList}
|
||||||
pagination={false}//分页
|
pagination={false}//分页
|
||||||
></Table>
|
></Table>
|
||||||
</Collapse.Panel>
|
</Collapse.Panel>
|
||||||
</Collapse>
|
</Collapse>
|
||||||
);
|
);
|
||||||
}) : (
|
}) : (
|
||||||
<Card bordered={false} bodyStyle={{ padding: '16px 24px' }}>
|
<Card bordered={false} bodyStyle={{ padding: '16px 24px' }}>
|
||||||
<p>MAC地址相同的供应商信息如下: </p>
|
<p>MAC地址相同的供应商信息如下: </p>
|
||||||
<Table
|
<Table
|
||||||
size='small'
|
size='small'
|
||||||
columns={macColumns}//表格
|
columns={macColumns}//表格
|
||||||
dataSource={rishList[0].sameMacList}
|
dataSource={rishList[0].sameMacList}
|
||||||
pagination={false}//分页
|
pagination={false}//分页
|
||||||
></Table>
|
></Table>
|
||||||
<p style={{ color: 'red' }}>提醒:根据《关于进一步防范围标串标风险的通知》(WTZ2019110816765),如不同供应商的MAC地址相同,则可能存在围标、串标风险,请项目经理及评委给予注意!</p>
|
<p style={{ color: 'red' }}>提醒:根据《关于进一步防范围标串标风险的通知》(WTZ2019110816765),如不同供应商的MAC地址相同,则可能存在围标、串标风险,请项目经理及评委给予注意!</p>
|
||||||
<p></p>
|
<p></p>
|
||||||
<Table
|
<Table
|
||||||
size='small'
|
size='small'
|
||||||
columns={ipColumns}
|
columns={ipColumns}
|
||||||
dataSource={rishList[0].tfileWarningList}
|
dataSource={rishList[0].tfileWarningList}
|
||||||
pagination={false}//分页
|
pagination={false}//分页
|
||||||
></Table>
|
></Table>
|
||||||
</Card>
|
</Card>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
</>}
|
</>}
|
||||||
|
</Spin>
|
||||||
</Collapse.Panel>
|
</Collapse.Panel>
|
||||||
</Collapse>
|
</Collapse>
|
||||||
</>
|
</>
|
||||||
|
Reference in New Issue
Block a user