diff --git a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx index 5b6ff77..45ba9da 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx @@ -3,18 +3,16 @@ import { Table, Button, Input, message, Space, Form, DatePicker, Select } from ' import { history, useIntl } from 'umi'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { getAnnualResultTaskList } from '@/servers/api/supplierAnnual'; +import { getDictList } from '@/servers/api/dicts'; +import type { DictItem } from '@/servers/api/dicts'; const { RangePicker } = DatePicker; const { Option } = Select; -// 定义年度审查状态 -const statusOptions = [ - { label: '待审核', value: '0' }, - { label: '审核中', value: '1' }, - { label: '已完成', value: '2' }, -]; const SupplierAnnualResult: React.FC = () => { + // 定义年度审查状态 + const [statusOptions, setStatusOptions] = useState([]); const intl = useIntl(); const [form] = Form.useForm(); const [loading, setLoading] = useState(false); @@ -57,7 +55,13 @@ const SupplierAnnualResult: React.FC = () => { setLoading(false); } }; - +useEffect(() => { + getDictList('project_status ').then((res) => { + if (res.success) { + setStatusOptions(res.data); + } + }); +}, []); // 监听搜索参数和分页变化,自动请求数据 useEffect(() => { fetchList(); @@ -194,8 +198,8 @@ const SupplierAnnualResult: React.FC = () => { diff --git a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx index 005b46f..2259bd6 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx @@ -213,11 +213,9 @@ const SupplierAnnualReview: React.FC = () => { }, { title: intl.formatMessage({ id: 'supplierAnnualReview.list.status' }), - dataIndex: 'reviewStatus', - key: 'reviewStatus', - width: 100, - render: (status: string, record: supplierAnnualReview.ReviewRecord) => - getStatusTag(status, record.reviewStatusName), + dataIndex: 'reviewStatusName', + key: 'reviewStatusName', + width: 100 }, { title: intl.formatMessage({ id: 'supplierAnnualReview.common.operation' }),