liuc/fe_supplier_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

评价结果和评价打分(按评价任务)列表接口增加参数selectBy

Browse Source
This commit is contained in:
linxd
2025-07-16 16:38:19 +08:00
parent fdd55a9036
commit 40839aadc8
9 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/models/supplierAnnualTaskManage.ts
View File

@ -97,6 +97,7 @@ const supplierAnnualTaskManage: SupplierTaskModelType = {
id: item.supplierId,
name: item.supplierName,
evaluators: item.userList,
unifiedCode: item.socialCreditCode
})),
// 供应商IDs与用户IDs

1
src/models/supplierTaskManage.ts
View File

@ -97,6 +97,7 @@ const SupplierTaskModel: SupplierTaskModelType = {
id: item.supplierId,
name: item.supplierName,
evaluators: item.userList,
unifiedCode: item.socialCreditCode
})),
// 指标列表

16
src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/EvaluatorComponents/SupplierTable.tsx
View File

@ -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

1
src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx
View File

@ -74,6 +74,7 @@ const SupplierEvaluateResult: React.FC = () => {
pageNo: current,
pageSize: pageSize,
},
selectBy: "create",
};
// 添加搜索条件

1
src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx
View File

@ -80,6 +80,7 @@ status：状态
pageNo: pagination.current,
pageSize: pagination.pageSize,
},
selectBy:"user",
evaluateTheme: values.name || undefined,
status: values.status || undefined,
};

15
src/pages/supplierEvaluateManage/supplierTaskManage/components/EvaluatorComponents/SupplierTable.tsx
View File

@ -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

1
src/servers/dao/supplierEvaluateManage/supplierEvaluateResult.d.ts vendored
View File

@ -14,6 +14,7 @@ declare namespace SupplierEvaluateResult {
status?: string;
startTime?: string;
endTime?: string;
selectBy?: string;
[key: string]: any;
}

1
src/servers/dao/supplierEvaluateManage/supplierEvaluateScore.d.ts vendored
View File

@ -111,6 +111,7 @@ declare namespace SupplierEvaluateScore {
endTime?: string;
evaluateTheme?: string;
evaluateYear?: string;
selectBy?: string;
}
interface TaskPageResponse {

1
src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts vendored
View File

@ -131,6 +131,7 @@ declare namespace SupplierTaskManage {
deptName: string;
supplierId: string;
supplierName: string;
socialCreditCode?: string; // api返回数据的统一社会信用代码
userList: PersonnelItem[];
}[],
[property: string]: any;