From edad9b2cab2b914f886ffe11532a1f661d5cf67f Mon Sep 17 00:00:00 2001 From: linxd <544554903@qq.com> Date: Thu, 7 Aug 2025 09:11:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=AE=A1=E4=BB=BB=E5=8A=A1=E5=92=8C?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E4=BB=BB=E5=8A=A1,=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B=E6=97=B6,=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E9=83=A8=E9=97=A8=E5=9B=9E=E6=98=BE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Detail/SupplierInfo.tsx | 19 +++++- .../EvaluatorComponents/SupplierTable.tsx | 33 ++++++--- .../components/Detail/SupplierInfo.tsx | 15 +++- .../EvaluatorComponents/SupplierTable.tsx | 20 ++++-- .../supplierAnnualTaskManage.d.ts | 68 ++++++++++--------- .../supplierTaskManage.d.ts | 7 +- 6 files changed, 113 insertions(+), 49 deletions(-) diff --git a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/SupplierInfo.tsx b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/SupplierInfo.tsx index 27aaa38..ee76442 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/SupplierInfo.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/Detail/SupplierInfo.tsx @@ -20,7 +20,9 @@ const SupplierInfo: React.FC = ({ taskData, onViewEvaluators userList: record.userList, }); } else { - message.error(intl.formatMessage({ id: 'supplierAnnualTaskManage.supplierInfo.noEvaluators' })); + message.error( + intl.formatMessage({ id: 'supplierAnnualTaskManage.supplierInfo.noEvaluators' }), + ); } }; @@ -44,8 +46,19 @@ const SupplierInfo: React.FC = ({ taskData, onViewEvaluators }, { title: , - dataIndex: 'deptName', - key: 'deptName', + dataIndex: 'orgNameList', + key: 'orgNameList', + render: (orgNameList: supplierAnnualTaskManage.SupplierOrgNameList[]) => ( + <> + {orgNameList && orgNameList.length > 0 ? ( + item.deptName).join(',')}> + {orgNameList[0].deptName} + + ) : ( + '-' + )} + + ), }, { title: , diff --git a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx index e54eec5..a104821 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx @@ -34,7 +34,7 @@ const SupplierTable: React.FC = ({ const showDeleteConfirm = (record: supplierAnnualTaskManage.SupplierItem) => { let content = intl.formatMessage( { id: 'supplierAnnualTaskManage.supplierTable.confirm.delete.content' }, - { supplierName: record.supplierName } + { supplierName: record.supplierName }, ); if (record.evaluatorCount && record.evaluatorCount > 0) { @@ -42,17 +42,23 @@ const SupplierTable: React.FC = ({ { id: 'supplierAnnualTaskManage.supplierTable.confirm.delete.content.withEvaluators' }, { supplierName: record.supplierName, - count: record.evaluatorCount - } + count: record.evaluatorCount, + }, ); } Modal.confirm({ - title: intl.formatMessage({ id: 'supplierAnnualTaskManage.supplierTable.confirm.delete.title' }), + title: intl.formatMessage({ + id: 'supplierAnnualTaskManage.supplierTable.confirm.delete.title', + }), content: content, - okText: intl.formatMessage({ id: 'supplierAnnualTaskManage.supplierTable.confirm.delete.okText' }), + okText: intl.formatMessage({ + id: 'supplierAnnualTaskManage.supplierTable.confirm.delete.okText', + }), okType: 'danger', - cancelText: intl.formatMessage({ id: 'supplierAnnualTaskManage.supplierTable.confirm.delete.cancelText' }), + cancelText: intl.formatMessage({ + id: 'supplierAnnualTaskManage.supplierTable.confirm.delete.cancelText', + }), onOk: () => onDeleteSupplier(record.id), }); }; @@ -89,9 +95,20 @@ const SupplierTable: React.FC = ({ }, { title: , - dataIndex: 'deptName', - key: 'deptName', + dataIndex: 'orgNameList', + key: 'orgNameList', ellipsis: true, + render: (orgNameList: supplierAnnualTaskManage.SupplierOrgNameList[]) => ( + <> + {orgNameList && orgNameList.length > 0 ? ( + item.deptName).join(',')}> + {orgNameList[0].deptName} + + ) : ( + '-' + )} + + ), }, { title: , diff --git a/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/SupplierInfo.tsx b/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/SupplierInfo.tsx index dea8524..58536f3 100644 --- a/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/SupplierInfo.tsx +++ b/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/SupplierInfo.tsx @@ -61,8 +61,19 @@ const SupplierInfo: React.FC = ({ taskData, onViewEvaluators }, { title: intl.formatMessage({ id: 'supplierTaskManage.column.deptName' }), - dataIndex: 'deptName', - key: 'deptName', + dataIndex: 'orgNameList', + key: 'orgNameList', + render: (orgNameList: SupplierTaskManage.SupplierOrgNameList[]) => ( + <> + {orgNameList && orgNameList.length > 0 ? ( + item.deptName).join(',')}> + {orgNameList[0].deptName} + + ) : ( + '-' + )} + + ), }, { title: intl.formatMessage({ id: 'supplierTaskManage.column.categoryName' }), diff --git a/src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx b/src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx index 5e6f3b5..d0f0606 100644 --- a/src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx +++ b/src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx @@ -2,6 +2,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'; +import { render } from 'react-dom'; interface SupplierTableProps { suppliers: SupplierTaskManage.SupplierItem[]; // 供应商数据列表 @@ -38,8 +39,8 @@ const SupplierTable: React.FC = ({ { id: 'supplierTaskManage.modal.deleteSupplier.content' }, { name: record.supplierName, - evaluatorCount: record.evaluatorCount || 0 - } + evaluatorCount: record.evaluatorCount || 0, + }, ), okText: intl.formatMessage({ id: 'supplierTaskManage.button.confirm' }), okType: 'danger', @@ -80,9 +81,20 @@ const SupplierTable: React.FC = ({ }, { title: intl.formatMessage({ id: 'supplierTaskManage.column.deptName' }), - dataIndex: 'deptName', - key: 'deptName', + dataIndex: 'orgNameList', + key: 'orgNameList', ellipsis: true, + render: (orgNameList: SupplierTaskManage.SupplierOrgNameList[]) => ( + <> + {orgNameList && orgNameList.length > 0 ? ( + item.deptName).join(',')}> + {orgNameList[0].deptName} + + ) : ( + '-' + )} + + ), }, { title: intl.formatMessage({ id: 'supplierTaskManage.column.evaluatorCount' }), diff --git a/src/servers/dao/supplierAnnualManage/supplierAnnualTaskManage.d.ts b/src/servers/dao/supplierAnnualManage/supplierAnnualTaskManage.d.ts index 1b31e37..255117e 100644 --- a/src/servers/dao/supplierAnnualManage/supplierAnnualTaskManage.d.ts +++ b/src/servers/dao/supplierAnnualManage/supplierAnnualTaskManage.d.ts @@ -13,37 +13,43 @@ declare namespace supplierAnnualTaskManage { basePageRequest: BasePageRequest; [property: string]: any; } -/* -人员信息 -*/ -interface PersonnelItem { - id: string; - name: string; - userId: string; - userName: string; - position: string; - userDept: string; - userDeptId: string; - indicatorIds?: string[]; - isSelected?: boolean; -} -/** - * 供应商项 - */ -interface SupplierItem { - id: string; // 供应商ID - supplierName: string; // 供应商名称 - supplierId?: string; // 供应商ID - socialCreditCode?: string; // 统一社会信用代码 - category?: string; // 品类 - department?: string; // 准入部门 - evaluatorCount?: number; // 评价人员数量 - evaluators: PersonnelItem[]; // 评价人员列表 - deptName?: string; // 部门名称 - isSelected?: boolean; // 是否可以选中 - // 其他可能的字段 - [key: string]: any; -} + /* + 人员信息 + */ + interface PersonnelItem { + id: string; + name: string; + userId: string; + userName: string; + position: string; + userDept: string; + userDeptId: string; + indicatorIds?: string[]; + isSelected?: boolean; + } + /** + * 供应商项 + */ + interface SupplierItem { + id: string; // 供应商ID + supplierName: string; // 供应商名称 + supplierId?: string; // 供应商ID + socialCreditCode?: string; // 统一社会信用代码 + category?: string; // 品类 + department?: string; // 准入部门 + evaluatorCount?: number; // 评价人员数量 + evaluators: PersonnelItem[]; // 评价人员列表 + deptName?: string; // 部门名称 + isSelected?: boolean; // 是否可以选中 + orgNameList?: SupplierOrgNameList[], + // 其他可能的字段 + [key: string]: any; + } + // 供应商的组织 + interface SupplierOrgNameList { + deptId: string; + deptName: string; + } // 列表响应 interface TaskListResponse { code: number; diff --git a/src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts b/src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts index 55ace0f..f451178 100644 --- a/src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts +++ b/src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts @@ -250,10 +250,15 @@ declare namespace SupplierTaskManage { evaluators: PersonnelItem[]; // 评价人员列表 deptName?: string; // 部门名称 isSelected?: boolean; // 是否可以选中 + orgNameList?: SupplierOrgNameList[], // 其他可能的字段 [key: string]: any; } - + // 供应商的组织 + interface SupplierOrgNameList { + deptId: string; + deptName: string; + } /** * 品类树响应 */