diff --git a/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx b/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx index 9027e66..f94b46a 100644 --- a/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx +++ b/src/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics.tsx @@ -35,7 +35,6 @@ const SupplierAnnualStatistics: React.FC = () => { | undefined >(); - // 获取数据 const fetchStatisticsData = async (current = 1, pageSize = 10, params = searchParams) => { // 如果params没传,证明是重置 @@ -134,16 +133,23 @@ const SupplierAnnualStatistics: React.FC = () => { ellipsis: true, render: (value: { categoryName: string; categoryPathName: string }[] = []) => { if (!value || value.length === 0) return '-'; - + // 多于1条 - const allNames = value.map(item => item.categoryPathName).join('\n'); + const allNames = value.map((item) => item.categoryPathName).join('\n'); return ( - {allNames}} overlayStyle={{ zIndex: 1200 }}> + + {allNames} + + } + overlayStyle={{ zIndex: 1200 }} + > {value[0].categoryName} - {value.length !== 1 && ( - - )} + {value.length !== 1 && } ); @@ -168,6 +174,14 @@ const SupplierAnnualStatistics: React.FC = () => { dataIndex: 'deptName', key: 'deptName', width: 120, + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), }, { title: intl.formatMessage({ id: 'dataStatistics.common.accessYear' }), @@ -189,8 +203,12 @@ const SupplierAnnualStatistics: React.FC = () => { const values = form.getFieldsValue(); const params = { ...values, - startTime: values.annualreviewYear ? moment(values.annualreviewYear).format('YYYY-MM-DD') : undefined, - endTime: values.annualreviewYear ? moment(values.annualreviewYear).add(1, 'year').format('YYYY-MM-DD') : undefined, + startTime: values.annualreviewYear + ? moment(values.annualreviewYear).format('YYYY-MM-DD') + : undefined, + endTime: values.annualreviewYear + ? moment(values.annualreviewYear).add(1, 'year').format('YYYY-MM-DD') + : undefined, }; delete params.annualreviewYear; downloadFile('/coscoAccessSupplier/getPageExport', 'GET', params); diff --git a/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx b/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx index 53a4b42..d37ccfc 100644 --- a/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx +++ b/src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx @@ -136,6 +136,9 @@ const SupplierAnnualStatistics: React.FC = () => { dataIndex: 'categoryName', key: 'categoryName', width: 120, + ellipsis: { + showTitle: true, + }, }, { title: intl.formatMessage({ id: 'dataStatistics.common.accessUnit' }), @@ -162,6 +165,9 @@ const SupplierAnnualStatistics: React.FC = () => { dataIndex: 'orgNameList', key: 'orgNameList', width: 120, + ellipsis: { + showTitle: false, + }, render: (orgNameList: supplierAnnualTaskManage.SupplierOrgNameList[]) => ( <> {orgNameList && orgNameList.length > 0 ? ( diff --git a/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx b/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx index 8ea3313..011304b 100644 --- a/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx +++ b/src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx @@ -164,7 +164,7 @@ const SupplierEvaluateStatistics: React.FC = () => { ellipsis: { showTitle: false, }, - render: (orgNameList: SupplierTaskManage.SupplierOrgNameList[]) => ( + render: (orgNameList: SupplierTaskManage.SupplierOrgNameList[]) => ( <> {orgNameList && orgNameList.length > 0 ? ( item.orgName).join(',')}> @@ -181,6 +181,9 @@ const SupplierEvaluateStatistics: React.FC = () => { dataIndex: 'orgNameList', key: 'orgNameList', width: 120, + ellipsis: { + showTitle: false, + }, render: (orgNameList: SupplierTaskManage.SupplierOrgNameList[]) => ( <> {orgNameList && orgNameList.length > 0 ? ( diff --git a/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx b/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx index b14056d..00b5b47 100644 --- a/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx +++ b/src/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics.tsx @@ -146,7 +146,15 @@ const SupplierExitStatistics: React.FC = () => { title: intl.formatMessage({ id: 'dataStatistics.exit.exitDept' }), dataIndex: 'accessDept', key: 'accessDept', + ellipsis: { + showTitle: false, + }, width: 120, + render: (text: string) => ( + + {text} + + ), }, { title: intl.formatMessage({ id: 'dataStatistics.exit.applyUser' }), diff --git a/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx b/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx index 58afbdb..14f39f0 100644 --- a/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx +++ b/src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx @@ -147,6 +147,14 @@ const SupplierQualificationWarningStatistics: React.FC = () => { dataIndex: 'categoryName', key: 'categoryName', width: 120, + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), }, { title: intl.formatMessage({ id: 'dataStatistics.common.accessUnit' }), @@ -167,6 +175,14 @@ const SupplierQualificationWarningStatistics: React.FC = () => { dataIndex: 'accessDept', key: 'accessDept', width: 120, + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), }, { title: intl.formatMessage({ id: 'dataStatistics.qualification.qualificationName' }),