diff --git a/src/pages/supplier/admission/SupplierCategoryEntry/components/SupplierSelector.tsx b/src/pages/supplier/admission/SupplierCategoryEntry/components/SupplierSelector.tsx index 0fb6b09..27daa2c 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntry/components/SupplierSelector.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntry/components/SupplierSelector.tsx @@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'; import { Modal, Input, Button, Form, Table, Tooltip } from 'antd'; import { coscoSupplierBase } from '../services'; import RegionTypeSelect from '@/components/CommonSelect/RegionTypeSelect' +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; const SupplierSelector: React.FC<{ visible: boolean; @@ -21,6 +22,7 @@ const SupplierSelector: React.FC<{ const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 }); // 加载态 const [loading, setLoading] = useState(false); + const supplierDetailModal = useSupplierDetailModal(); // 查询 const getTableList = async (values: any = {}, pageNo: number = 1, pageSize: number = 10) => { @@ -59,7 +61,7 @@ const SupplierSelector: React.FC<{ const name = record.supplierType === "ovs" ? record.nameEn : record.name; return ( - {name} + supplierDetailModal?.(record.id)}>{name || ''} ); } diff --git a/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx b/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx index 47b5bd0..4f53c5d 100644 --- a/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx +++ b/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { Table, Form, Input, Button, Row, Col, DatePicker, Tabs, Space, message } from 'antd'; +import { Table, Form, Input, Button, Row, Col, DatePicker, Tabs, Space, Tooltip } from 'antd'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import type { ColumnsType } from 'antd/es/table'; //组件 @@ -9,6 +9,7 @@ import SupplierExitModal from './components/SupplierExitModal'; import { getPageAgent } from './services'; //统一列表分页 import tableProps from '@/utils/tableProps' +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; const { RangePicker } = DatePicker; const { TabPane } = Tabs; @@ -33,6 +34,7 @@ const SupplierRegisterAgent: React.FC = () => { // 新增与修改 const [exitModalVisible, setExitModalVisible] = useState(false); const [exitId, setExitId] = useState(''); + const supplierDetailModal = useSupplierDetailModal(); // 查询数据 const fetchData = async (page = 1, pageSize = 10) => { @@ -95,11 +97,18 @@ const SupplierRegisterAgent: React.FC = () => { width: 80, render: (_: any, __: any, idx: number) => ((pagination.current - 1) * pagination.pageSize) + idx + 1, }, + { - title: '供应商名称', - dataIndex: 'name', - align: 'left', + title: "供应商名称", dataIndex: "name", align: "left", + width: 200, ellipsis: true, + render: (dom, record) => { + return ( + + supplierDetailModal?.(record.id)}>{record.name || ''} + + ) + } }, { title: '创建单位',