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

Merge branch '20220324-zjl-供应商黑名单功能优化' into 'master-0401-合并'

Browse Source 
4.1 供应商黑名单功能优化

See merge request eshop/fe_service_ebtp_frontend!6
This commit is contained in:
高海峰
2022-04-01 20:18:51 +08:00
parent 7b3efe00dd acc0506342
commit 2e2ef4fa7c
2 changed files with 90 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,8 @@ import React, { useEffect,useState } from 'react';
import { Tabs, Collapse, Form, Input, Modal, Col, Row, Divider, Table, Button } from 'antd';
import ProTable, { ProColumns } from "@ant-design/pro-table";
import ExtendUpload from "@/utils/ExtendUpload";
import { getBlackList,getBlackListOld} from '../service';
import {} from '@/utils/CommonUtils'
import { getBlackList } from '../service';
import { isEmpty } from '@/utils/CommonUtils'
import { getRoomId, getSessionProjectData, getSessionRoleData, getSessionUserData } from '@/utils/session';
import ViewInvoiceFormModal from './ViewInvoiceFormModal';
@ -59,7 +59,8 @@ const ViewBlacklistFormModal: React.FC<ViewBlacklistFormModalProps> = (props) =>
const companyBlacklistColumns: ProColumns<any>[] = [
{ title: '序号', dataIndex: 'num', width: 60, render: (text: any, record: any, index: any) => `${index + 1}` },
{ title: '供应商名称', dataIndex: 'provinceName', },
{ title: '是否被列入黑名单', dataIndex: 'isBlack',render: (_, record) => {
{
title: '是否被列入黑名单', dataIndex: 'isBlack', render: (_, record) => {
let a = "";
if (record !== null) {
a = isBlackValue(record.isBlack);
@ -67,10 +68,19 @@ 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: 'startTime', },
{ title: '黑名单结束时间', dataIndex: 'endTime', },
{ title: '黑名单期限', dataIndex: 'term', },
{ title: '历史黑名单记录', dataIndex: 'hmdjl',render: (_, record) => {
{
title: '历史黑名单记录', dataIndex: 'hmdjl', render: (_, record) => {
return (
<>
{record.isBlack === "1" ?

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

@ -2,7 +2,7 @@ import React, { useEffect,useState } from 'react';
import { Tabs, Collapse, Form, Input, Modal, Col, Row, Divider, Table } from 'antd';
import ProTable from "@ant-design/pro-table";
import ExtendUpload from "@/utils/ExtendUpload";
import {} from '@/utils/CommonUtils'
import { isEmpty } from '@/utils/CommonUtils'
interface ViewInvoiceFormModalProps {
@ -30,6 +30,12 @@ const ViewInvoiceFormModal: React.FC<ViewInvoiceFormModalProps> = (props) => {
}, {
title: '省分',
dataIndex: 'ouName',
}, {
title: '黑名单等级',
dataIndex: 'reserved5',
render: (_: any, record: any) => {
return (isEmpty(record.reserved5) || record.reserved5 == "1") ? '一级' : '二级';
}
}, {
title: '黑名单开始时间',
dataIndex: 'startTime',