From 35028f8840576e6b13998bea4f07580db851b285 Mon Sep 17 00:00:00 2001 From: linxd <544554903@qq.com> Date: Wed, 16 Jul 2025 17:04:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierAnnualResult/supplierAnnualResult.tsx | 4 ++-- .../supplierAnnualResult/supplierAnnualResultQuery.tsx | 4 ++-- .../supplierAnnualResult/supplierAnnualResultQuery2.tsx | 4 ++-- .../supplierAnnualTaskManage/components/Detail/BasicInfo.tsx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx index 45ba9da..5787184 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx @@ -137,8 +137,8 @@ useEffect(() => { }, { title: intl.formatMessage({ id: 'supplierAnnualResult.list.category' }), - dataIndex: 'category', - key: 'category', + dataIndex: 'categoryName', + key: 'categoryName', }, { title: intl.formatMessage({ id: 'supplierAnnualResult.list.department' }), diff --git a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery.tsx b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery.tsx index dd7cab5..25759de 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery.tsx @@ -173,8 +173,8 @@ const SupplierAnnualResultQuery: React.FC = () => { }, { title: intl.formatMessage({ id: 'supplierAnnualResult.supplier.category' }), - dataIndex: 'category', - key: 'category', + dataIndex: 'categoryName', + key: 'categoryName', }, { title: intl.formatMessage({ id: 'supplierAnnualResult.supplier.department' }), diff --git a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery2.tsx b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery2.tsx index 950afc5..e0c3c6d 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery2.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResultQuery2.tsx @@ -195,8 +195,8 @@ const SupplierAnnualResultQuery2: React.FC = () => { }, { title: intl.formatMessage({ id: 'supplierAnnualResult.review.category' }), - dataIndex: 'category', - key: 'category', + dataIndex: 'categoryName', + key: 'categoryName', }, { title: intl.formatMessage({ id: 'supplierAnnualResult.review.department' }), diff --git a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/BasicInfo.tsx b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/BasicInfo.tsx index 8c3ac97..4647cfa 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/BasicInfo.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/BasicInfo.tsx @@ -27,7 +27,7 @@ const BasicInfo: React.FC = ({ taskData }) => { {taskData.annualreviewTheme || '--'} - {getStatusTag(taskData.status || '')} + {taskData.statusName || '--'} {taskData.annualreviewYear || '--'}