diff --git a/src/components/SupplierSelector/SupplierSelector.tsx b/src/components/SupplierSelector/SupplierSelector.tsx index 33485eb..dafef37 100644 --- a/src/components/SupplierSelector/SupplierSelector.tsx +++ b/src/components/SupplierSelector/SupplierSelector.tsx @@ -251,7 +251,7 @@ const SupplierSelector: React.FC = ({ ellipsis: true, render: (supplierName: string, record: SupplierItem) => ( - + supplierDetailModal?.(record.id)}>{supplierName} ), }, 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/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx b/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx index f25e222..96a11c8 100644 --- a/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx +++ b/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx @@ -117,7 +117,7 @@ const SupplierAnnualStatistics: React.FC = () => { }, render: (text: string, record: DataStatistics.AnnualReviewStatisticsRecord) => ( - + supplierDetailModal?.(record.supplierId)}>{text} ), }, diff --git a/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx b/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx index dc77a25..d16405e 100644 --- a/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx +++ b/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx @@ -129,7 +129,7 @@ const SupplierAnnualStatistics: React.FC = () => { }, render: (text: string, record: DataStatistics.AnnualReviewStatisticsRecord) => ( - + supplierDetailModal?.(record.supplierId)}>{text} ), }, diff --git a/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx b/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx index 8d82127..24cada1 100644 --- a/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx +++ b/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx @@ -149,7 +149,7 @@ const SupplierEvaluateStatistics: React.FC = () => { }, render: (text: string, record: DataStatistics.EvaluateStatisticsRecord) => ( - + supplierDetailModal?.(record.id)}>{text} ), }, diff --git a/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx b/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx index bb8755a..1d4e757 100644 --- a/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx +++ b/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx @@ -121,7 +121,7 @@ const SupplierExitStatistics: React.FC = () => { }, render: (text: string, record: DataStatistics.ExitStatisticsRecord) => ( - + supplierDetailModal?.(record.supplierId)}>{text} ), }, diff --git a/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx b/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx index 7789127..0635e4a 100644 --- a/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx +++ b/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx @@ -149,7 +149,7 @@ const SupplierQualificationWarningStatistics: React.FC = () => { }, render: (text: string, record: DataStatistics.QualificationExpireRecord) => ( - + supplierDetailModal?.(record.supplierId)}>{text} ), }, diff --git a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultDetail.tsx b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultDetail.tsx index 4e2786e..73d0409 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultDetail.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultDetail.tsx @@ -135,7 +135,7 @@ const SupplierAnnualResultDetail: React.FC = () => { - + supplierDetailModal?.(reviewDetail.supplierId)}>{supplierName || reviewDetail.name} {annualTheme} diff --git a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery.tsx b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery.tsx index fee7c35..dd7cab5 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery.tsx @@ -11,6 +11,7 @@ import { Select, Typography, DatePicker, + Tooltip, } from 'antd'; import { ArrowLeftOutlined, SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { getAnnualResultSupplierList } from '@/servers/api/supplierAnnual'; @@ -165,7 +166,9 @@ const SupplierAnnualResultQuery: React.FC = () => { dataIndex: 'name', key: 'name', render: (text: string, record: supplierAnnualResult.SupplierRecord) => ( - + + supplierDetailModal?.(record.supplierId)}>{text} + ), }, { diff --git a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery2.tsx b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery2.tsx index 3cea655..950afc5 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery2.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery2.tsx @@ -11,7 +11,8 @@ import { Select, Typography, Tag, - DatePicker + DatePicker, + Tooltip, } from 'antd'; import { ArrowLeftOutlined, SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { getAnnualResultReviewList } from '@/servers/api/supplierAnnual'; @@ -187,7 +188,9 @@ const SupplierAnnualResultQuery2: React.FC = () => { dataIndex: 'name', key: 'name', render: (text: string, record: supplierAnnualResult.ReviewRecord) => ( - + + supplierDetailModal?.(record.supplierId)}>{text} + ), }, { diff --git a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx index ae518ac..322f430 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx @@ -185,7 +185,7 @@ const SupplierAnnualReview: React.FC = () => { }, render: (text: string, record: supplierAnnualReview.ReviewRecord) => ( - + supplierDetailModal?.(record.supplierId)}>{text} ), }, diff --git a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScore.tsx b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScore.tsx index 4850244..28a384d 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScore.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScore.tsx @@ -189,7 +189,7 @@ const SupplierAnnualReviewScore: React.FC = () => { {reviewDetail.annualreviewTheme} - + supplierDetailModal?.(reviewDetail.supplierId)}>{reviewDetail.name} {reviewDetail.deptName || '-'} diff --git a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScoreDetail.tsx b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScoreDetail.tsx index 8f2d70e..f5198ea 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScoreDetail.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScoreDetail.tsx @@ -153,7 +153,7 @@ const SupplierAnnualReviewDetail: React.FC = () => { {reviewDetail.annualreviewTheme} - + supplierDetailModal?.(reviewDetail.supplierId)}>{reviewDetail.name} {reviewDetail.deptName || '-'} diff --git a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/SupplierInfo.tsx b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/SupplierInfo.tsx index edc19e5..27aaa38 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/SupplierInfo.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/SupplierInfo.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Card, Table, Button, message } from 'antd'; +import { Card, Table, Button, message, Tooltip } from 'antd'; import { useIntl, FormattedMessage } from 'umi'; import styles from '../../supplierAnnualTaskManageDetail.less'; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; @@ -37,7 +37,9 @@ const SupplierInfo: React.FC = ({ taskData, onViewEvaluators dataIndex: 'supplierName', key: 'supplierName', render: (text: string, record: any) => ( - + + supplierDetailModal?.(record.supplierId)}>{text} + ), }, { 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) => ( + supplierDetailModal?.(record.supplierId)}>{supplierName} ), }, diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx index ad2e8e3..07a3c66 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx @@ -210,9 +210,9 @@ const SupplierEvaluateResultScoreByList: React.FC = () => { }, render: (supplierName: string, rowData: SupplierEvaluateResult.ScoreDataItem) => ( - + ), }, diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx index 5abe2da..255e608 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx @@ -11,6 +11,7 @@ import { DatePicker, Select, Table, + Tooltip, } from 'antd'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { history, useIntl } from 'umi'; @@ -79,6 +80,7 @@ status:状态 pageNo: pagination.current, pageSize: pagination.pageSize, }, + selectBy:"user", evaluateTheme: values.name || undefined, status: values.status || undefined, }; @@ -268,7 +270,9 @@ status:状态 dataIndex: 'name', key: 'name', render: (text: string, record: any) => ( - + + supplierDetailModal?.(record.supplierId)}>{text} + ), }, { diff --git a/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/SupplierInfo.tsx b/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/SupplierInfo.tsx index 3fb1fbf..dea8524 100644 --- a/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/SupplierInfo.tsx +++ b/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/SupplierInfo.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Card, Table, Button, message } from 'antd'; +import { Card, Table, Button, message, Tooltip } from 'antd'; import styles from '../../supplierTaskManageDetail.less'; import { useIntl } from 'umi'; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; @@ -54,7 +54,9 @@ const SupplierInfo: React.FC = ({ taskData, onViewEvaluators dataIndex: 'supplierName', key: 'supplierName', render: (text: string, record: any) => ( - + + supplierDetailModal?.(record.supplierId)}>{text} + ), }, { diff --git a/src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx b/src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx index 3e410c9..b3940e6 100644 --- a/src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx +++ b/src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx @@ -1,6 +1,7 @@ import React, { useEffect } from 'react'; import { Table, Space, Button, Tag, Modal, Tooltip } from 'antd'; import { useIntl } from 'umi'; +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; interface SupplierTableProps { suppliers: SupplierTaskManage.SupplierItem[]; // 供应商数据列表 @@ -22,7 +23,7 @@ const SupplierTable: React.FC = ({ mode, }) => { const intl = useIntl(); - + const supplierDetailModal = useSupplierDetailModal(); // 表格行选择配置 const rowSelection = { selectedRowKeys, @@ -53,16 +54,24 @@ const SupplierTable: React.FC = ({ title: intl.formatMessage({ id: 'supplierTaskManage.column.supplierName' }), dataIndex: 'supplierName', key: 'supplierName', + ellipsis: true, + render: (supplierName: string, record: SupplierTaskManage.SupplierItem) => ( + + supplierDetailModal?.(record.id)}>{supplierName} + + ), }, { title: intl.formatMessage({ id: 'supplierTaskManage.column.socialCreditCode' }), dataIndex: 'socialCreditCode', key: 'socialCreditCode', + ellipsis: true, }, { title: intl.formatMessage({ id: 'supplierTaskManage.column.categoryName' }), dataIndex: 'categoryName', key: 'categoryName', + ellipsis: true, render: (categoryName: string) => ( {categoryName || '-'} @@ -73,6 +82,7 @@ const SupplierTable: React.FC = ({ title: intl.formatMessage({ id: 'supplierTaskManage.column.deptName' }), dataIndex: 'deptName', key: 'deptName', + ellipsis: true, }, { title: intl.formatMessage({ id: 'supplierTaskManage.column.evaluatorCount' }), @@ -83,6 +93,9 @@ const SupplierTable: React.FC = ({ { title: intl.formatMessage({ id: 'supplierTaskManage.column.action' }), key: 'action', + align: 'center' as const, + width: 250, + ellipsis: true, render: (_: any, record: SupplierTaskManage.SupplierItem) => (