diff --git a/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx b/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx index 8a2aafb..f25e222 100644 --- a/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx +++ b/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx @@ -7,11 +7,13 @@ import { AccessTypeText } from '@/dicts/dataStatistics'; import { getSupplierAdmissionStatistics } from '@/servers/api/dataStatistics'; import { downloadFile } from '@/utils/download'; import moment from 'moment'; +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; const { Option } = Select; const SupplierAnnualStatistics: React.FC = () => { const intl = useIntl(); + const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); const [form] = Form.useForm(); @@ -113,9 +115,9 @@ const SupplierAnnualStatistics: React.FC = () => { ellipsis: { showTitle: false, }, - render: (text: string) => ( + render: (text: string, record: DataStatistics.AnnualReviewStatisticsRecord) => ( - {text} + ), }, diff --git a/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx b/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx index e99cfd2..dc77a25 100644 --- a/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx +++ b/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx @@ -8,11 +8,13 @@ import { getSupplierAnnualReviewStatistics } from '@/servers/api/dataStatistics' import './supplierAnnualStatistics.less'; import { downloadFile } from '@/utils/download'; import moment from 'moment'; +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; const { Option } = Select; const SupplierAnnualStatistics: React.FC = () => { const intl = useIntl(); + const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); const [form] = Form.useForm(); @@ -125,9 +127,9 @@ const SupplierAnnualStatistics: React.FC = () => { ellipsis: { showTitle: false, }, - render: (text: string) => ( + render: (text: string, record: DataStatistics.AnnualReviewStatisticsRecord) => ( - {text} + ), }, diff --git a/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx b/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx index 6bbea7f..0d81590 100644 --- a/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx +++ b/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx @@ -9,11 +9,13 @@ import { getAllEvaluateRules } from '@/servers/api/supplierEvaluate'; import './supplierEvaluateStatistics.less'; import { downloadFile } from '@/utils/download'; import moment from 'moment'; +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; const { Option } = Select; const SupplierEvaluateStatistics: React.FC = () => { const intl = useIntl(); + const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); const [form] = Form.useForm(); @@ -145,9 +147,9 @@ const SupplierEvaluateStatistics: React.FC = () => { ellipsis: { showTitle: false, }, - render: (text: string) => ( + render: (text: string, record: DataStatistics.EvaluateStatisticsRecord) => ( - {text} + ), }, diff --git a/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx b/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx index 47341ad..bb8755a 100644 --- a/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx +++ b/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx @@ -7,11 +7,13 @@ import { getSupplierExitStatistics } from '@/servers/api/dataStatistics'; import moment from 'moment'; import './supplierExitStatistics.less'; import { downloadFile } from '@/utils/download'; +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; const { Option } = Select; const SupplierExitStatistics: React.FC = () => { const intl = useIntl(); + const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); const [form] = Form.useForm(); @@ -117,9 +119,9 @@ const SupplierExitStatistics: React.FC = () => { ellipsis: { showTitle: false, }, - render: (text: string) => ( + render: (text: string, record: DataStatistics.ExitStatisticsRecord) => ( - {text} + ), }, diff --git a/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx b/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx index 814c608..7789127 100644 --- a/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx +++ b/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx @@ -24,12 +24,14 @@ import { getSupplierQualificationExpire, exportSupplierQualificationExpire } fro import moment from 'moment'; import './supplierQualificationWarningStatistics.less'; import { downloadFile } from '@/utils/download'; +import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; const { Option } = Select; const { RangePicker } = DatePicker; const SupplierQualificationWarningStatistics: React.FC = () => { const intl = useIntl(); + const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); const [form] = Form.useForm(); @@ -145,9 +147,9 @@ const SupplierQualificationWarningStatistics: React.FC = () => { ellipsis: { showTitle: false, }, - render: (text: string) => ( + render: (text: string, record: DataStatistics.QualificationExpireRecord) => ( - {text} + ), }, diff --git a/src/servers/dao/dataStatistics.d.ts b/src/servers/dao/dataStatistics.d.ts index 4e37377..344a46b 100644 --- a/src/servers/dao/dataStatistics.d.ts +++ b/src/servers/dao/dataStatistics.d.ts @@ -46,6 +46,7 @@ declare namespace DataStatistics { evaluateYear: string | null; // 评价年度 evaluateResult: string; // 评价结果/等级 basePageRequest: null; + supplierId: string; } // 评价情况统计 - 查询参数 @@ -82,6 +83,7 @@ declare namespace DataStatistics { annualreviewYear: string; // 年审年度 annualStatisticsResult: string; // 年审结果 basePageRequest: null; + supplierId: string; } // 年审统计 - 查询参数 @@ -117,6 +119,7 @@ declare namespace DataStatistics { applyUser: string; // 申请人 applyTime: string; // 申请时间 basePageRequest: null; + supplierId: string; } // 退出统计 - 查询参数 @@ -154,6 +157,7 @@ declare namespace DataStatistics { accessDept: string; // 准入部门 categoryName: string | null; // 品类 basePageRequest: null; + supplierId: string; } // 资质过期 - 查询参数