liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20220518-折叠以后再展开才是实际的数据' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220507-MAC地址强控

Browse Source
This commit is contained in:
jl-zhoujl2
2022-05-19 12:55:22 +08:00
parent 7579c43453 a1530cb43c
commit ef6479fa26
10 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx
View File

@ -68,14 +68,7 @@ const ViewBlacklistFormModal: React.FC<ViewBlacklistFormModalProps> = (props) =>
return a;
}
},
{
title: '黑名单等级', dataIndex: 'lv', render: (_, record) => {
if (record.isBlack == "1") {
return (isEmpty(record.lv) || record.lv == "1") ? '一级' : '二级';
}
return '';
}
},
{ title: '黑名单等级', dataIndex: 'lvName', },
{ title: '黑名单开始时间', dataIndex: 'startTime', },
{ title: '黑名单结束时间', dataIndex: 'endTime', },
{ title: '黑名单期限', dataIndex: 'term', },

5
src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx
View File

@ -32,10 +32,7 @@ const ViewInvoiceFormModal: React.FC<ViewInvoiceFormModalProps> = (props) => {
dataIndex: 'ouName',
}, {
title: '黑名单等级',
dataIndex: 'reserved5',
render: (_: any, record: any) => {
return (isEmpty(record.reserved5) || record.reserved5 == "1") ? '一级' : '二级';
}
dataIndex: 'lvName',
}, {
title: '黑名单开始时间',
dataIndex: 'startTime',