diff --git a/src/models/supplierAnnualTaskManage.ts b/src/models/supplierAnnualTaskManage.ts index 86db832..011dabd 100644 --- a/src/models/supplierAnnualTaskManage.ts +++ b/src/models/supplierAnnualTaskManage.ts @@ -97,6 +97,7 @@ const supplierAnnualTaskManage: SupplierTaskModelType = { id: item.supplierId, name: item.supplierName, evaluators: item.userList, + unifiedCode: item.socialCreditCode })), // 供应商IDs与用户IDs diff --git a/src/models/supplierTaskManage.ts b/src/models/supplierTaskManage.ts index 5612a94..2f24fed 100644 --- a/src/models/supplierTaskManage.ts +++ b/src/models/supplierTaskManage.ts @@ -97,6 +97,7 @@ const SupplierTaskModel: SupplierTaskModelType = { id: item.supplierId, name: item.supplierName, evaluators: item.userList, + unifiedCode: item.socialCreditCode })), // 指标列表 diff --git a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx index 6dcdc70..b3b7056 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { Table, Space, Button, Modal, Tooltip } from 'antd'; import { useIntl, FormattedMessage } from 'umi'; +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; interface SupplierTableProps { suppliers: supplierAnnualTaskManage.SupplierItem[]; // 供应商数据列表 @@ -22,7 +23,7 @@ const SupplierTable: React.FC = ({ mode, }) => { const intl = useIntl(); - + const supplierDetailModal = useSupplierDetailModal(); // 表格行选择配置 const rowSelection = { selectedRowKeys, @@ -62,16 +63,24 @@ const SupplierTable: React.FC = ({ title: , dataIndex: 'supplierName', key: 'supplierName', + ellipsis: true, + render: (supplierName: string, record: supplierAnnualTaskManage.SupplierItem) => ( + + supplierDetailModal?.(record.id)}>{supplierName} + + ), }, { title: , dataIndex: 'socialCreditCode', key: 'socialCreditCode', + ellipsis: true, }, { title: , dataIndex: 'categoryName', key: 'categoryName', + ellipsis: true, render: (categoryName: string) => ( {categoryName || '-'} @@ -82,16 +91,19 @@ const SupplierTable: React.FC = ({ title: , dataIndex: 'deptName', key: 'deptName', + ellipsis: true, }, { title: , - align: 'center' as const, dataIndex: 'evaluatorCount', key: 'evaluatorCount', }, { title: , key: 'action', + width: 250, + align: 'center' as const, + ellipsis: true, render: (_: any, record: supplierAnnualTaskManage.SupplierItem) => (