diff --git a/src/pages/supplier/ViewReviewPage/components/ExitApproval.tsx b/src/pages/supplier/ViewReviewPage/components/ExitApproval.tsx index edc08fe..5b038c7 100644 --- a/src/pages/supplier/ViewReviewPage/components/ExitApproval.tsx +++ b/src/pages/supplier/ViewReviewPage/components/ExitApproval.tsx @@ -99,6 +99,10 @@ const ViewBlacklistModal: React.FC = ({ { title: "发起单位", dataIndex: "orgName", align: "center", ellipsis: true, width: 160 }, { title: "发起部门", dataIndex: "deptName", align: "center", ellipsis: true, width: 160 }, { title: "退出品类", dataIndex: "categoryName", align: "center", ellipsis: true, width: 160 }, + { + title: "退出原因", dataIndex: "exitReason", align: "center", ellipsis: true, width: 180, + render: (dom, record:any) => {record.exitReason}, + }, { title: "退出时间", dataIndex: "createTime", align: "center", width: 180 }, ]; diff --git a/src/pages/supplier/informationRetrieval/registrationQuery/index.tsx b/src/pages/supplier/informationRetrieval/registrationQuery/index.tsx index 66e2181..a88c5b7 100644 --- a/src/pages/supplier/informationRetrieval/registrationQuery/index.tsx +++ b/src/pages/supplier/informationRetrieval/registrationQuery/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; //第三方UI库/组件 -import { Form, Button, Table, Input, Space, Tooltip } from 'antd'; +import { Form, Button, Table, Input, Space, Tooltip, Select } from 'antd'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; //类型定义 import type { ColumnsType, TablePaginationConfig } from 'antd/es/table'; @@ -10,7 +10,7 @@ import { useIntl, connect } from 'umi'; import SupplierViewModal from './components/SupplierViewModal'; import SupplierDetailModal from './components/SupplierDetailModal'; import RegionTypeSelect from '@/components/CommonSelect/RegionTypeSelect' -import AccessStatusSelect from '@/components/CommonSelect/AccessStatusSelect' +// import AccessStatusSelect from '@/components/CommonSelect/AccessStatusSelect' //本地服务/接口 import { getRegisterPage } from './services'; import { getDictList } from '@/servers/api/dicts' @@ -26,6 +26,12 @@ interface Data { regTime: string; status: string; } +const accessStatusType = [ + { code: '0', dicName: '未准入' }, + { code: '1', dicName: '已准入' }, + { code: '2', dicName: '已退出' } +] + //准入状态 const statusColor = (status: string) => { if (status === '已驳回' || status === '已退出') return '#ef6969'; @@ -205,7 +211,14 @@ const RegistrationQuery: React.FC = ({ dispatch }) => { - + + + + diff --git a/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx index ddada2b..f87d140 100644 --- a/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx +++ b/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx @@ -93,6 +93,10 @@ const ViewBlacklistModal: React.FC = ({ { title: "发起单位", dataIndex: "orgName", align: "center", ellipsis: true, width: 160 }, { title: "发起部门", dataIndex: "deptName", align: "center", ellipsis: true, width: 160 }, { title: "退出品类", dataIndex: "categoryName", align: "center", ellipsis: true, width: 160 }, + { + title: "退出原因", dataIndex: "exitReason", align: "center", ellipsis: true, width: 180, + render: (dom, record:any) => {record.exitReason}, + }, { title: "退出时间", dataIndex: "createTime", align: "center", width: 180 }, ]; @@ -111,7 +115,7 @@ const ViewBlacklistModal: React.FC = ({ - +