Merge branch '20220507-MAC地址强控' into 'master-20220527'

5.27 MAC地址强控

See merge request eshop/fe_service_ebtp_frontend!87
This commit is contained in:
周建龙
2022-05-27 15:49:44 +08:00
16 changed files with 745 additions and 139 deletions

View File

@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
import { Button, Card, DatePicker, Divider, Form, List, message, Modal, Progress, Spin } from "antd";
import { Button, Card, DatePicker, Divider, Form, List, message, Modal, Popover, Progress, Spin, Typography } from "antd";
import ProForm, {
ModalForm,
ProFormDateTimePicker,
@ -8,9 +8,10 @@ import ProTable from "@ant-design/pro-table";
import {
ClockCircleOutlined,
DownloadOutlined,
ExclamationCircleOutlined,
FullscreenExitOutlined,
UnorderedListOutlined
} from "@ant-design/icons/lib";
} from "@ant-design/icons";
import {
getBiddingDocumentsDecryptList,
DownFile,
@ -58,6 +59,7 @@ const BiddingDocumentsDecrypt: React.FC<BiddingDocumentsDecryptProps> = (props)
const [spinTip, spinTipSet] = useState<string>('请稍等...');//spin tip显示文字
const MethodDict = getProMethod();
const { Title, Text } = Typography;
//应答字段类型 评标,应答
let responseType = MethodDict == "procurement_mode_1" || MethodDict == "procurement_mode_2" ? "投标" : "应答"
let supplierType = MethodDict == "procurement_mode_1" || MethodDict == "procurement_mode_2" ? "投标人" : "供应商"
@ -368,6 +370,26 @@ const BiddingDocumentsDecrypt: React.FC<BiddingDocumentsDecryptProps> = (props)
dataIndex: 'companyName',
valueType: 'text'
},
{
title: (
<span>
MAC地址检测承诺书时间
<Popover
content={
<Typography>
<Title level={5}></Title>
<Text style={{ display: 'inline-block', textIndent: '2em' }}>IPMAC地址校验MAC地址相同/</Text>
</Typography>
}
overlayInnerStyle={{ width: 400 }}
>
<ExclamationCircleOutlined style={{ color: '#b30000', marginLeft: 4 }} />
</Popover>
</span>
),
dataIndex: 'confirmTime',
valueType: 'text'
},
{
title: '解密状态',
dataIndex: item.quoteOrOther == "1" ? 'decryptOtherStatus' : "decryptStatus",