评价结果和评价打分(按评价任务)列表接口增加参数selectBy
This commit is contained in:
@ -97,6 +97,7 @@ const supplierAnnualTaskManage: SupplierTaskModelType = {
|
|||||||
id: item.supplierId,
|
id: item.supplierId,
|
||||||
name: item.supplierName,
|
name: item.supplierName,
|
||||||
evaluators: item.userList,
|
evaluators: item.userList,
|
||||||
|
unifiedCode: item.socialCreditCode
|
||||||
})),
|
})),
|
||||||
|
|
||||||
// 供应商IDs与用户IDs
|
// 供应商IDs与用户IDs
|
||||||
|
@ -97,6 +97,7 @@ const SupplierTaskModel: SupplierTaskModelType = {
|
|||||||
id: item.supplierId,
|
id: item.supplierId,
|
||||||
name: item.supplierName,
|
name: item.supplierName,
|
||||||
evaluators: item.userList,
|
evaluators: item.userList,
|
||||||
|
unifiedCode: item.socialCreditCode
|
||||||
})),
|
})),
|
||||||
|
|
||||||
// 指标列表
|
// 指标列表
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { Table, Space, Button, Modal, Tooltip } from 'antd';
|
import { Table, Space, Button, Modal, Tooltip } from 'antd';
|
||||||
import { useIntl, FormattedMessage } from 'umi';
|
import { useIntl, FormattedMessage } from 'umi';
|
||||||
|
import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext';
|
||||||
|
|
||||||
interface SupplierTableProps {
|
interface SupplierTableProps {
|
||||||
suppliers: supplierAnnualTaskManage.SupplierItem[]; // 供应商数据列表
|
suppliers: supplierAnnualTaskManage.SupplierItem[]; // 供应商数据列表
|
||||||
@ -22,7 +23,7 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
|
|||||||
mode,
|
mode,
|
||||||
}) => {
|
}) => {
|
||||||
const intl = useIntl();
|
const intl = useIntl();
|
||||||
|
const supplierDetailModal = useSupplierDetailModal();
|
||||||
// 表格行选择配置
|
// 表格行选择配置
|
||||||
const rowSelection = {
|
const rowSelection = {
|
||||||
selectedRowKeys,
|
selectedRowKeys,
|
||||||
@ -62,16 +63,24 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
|
|||||||
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.supplierName" />,
|
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.supplierName" />,
|
||||||
dataIndex: 'supplierName',
|
dataIndex: 'supplierName',
|
||||||
key: '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" />,
|
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.socialCreditCode" />,
|
||||||
dataIndex: 'socialCreditCode',
|
dataIndex: 'socialCreditCode',
|
||||||
key: 'socialCreditCode',
|
key: 'socialCreditCode',
|
||||||
|
ellipsis: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.categoryName" />,
|
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.categoryName" />,
|
||||||
dataIndex: 'categoryName',
|
dataIndex: 'categoryName',
|
||||||
key: 'categoryName',
|
key: 'categoryName',
|
||||||
|
ellipsis: true,
|
||||||
render: (categoryName: string) => (
|
render: (categoryName: string) => (
|
||||||
<Tooltip placement="topLeft" title={categoryName}>
|
<Tooltip placement="topLeft" title={categoryName}>
|
||||||
{categoryName || '-'}
|
{categoryName || '-'}
|
||||||
@ -82,16 +91,19 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
|
|||||||
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.deptName" />,
|
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.deptName" />,
|
||||||
dataIndex: 'deptName',
|
dataIndex: 'deptName',
|
||||||
key: 'deptName',
|
key: 'deptName',
|
||||||
|
ellipsis: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.evaluatorCount" />,
|
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.evaluatorCount" />,
|
||||||
align: 'center' as const,
|
|
||||||
dataIndex: 'evaluatorCount',
|
dataIndex: 'evaluatorCount',
|
||||||
key: 'evaluatorCount',
|
key: 'evaluatorCount',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.action" />,
|
title: <FormattedMessage id="supplierAnnualTaskManage.supplierTable.action" />,
|
||||||
key: 'action',
|
key: 'action',
|
||||||
|
width: 250,
|
||||||
|
align: 'center' as const,
|
||||||
|
ellipsis: true,
|
||||||
render: (_: any, record: supplierAnnualTaskManage.SupplierItem) => (
|
render: (_: any, record: supplierAnnualTaskManage.SupplierItem) => (
|
||||||
<Space>
|
<Space>
|
||||||
<Button
|
<Button
|
||||||
|
@ -74,6 +74,7 @@ const SupplierEvaluateResult: React.FC = () => {
|
|||||||
pageNo: current,
|
pageNo: current,
|
||||||
pageSize: pageSize,
|
pageSize: pageSize,
|
||||||
},
|
},
|
||||||
|
selectBy: "create",
|
||||||
};
|
};
|
||||||
|
|
||||||
// 添加搜索条件
|
// 添加搜索条件
|
||||||
|
@ -80,6 +80,7 @@ status:状态
|
|||||||
pageNo: pagination.current,
|
pageNo: pagination.current,
|
||||||
pageSize: pagination.pageSize,
|
pageSize: pagination.pageSize,
|
||||||
},
|
},
|
||||||
|
selectBy:"user",
|
||||||
evaluateTheme: values.name || undefined,
|
evaluateTheme: values.name || undefined,
|
||||||
status: values.status || undefined,
|
status: values.status || undefined,
|
||||||
};
|
};
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import { Table, Space, Button, Tag, Modal, Tooltip } from 'antd';
|
import { Table, Space, Button, Tag, Modal, Tooltip } from 'antd';
|
||||||
import { useIntl } from 'umi';
|
import { useIntl } from 'umi';
|
||||||
|
import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext';
|
||||||
|
|
||||||
interface SupplierTableProps {
|
interface SupplierTableProps {
|
||||||
suppliers: SupplierTaskManage.SupplierItem[]; // 供应商数据列表
|
suppliers: SupplierTaskManage.SupplierItem[]; // 供应商数据列表
|
||||||
@ -22,7 +23,7 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
|
|||||||
mode,
|
mode,
|
||||||
}) => {
|
}) => {
|
||||||
const intl = useIntl();
|
const intl = useIntl();
|
||||||
|
const supplierDetailModal = useSupplierDetailModal();
|
||||||
// 表格行选择配置
|
// 表格行选择配置
|
||||||
const rowSelection = {
|
const rowSelection = {
|
||||||
selectedRowKeys,
|
selectedRowKeys,
|
||||||
@ -53,16 +54,24 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
|
|||||||
title: intl.formatMessage({ id: 'supplierTaskManage.column.supplierName' }),
|
title: intl.formatMessage({ id: 'supplierTaskManage.column.supplierName' }),
|
||||||
dataIndex: 'supplierName',
|
dataIndex: 'supplierName',
|
||||||
key: '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' }),
|
title: intl.formatMessage({ id: 'supplierTaskManage.column.socialCreditCode' }),
|
||||||
dataIndex: 'socialCreditCode',
|
dataIndex: 'socialCreditCode',
|
||||||
key: 'socialCreditCode',
|
key: 'socialCreditCode',
|
||||||
|
ellipsis: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: intl.formatMessage({ id: 'supplierTaskManage.column.categoryName' }),
|
title: intl.formatMessage({ id: 'supplierTaskManage.column.categoryName' }),
|
||||||
dataIndex: 'categoryName',
|
dataIndex: 'categoryName',
|
||||||
key: 'categoryName',
|
key: 'categoryName',
|
||||||
|
ellipsis: true,
|
||||||
render: (categoryName: string) => (
|
render: (categoryName: string) => (
|
||||||
<Tooltip placement="topLeft" title={categoryName}>
|
<Tooltip placement="topLeft" title={categoryName}>
|
||||||
{categoryName || '-'}
|
{categoryName || '-'}
|
||||||
@ -73,6 +82,7 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
|
|||||||
title: intl.formatMessage({ id: 'supplierTaskManage.column.deptName' }),
|
title: intl.formatMessage({ id: 'supplierTaskManage.column.deptName' }),
|
||||||
dataIndex: 'deptName',
|
dataIndex: 'deptName',
|
||||||
key: 'deptName',
|
key: 'deptName',
|
||||||
|
ellipsis: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: intl.formatMessage({ id: 'supplierTaskManage.column.evaluatorCount' }),
|
title: intl.formatMessage({ id: 'supplierTaskManage.column.evaluatorCount' }),
|
||||||
@ -83,6 +93,9 @@ const SupplierTable: React.FC<SupplierTableProps> = ({
|
|||||||
{
|
{
|
||||||
title: intl.formatMessage({ id: 'supplierTaskManage.column.action' }),
|
title: intl.formatMessage({ id: 'supplierTaskManage.column.action' }),
|
||||||
key: 'action',
|
key: 'action',
|
||||||
|
align: 'center' as const,
|
||||||
|
width: 250,
|
||||||
|
ellipsis: true,
|
||||||
render: (_: any, record: SupplierTaskManage.SupplierItem) => (
|
render: (_: any, record: SupplierTaskManage.SupplierItem) => (
|
||||||
<Space>
|
<Space>
|
||||||
<Button
|
<Button
|
||||||
|
@ -14,6 +14,7 @@ declare namespace SupplierEvaluateResult {
|
|||||||
status?: string;
|
status?: string;
|
||||||
startTime?: string;
|
startTime?: string;
|
||||||
endTime?: string;
|
endTime?: string;
|
||||||
|
selectBy?: string;
|
||||||
[key: string]: any;
|
[key: string]: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -111,6 +111,7 @@ declare namespace SupplierEvaluateScore {
|
|||||||
endTime?: string;
|
endTime?: string;
|
||||||
evaluateTheme?: string;
|
evaluateTheme?: string;
|
||||||
evaluateYear?: string;
|
evaluateYear?: string;
|
||||||
|
selectBy?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface TaskPageResponse {
|
interface TaskPageResponse {
|
||||||
|
@ -131,6 +131,7 @@ declare namespace SupplierTaskManage {
|
|||||||
deptName: string;
|
deptName: string;
|
||||||
supplierId: string;
|
supplierId: string;
|
||||||
supplierName: string;
|
supplierName: string;
|
||||||
|
socialCreditCode?: string; // api返回数据的统一社会信用代码
|
||||||
userList: PersonnelItem[];
|
userList: PersonnelItem[];
|
||||||
}[],
|
}[],
|
||||||
[property: string]: any;
|
[property: string]: any;
|
||||||
|
Reference in New Issue
Block a user