From 40839aadc80945ba3e7f02ee84cf4702791f63b5 Mon Sep 17 00:00:00 2001
From: linxd <544554903@qq.com>
Date: Wed, 16 Jul 2025 16:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E7=BB=93=E6=9E=9C=E5=92=8C?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=89=93=E5=88=86(=E6=8C=89=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E4=BB=BB=E5=8A=A1)=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0selectBy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/models/supplierAnnualTaskManage.ts           |  1 +
 src/models/supplierTaskManage.ts                 |  1 +
 .../EvaluatorComponents/SupplierTable.tsx        | 16 ++++++++++++++--
 .../supplierEvaluateResult.tsx                   |  1 +
 .../supplierEvaluateScore.tsx                    |  1 +
 .../EvaluatorComponents/SupplierTable.tsx        | 15 ++++++++++++++-
 .../supplierEvaluateResult.d.ts                  |  1 +
 .../supplierEvaluateScore.d.ts                   |  1 +
 .../supplierTaskManage.d.ts                      |  1 +
 9 files changed, 35 insertions(+), 3 deletions(-)

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/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<SupplierTableProps> = ({
   mode,
 }) => {
   const intl = useIntl();
-
+  const supplierDetailModal = useSupplierDetailModal();
   // 表格行选择配置
   const rowSelection = {
     selectedRowKeys,
@@ -62,16 +63,24 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
       title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.supplierName" />,
       dataIndex: 'supplierName',
       key: 'supplierName',
+      ellipsis: true,
+      render: (supplierName: string, record: supplierAnnualTaskManage.SupplierItem) => (
+        <Tooltip placement="topLeft" title={supplierName}>
+          <a onClick={() => supplierDetailModal?.(record.id)}>{supplierName}</a>
+        </Tooltip>
+      ),
     },
     {
       title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.socialCreditCode" />,
       dataIndex: 'socialCreditCode',
       key: 'socialCreditCode',
+      ellipsis: true,
     },
     {
       title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.categoryName" />,
       dataIndex: 'categoryName',
       key: 'categoryName',
+      ellipsis: true,
       render: (categoryName: string) => (
         <Tooltip placement="topLeft" title={categoryName}>
           {categoryName || '-'}
@@ -82,16 +91,19 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
       title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.deptName" />,
       dataIndex: 'deptName',
       key: 'deptName',
+      ellipsis: true,
     },
     {
       title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.evaluatorCount" />,
-      align: 'center' as const,
       dataIndex: 'evaluatorCount',
       key: 'evaluatorCount',
     },
     {
       title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.action" />,
       key: 'action',
+      width: 250,
+      align: 'center' as const,
+      ellipsis: true,
       render: (_: any, record: supplierAnnualTaskManage.SupplierItem) => (
         <Space>
           <Button
diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx
index 41c75cf..6ae640d 100644
--- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx
+++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx
@@ -74,6 +74,7 @@ const SupplierEvaluateResult: React.FC = () => {
           pageNo: current,
           pageSize: pageSize,
         },
+        selectBy: "create",
       };
 
       // 添加搜索条件
diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx
index b3f4444..255e608 100644
--- a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx
+++ b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx
@@ -80,6 +80,7 @@ status：状态
           pageNo: pagination.current,
           pageSize: pagination.pageSize,
         },
+        selectBy:"user",
         evaluateTheme: values.name || undefined,
         status: values.status || undefined,
       };
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<SupplierTableProps> = ({
   mode,
 }) => {
   const intl = useIntl();
-
+  const supplierDetailModal = useSupplierDetailModal();
   // 表格行选择配置
   const rowSelection = {
     selectedRowKeys,
@@ -53,16 +54,24 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
       title: intl.formatMessage({ id: 'supplierTaskManage.column.supplierName' }),
       dataIndex: 'supplierName',
       key: 'supplierName',
+      ellipsis: true,
+      render: (supplierName: string, record: SupplierTaskManage.SupplierItem) => (
+        <Tooltip placement="topLeft" title={supplierName}>
+          <a onClick={() => supplierDetailModal?.(record.id)}>{supplierName}</a>
+        </Tooltip>
+      ),
     },
     {
       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) => (
         <Tooltip placement="topLeft" title={categoryName}>
           {categoryName || '-'}
@@ -73,6 +82,7 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
       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<SupplierTableProps> = ({
     {
       title: intl.formatMessage({ id: 'supplierTaskManage.column.action' }),
       key: 'action',
+      align: 'center' as const,
+      width: 250,
+      ellipsis: true,
       render: (_: any, record: SupplierTaskManage.SupplierItem) => (
         <Space>
           <Button
diff --git a/src/servers/dao/supplierEvaluateManage/supplierEvaluateResult.d.ts b/src/servers/dao/supplierEvaluateManage/supplierEvaluateResult.d.ts
index 705e9d6..fd5a30d 100644
--- a/src/servers/dao/supplierEvaluateManage/supplierEvaluateResult.d.ts
+++ b/src/servers/dao/supplierEvaluateManage/supplierEvaluateResult.d.ts
@@ -14,6 +14,7 @@ declare namespace SupplierEvaluateResult {
     status?: string;
     startTime?: string;
     endTime?: string;
+    selectBy?: string;
     [key: string]: any;
   }
 
diff --git a/src/servers/dao/supplierEvaluateManage/supplierEvaluateScore.d.ts b/src/servers/dao/supplierEvaluateManage/supplierEvaluateScore.d.ts
index 049ba7b..0902594 100644
--- a/src/servers/dao/supplierEvaluateManage/supplierEvaluateScore.d.ts
+++ b/src/servers/dao/supplierEvaluateManage/supplierEvaluateScore.d.ts
@@ -111,6 +111,7 @@ declare namespace SupplierEvaluateScore {
     endTime?: string;
     evaluateTheme?: string;
     evaluateYear?: string;
+    selectBy?: string;
   }
 
   interface TaskPageResponse {
diff --git a/src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts b/src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts
index fc4eab0..55ace0f 100644
--- a/src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts
+++ b/src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts
@@ -131,6 +131,7 @@ declare namespace SupplierTaskManage {
       deptName: string;
       supplierId: string;
       supplierName: string;
+      socialCreditCode?: string; // api返回数据的统一社会信用代码
       userList: PersonnelItem[];
     }[],
     [property: string]: any;