From 516a4efd8d6b01783f6bd852a3372f5089a5cc30 Mon Sep 17 00:00:00 2001 From: linxd <544554903@qq.com> Date: Mon, 11 Aug 2025 13:33:35 +0800 Subject: [PATCH] =?UTF-8?q?table=20=E4=B8=8A=E9=83=A8=E9=97=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8D=95=E4=BD=8D=20,=E5=8D=95=E4=BD=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierAnnualResult.tsx | 98 +++++++---- .../supplierAnnualReview.tsx | 115 ++++++++----- .../supplierAnnualTaskManage.tsx | 56 ++++--- .../supplierAnnualTemplateManage.tsx | 152 +++++++++++------ .../supplierEvaluateResult.tsx | 22 ++- .../supplierEvaluateResultScoreByList.tsx | 14 ++ .../supplierEvaluateScore.tsx | 115 +++++++++---- .../supplierTaskManage/supplierTaskManage.tsx | 24 ++- .../supplierTemplateManage.tsx | 158 ++++++++++-------- 9 files changed, 496 insertions(+), 258 deletions(-) diff --git a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx index 4ce580f..667af22 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualResult/supplierAnnualResult.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { Table, Button, Input, message, Space, Form, DatePicker, Select } from 'antd'; +import { Table, Button, Input, message, Space, Form, DatePicker, Select, Tooltip } from 'antd'; import { history, useIntl } from 'umi'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { getAnnualResultTaskList } from '@/servers/api/supplierAnnual'; @@ -9,7 +9,6 @@ import type { DictItem } from '@/servers/api/dicts'; const { RangePicker } = DatePicker; const { Option } = Select; - const SupplierAnnualResult: React.FC = () => { // 定义年度审查状态 const [statusOptions, setStatusOptions] = useState([]); @@ -21,7 +20,8 @@ const SupplierAnnualResult: React.FC = () => { current: 1, pageSize: 10, total: 0, - showTotal: (total: number) => intl.formatMessage({ id: 'supplierAnnualResult.common.total' }, { total }), + showTotal: (total: number) => + intl.formatMessage({ id: 'supplierAnnualResult.common.total' }, { total }), showSizeChanger: true, showQuickJumper: true, }); @@ -46,7 +46,9 @@ const SupplierAnnualResult: React.FC = () => { total: res.data?.total || 0, }); } else { - message.error(res.message || intl.formatMessage({ id: 'supplierAnnualResult.common.getListFailed' })); + message.error( + res.message || intl.formatMessage({ id: 'supplierAnnualResult.common.getListFailed' }), + ); } } catch (error) { console.error('获取列表失败:', error); @@ -55,13 +57,13 @@ const SupplierAnnualResult: React.FC = () => { setLoading(false); } }; -useEffect(() => { - getDictList('project_status').then((res) => { - if (res.success) { - setStatusOptions(res.data); - } - }); -}, []); + useEffect(() => { + getDictList('project_status').then((res) => { + if (res.success) { + setStatusOptions(res.data); + } + }); + }, []); // 监听搜索参数和分页变化，自动请求数据 useEffect(() => { fetchList(); @@ -117,7 +119,7 @@ useEffect(() => { pathname: '/supplierAnnual/supplierAnnualResultQuery', state: { taskId: record.id, - annualTheme: record.annualreviewTheme + annualTheme: record.annualreviewTheme, }, }); }; @@ -128,7 +130,8 @@ useEffect(() => { dataIndex: 'index', key: 'index', width: 80, - render: (_: any, __: any, index: number) => index + 1 + (pagination.current - 1) * pagination.pageSize, + render: (_: any, __: any, index: number) => + index + 1 + (pagination.current - 1) * pagination.pageSize, }, { title: intl.formatMessage({ id: 'supplierAnnualResult.list.theme' }), @@ -142,8 +145,29 @@ useEffect(() => { }, { title: intl.formatMessage({ id: 'supplierAnnualResult.list.department' }), + dataIndex: 'orgName', + key: 'orgName', + ellipsis: { + showTitle: false, + }, + render: (text: string, record: supplierAnnualReview.ReviewRecord) => ( + + {text} + + ), + }, + { + title: '发起部门', dataIndex: 'deptName', key: 'deptName', + ellipsis: { + showTitle: false, + }, + render: (text: string, record: supplierAnnualReview.ReviewRecord) => ( + + {text} + + ), }, { title: intl.formatMessage({ id: 'supplierAnnualResult.list.startTime' }), @@ -177,27 +201,42 @@ useEffect(() => { return (
-
- - + + + - + - - + {statusOptions.map((item) => ( @@ -208,12 +247,7 @@ useEffect(() => { - diff --git a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx index 86519fc..66838f1 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx @@ -14,10 +14,7 @@ import { Card, } from 'antd'; import type { TablePaginationConfig } from 'antd'; -import { - SearchOutlined, - DeleteOutlined, -} from '@ant-design/icons'; +import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { getAnnualReviewList } from '@/servers/api/supplierAnnual'; import { AnnualReviewStatus, @@ -52,7 +49,8 @@ const SupplierAnnualReview: React.FC = () => { total: 0, showSizeChanger: true, showQuickJumper: true, - showTotal: (total) => intl.formatMessage({ id: 'supplierAnnualReview.common.total' }, { total }), + showTotal: (total) => + intl.formatMessage({ id: 'supplierAnnualReview.common.total' }, { total }), }); const [searchParams, setSearchParams] = useState({}); @@ -101,7 +99,9 @@ const SupplierAnnualReview: React.FC = () => { total, }); } else { - message.error(response.message || intl.formatMessage({ id: 'supplierAnnualReview.list.getListFailed' })); + message.error( + response.message || intl.formatMessage({ id: 'supplierAnnualReview.list.getListFailed' }), + ); } } catch (error) { console.error('获取审查列表失败:', error); @@ -127,7 +127,7 @@ const SupplierAnnualReview: React.FC = () => { pathname: 'supplierAnnualScoreDetail', state: { id: record.id, - } + }, }); }; @@ -137,15 +137,20 @@ const SupplierAnnualReview: React.FC = () => { pathname: 'supplierAnnualScore', state: { id: record.id, - } + }, }); }; // 获取状态标签 const getStatusTag = (status: string | undefined, statusName: string | undefined) => { - if (!status) return {intl.formatMessage({ id: 'supplierAnnualReview.common.unknownStatus' })}; - const color = AnnualReviewStatusColor[status as keyof typeof AnnualReviewStatusColor] || 'default'; - const text = statusName || AnnualReviewStatusText[status as keyof typeof AnnualReviewStatusText] || intl.formatMessage({ id: 'supplierAnnualReview.common.unknownStatus' }); + if (!status) + return {intl.formatMessage({ id: 'supplierAnnualReview.common.unknownStatus' })}; + const color = + AnnualReviewStatusColor[status as keyof typeof AnnualReviewStatusColor] || 'default'; + const text = + statusName || + AnnualReviewStatusText[status as keyof typeof AnnualReviewStatusText] || + intl.formatMessage({ id: 'supplierAnnualReview.common.unknownStatus' }); return {text}; }; @@ -194,6 +199,28 @@ const SupplierAnnualReview: React.FC = () => { dataIndex: 'deptName', key: 'deptName', width: 150, + ellipsis: { + showTitle: false, + }, + render: (text: string, record: supplierAnnualReview.ReviewRecord) => ( + + {text} + + ), + }, + { + title: '所属单位', + dataIndex: 'tenantName', + key: 'tenantName', + width: 150, + ellipsis: { + showTitle: false, + }, + render: (text: string, record: supplierAnnualReview.ReviewRecord) => ( + + {text} + + ), }, { title: intl.formatMessage({ id: 'supplierAnnualReview.list.reviewer' }), @@ -217,13 +244,13 @@ const SupplierAnnualReview: React.FC = () => { title: intl.formatMessage({ id: 'supplierAnnualReview.list.status' }), dataIndex: 'statusName', key: 'statusName', - width: 100 + width: 100, }, { - title: "提交状态", + title: '提交状态', dataIndex: 'reviewStatusName', key: 'reviewStatusName', - width: 100 + width: 100, }, { title: intl.formatMessage({ id: 'supplierAnnualReview.common.operation' }), @@ -232,20 +259,12 @@ const SupplierAnnualReview: React.FC = () => { align: 'center' as const, render: (_: unknown, record: supplierAnnualReview.ReviewRecord) => ( - {/* 只有待审核状态的可以打分 */} - {record.status !== "0" && record.reviewStatus === "0" && ( - )} @@ -260,10 +279,7 @@ const SupplierAnnualReview: React.FC = () => { const params: AnnualReviewSearchParams = { ...rest }; if (timeRange && timeRange.length === 2) { - params.timeRange = [ - timeRange[0].format('YYYY-MM-DD'), - timeRange[1].format('YYYY-MM-DD') - ]; + params.timeRange = [timeRange[0].format('YYYY-MM-DD'), timeRange[1].format('YYYY-MM-DD')]; } fetchReviewList(1, pagination.pageSize, params); @@ -286,29 +302,46 @@ const SupplierAnnualReview: React.FC = () => { layout="inline" className="filter-form" > - - + + - - {reviewStatus.map((item) => ( - + ))} - + - diff --git a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManage.tsx b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManage.tsx index b9d4638..691ef56 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManage.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManage.tsx @@ -1,22 +1,7 @@ import React, { useState, useEffect } from 'react'; -import { - Table, - Button, - Input, - message, - Space, - Form, - DatePicker, - Select, - Tag, - Tooltip, -} from 'antd'; +import { Table, Button, Input, message, Space, Form, DatePicker, Select, Tag, Tooltip } from 'antd'; import { history, useIntl, FormattedMessage } from 'umi'; -import { - SearchOutlined, - DeleteOutlined, - PlusOutlined, -} from '@ant-design/icons'; +import { SearchOutlined, DeleteOutlined, PlusOutlined } from '@ant-design/icons'; import { getAnnualTaskList } from '@/servers/api/supplierAnnual'; import { AnnualTaskStatus, @@ -66,7 +51,9 @@ const SupplierAnnualTaskManage: React.FC = () => { total: res.data?.total || 0, }); } else { - message.error(res.message || intl.formatMessage({ id: 'supplierAnnualTaskManage.message.listFailed' })); + message.error( + res.message || intl.formatMessage({ id: 'supplierAnnualTaskManage.message.listFailed' }), + ); } } catch (error) { console.error('获取列表失败:', error); @@ -166,7 +153,7 @@ const SupplierAnnualTaskManage: React.FC = () => { index + 1 + (pagination.current - 1) * pagination.pageSize, }, { - title: "年审主题", + title: '年审主题', dataIndex: 'annualreviewTheme', key: 'annualreviewTheme', ellipsis: { @@ -180,27 +167,48 @@ const SupplierAnnualTaskManage: React.FC = () => { }, { title: , + dataIndex: 'orgName', + key: 'orgName', + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), + }, + { + title: '发起部门', dataIndex: 'deptName', key: 'deptName', width: 150, + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), }, { - title: "年审开始时间", + title: '年审开始时间', dataIndex: 'startTime', key: 'startTime', width: 140, }, { - title: "年审结束时间", + title: '年审结束时间', dataIndex: 'endTime', key: 'endTime', width: 140, }, { - title: "年审状态", + title: '年审状态', dataIndex: 'statusName', key: 'statusName', - width: 100 + width: 100, }, { title: , @@ -238,7 +246,7 @@ const SupplierAnnualTaskManage: React.FC = () => { diff --git a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx index 39c72e5..9bc50e9 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx @@ -1,26 +1,19 @@ import React, { useState, useEffect } from 'react'; import { history, useIntl } from 'umi'; -import { - Button, - Table, - Space, - message, - Input, - Select, - Form, - Tooltip, - Tag, - Modal, -} from 'antd'; +import { Button, Table, Space, message, Input, Select, Form, Tooltip, Tag, Modal } from 'antd'; import type { TablePaginationConfig } from 'antd'; -import { - PlusOutlined, - DeleteOutlined, - SearchOutlined, -} from '@ant-design/icons'; +import { PlusOutlined, DeleteOutlined, SearchOutlined } from '@ant-design/icons'; import CategorySelector from '@/components/TreeCategorySelector'; -import { getAnnualTemplateList, enableAnnualTemplate, disableAnnualTemplate } from '@/servers/api/supplierAnnual'; -import { AnnualTemplateStatus, AnnualTemplateStatusText, AnnualTemplateStatusColor } from '@/dicts/supplierAnnualDict'; +import { + getAnnualTemplateList, + enableAnnualTemplate, + disableAnnualTemplate, +} from '@/servers/api/supplierAnnual'; +import { + AnnualTemplateStatus, + AnnualTemplateStatusText, + AnnualTemplateStatusColor, +} from '@/dicts/supplierAnnualDict'; import AccessDepartmentSelect from '@/components/AccessDepartmentSelect'; const { Option } = Select; @@ -38,18 +31,20 @@ const SupplierAnnualTemplateManage: React.FC = () => { const [loading, setLoading] = useState(false); const [form] = Form.useForm(); - const [templateData, setTemplateData] = useState([]); + const [templateData, setTemplateData] = useState( + [], + ); const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0, showSizeChanger: true, showQuickJumper: true, - showTotal: (total) => intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.total' }, { total }), + showTotal: (total) => + intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.total' }, { total }), }); const [searchParams, setSearchParams] = useState({}); - // 获取模板列表 const fetchTemplateList = async ( current = 1, @@ -94,7 +89,10 @@ const SupplierAnnualTemplateManage: React.FC = () => { total, }); } else { - message.error(response.message || intl.formatMessage({ id: 'supplierAnnualTemplateManage.list.getListFailed' })); + message.error( + response.message || + intl.formatMessage({ id: 'supplierAnnualTemplateManage.list.getListFailed' }), + ); } } catch (error) { console.error('获取模板列表失败:', error); @@ -115,7 +113,7 @@ const SupplierAnnualTemplateManage: React.FC = () => { pathname: 'supplierAnnualTemplateManageDetail', state: { id: record.id, - } + }, }); }; @@ -123,7 +121,9 @@ const SupplierAnnualTemplateManage: React.FC = () => { const handleEnableTemplate = (id: string) => { Modal.confirm({ title: intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.enableConfirmTitle' }), - content: intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.enableConfirmContent' }), + content: intl.formatMessage({ + id: 'supplierAnnualTemplateManage.modal.enableConfirmContent', + }), okText: intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.confirm' }), cancelText: intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.cancel' }), onOk: async () => { @@ -131,18 +131,25 @@ const SupplierAnnualTemplateManage: React.FC = () => { setLoading(true); const res = await enableAnnualTemplate(id); if (res.success) { - message.success(intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.enableSuccess' })); + message.success( + intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.enableSuccess' }), + ); fetchTemplateList(pagination.current, pagination.pageSize, searchParams); } else { - message.error(res.message || intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.enableFailed' })); + message.error( + res.message || + intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.enableFailed' }), + ); } } catch (error) { console.error('启用模板失败:', error); - message.error(intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.enableFailed' })); + message.error( + intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.enableFailed' }), + ); } finally { setLoading(false); } - } + }, }); }; @@ -150,7 +157,9 @@ const SupplierAnnualTemplateManage: React.FC = () => { const handleDisableTemplate = (id: string) => { Modal.confirm({ title: intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.disableConfirmTitle' }), - content: intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.disableConfirmContent' }), + content: intl.formatMessage({ + id: 'supplierAnnualTemplateManage.modal.disableConfirmContent', + }), okText: intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.confirm' }), cancelText: intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.cancel' }), onOk: async () => { @@ -158,18 +167,25 @@ const SupplierAnnualTemplateManage: React.FC = () => { setLoading(true); const res = await disableAnnualTemplate(id); if (res.success) { - message.success(intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.disableSuccess' })); + message.success( + intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.disableSuccess' }), + ); fetchTemplateList(pagination.current, pagination.pageSize, searchParams); } else { - message.error(res.message || intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.disableFailed' })); + message.error( + res.message || + intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.disableFailed' }), + ); } } catch (error) { console.error('禁用模板失败:', error); - message.error(intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.disableFailed' })); + message.error( + intl.formatMessage({ id: 'supplierAnnualTemplateManage.modal.disableFailed' }), + ); } finally { setLoading(false); } - } + }, }); }; @@ -179,16 +195,22 @@ const SupplierAnnualTemplateManage: React.FC = () => { pathname: 'supplierAnnualTemplateManageAdd', state: { isEdit: true, - editData: record - } + editData: record, + }, }); }; // 获取状态标签 const getStatusTag = (status: string | undefined) => { - if (!status) return {intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.unknownStatus' })}; - const color = AnnualTemplateStatusColor[status as keyof typeof AnnualTemplateStatusColor] || 'default'; - const text = AnnualTemplateStatusText[status as keyof typeof AnnualTemplateStatusText] || intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.unknownStatus' }); + if (!status) + return ( + {intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.unknownStatus' })} + ); + const color = + AnnualTemplateStatusColor[status as keyof typeof AnnualTemplateStatusColor] || 'default'; + const text = + AnnualTemplateStatusText[status as keyof typeof AnnualTemplateStatusText] || + intl.formatMessage({ id: 'supplierAnnualTemplateManage.common.unknownStatus' }); return {text}; }; @@ -243,6 +265,14 @@ const SupplierAnnualTemplateManage: React.FC = () => { dataIndex: 'deptName', key: 'deptName', width: 120, + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), }, { title: intl.formatMessage({ id: 'supplierAnnualTemplateManage.list.createTime' }), @@ -277,15 +307,22 @@ const SupplierAnnualTemplateManage: React.FC = () => { {/* 禁用状态显示启用按钮 草稿状态显示启用按钮 */} - {(record.status === AnnualTemplateStatus.DISABLED || record.status === AnnualTemplateStatus.DRAFT) && ( + {(record.status === AnnualTemplateStatus.DISABLED || + record.status === AnnualTemplateStatus.DRAFT) && ( )} {/* 启用状态显示禁用按钮 草稿状态显示禁用按钮 */} - {(record.status === AnnualTemplateStatus.ENABLED || record.status === AnnualTemplateStatus.DRAFT) && ( - )} @@ -327,25 +364,34 @@ const SupplierAnnualTemplateManage: React.FC = () => { layout="inline" className="filter-form" > - - + + - + - - + + - diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx index 5b209f6..dbfcb5e 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx @@ -225,7 +225,6 @@ const SupplierEvaluateResult: React.FC = () => { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.categoryName' }), dataIndex: 'categoryName', key: 'categoryName', - width: 120, ellipsis: { showTitle: false, }, @@ -240,6 +239,20 @@ const SupplierEvaluateResult: React.FC = () => { }, { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.deptName' }), + dataIndex: 'orgName', + key: 'orgName', + width: 180, + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), + }, + { + title: "发起部门", dataIndex: 'deptName', key: 'deptName', width: 180, @@ -256,25 +269,21 @@ const SupplierEvaluateResult: React.FC = () => { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.startTime' }), dataIndex: 'startTime', key: 'startTime', - width: 120, }, { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.endTime' }), dataIndex: 'endTime', key: 'endTime', - width: 120, }, { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.statusName' }), dataIndex: 'statusName', key: 'statusName', - width: 100, }, { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.approveName' }), dataIndex: 'approveStatus', key: 'approveStatus', - width: 100, render: (text: string, record: any) => (
{approveTypeList.find((item) => item.code === text)?.dicName || '-'}
), @@ -282,7 +291,8 @@ const SupplierEvaluateResult: React.FC = () => { { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.action' }), key: 'action', - width: 100, + width: 150, + fixed: 'right', align: 'center' as const, render: (_: unknown, record: SupplierEvaluateResult.EvaluateTaskItem) => ( diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx index 07a3c66..f09f845 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx @@ -232,6 +232,20 @@ const SupplierEvaluateResultScoreByList: React.FC = () => { }, { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.deptName' }), + dataIndex: 'orgName', + key: 'orgName', + width: 150, + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), + }, + { + title: "发起部门", dataIndex: 'deptName', key: 'deptName', width: 150, diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx index 255e608..3626c13 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx @@ -16,13 +16,11 @@ import { import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { history, useIntl } from 'umi'; import styles from './supplierEvaluateScore.less'; -import { - getSupplierDimension, - getTaskPage, -} from '@/servers/api/supplierEvaluate'; +import { getSupplierDimension, getTaskPage } from '@/servers/api/supplierEvaluate'; import { getDictList } from '@/servers/api/dicts'; import type { DictItem } from '@/servers/api/dicts'; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; +import e from 'express'; const { Title } = Typography; const { TabPane } = Tabs; @@ -36,7 +34,7 @@ const SupplierEvaluateScore: React.FC = () => { // 新增状态 const [activeTab, setActiveTab] = useState('supplier'); const [supplierTableData, setSupplierTableData] = useState< - SupplierEvaluateScore.SupplierDimensionResponse[] + SupplierEvaluateScore.SupplierDimensionResponse[] >([]); const [taskTableData, setTaskTableData] = useState([]); const [supplierTableLoading, setSupplierTableLoading] = useState(false); @@ -47,7 +45,7 @@ const SupplierEvaluateScore: React.FC = () => { total: 0, }); const [evaluateStatus, setEvaluateStatus] = useState([]); -/* + /* name :关键字 startTime：开始时间 endTime:结束时间 @@ -80,7 +78,7 @@ status：状态 pageNo: pagination.current, pageSize: pagination.pageSize, }, - selectBy:"user", + selectBy: 'user', evaluateTheme: values.name || undefined, status: values.status || undefined, }; @@ -109,12 +107,17 @@ status：状态 total: response.data.total || 0, }); } else { - message.error(response.message || intl.formatMessage({ id: 'supplierEvaluateScore.message.getSupplierListFailed' })); + message.error( + response.message || + intl.formatMessage({ id: 'supplierEvaluateScore.message.getSupplierListFailed' }), + ); setSupplierTableData([]); } } catch (error) { console.error('获取供应商列表失败:', error); - message.error(intl.formatMessage({ id: 'supplierEvaluateScore.message.getSupplierListFailed' })); + message.error( + intl.formatMessage({ id: 'supplierEvaluateScore.message.getSupplierListFailed' }), + ); setSupplierTableData([]); } finally { setSupplierTableLoading(false); @@ -135,7 +138,10 @@ status：状态 total: response.data.total || 0, }); } else { - message.error(response.message || intl.formatMessage({ id: 'supplierEvaluateScore.message.getTaskListFailed' })); + message.error( + response.message || + intl.formatMessage({ id: 'supplierEvaluateScore.message.getTaskListFailed' }), + ); setTaskTableData([]); } } catch (error) { @@ -225,7 +231,7 @@ status：状态 state.record.evaluateTaskId = record.id; history.push({ pathname: '/supplierEvaluate/supplierEvaluateResultInfo', - state: {record}, + state: { record }, }); return; } @@ -282,8 +288,29 @@ status：状态 }, { title: intl.formatMessage({ id: 'supplierEvaluateScore.column.tenantName' }), + dataIndex: 'orgName', + key: 'orgName', + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), + }, + { + title: '发起部门', dataIndex: 'deptName', key: 'deptName', + ellipsis: { + showTitle: false, + }, + render: (text: string) => ( + + {text} + + ), }, { title: intl.formatMessage({ id: 'supplierEvaluateScore.column.startTime' }), @@ -309,6 +336,7 @@ status：状态 title: intl.formatMessage({ id: 'supplierEvaluateScore.column.submissionTime' }), dataIndex: 'reviewTime', key: 'reviewTime', + width: 200, }, { title: intl.formatMessage({ id: 'supplierEvaluateScore.column.action' }), @@ -318,11 +346,12 @@ status：状态 - {record.status === '1' && record.reviewStatus !== '1' && ( // 只有待评分状态才显示打分按钮 - - )} + {record.status === '1' && + record.reviewStatus !== '1' && ( // 只有待评分状态才显示打分按钮 + + )} ), }, @@ -384,23 +413,42 @@ status：状态
- + - + - - {evaluateStatus.map((item) => (