diff --git a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageAdd.tsx b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageAdd.tsx index cbb47d0..c8d60a4 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageAdd.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageAdd.tsx @@ -79,7 +79,7 @@ const SupplierAnnualTemplateManageAdd: React.FC = ({ breadcrumb, disp const fetchTemplateList = async () => { try { setLoading(true); - const res = await getAllAnnualTemplates({ status: '1' }); + const res = await getAllAnnualTemplates({ status: '1', type: 'currentUnit' }); if (res.success && res.data) { // 如果是修改,需要过滤掉自己 if (location.state?.editData) { @@ -144,7 +144,7 @@ const SupplierAnnualTemplateManageAdd: React.FC = ({ breadcrumb, disp if (location.state?.editData?.id && dispatch) { dispatch({ type: 'breadcrumb/updateBreadcrumbName', - payload: intl.formatMessage({ id: "supplierAnnualTemplateManage.add.edit" }), + payload: intl.formatMessage({ id: 'supplierAnnualTemplateManage.add.edit' }), }); } diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx index c965461..5b209f6 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx @@ -13,17 +13,17 @@ import { message, } from 'antd'; import type { TablePaginationConfig } from 'antd'; -import { - SearchOutlined, - DeleteOutlined, -} from '@ant-design/icons'; +import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { TaskStatusText, TaskStatusColor } from '@/dicts/supplierTaskDict'; import { history, useIntl } from 'umi'; -import { getEvaluateResultList, submitTaskForApproval, supplierChangeApprove } from '@/servers/api/supplierEvaluate'; +import { + getEvaluateResultList, + submitTaskForApproval, + supplierChangeApprove, +} from '@/servers/api/supplierEvaluate'; import { getDictList } from '@/servers/api/dicts'; import type { DictItem } from '@/servers/api/dicts'; - - +import { render } from 'react-dom'; // 扩展评价任务搜索参数类型 interface EvaluateTaskSearchParams { @@ -33,29 +33,26 @@ interface EvaluateTaskSearchParams { [key: string]: any; } - const { Option } = Select; const { RangePicker } = DatePicker; const SupplierEvaluateResult: React.FC = () => { const userId = sessionStorage.getItem('userId') || ''; const intl = useIntl(); - const [loading, setLoading] = useState < boolean > (false); + const [loading, setLoading] = useState(false); const [form] = Form.useForm(); - const [resultData, setResultData] = useState < SupplierEvaluateResult.EvaluateTaskItem[] > ([]); - const [pagination, setPagination] = useState < TablePaginationConfig > ({ + const [resultData, setResultData] = useState([]); + const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0, showSizeChanger: true, showQuickJumper: true, - showTotal: (total) => intl.formatMessage( - { id: 'supplierEvaluateResult.pagination.total' }, - { total } - ), + showTotal: (total) => + intl.formatMessage({ id: 'supplierEvaluateResult.pagination.total' }, { total }), }); - const [searchParams, setSearchParams] = useState < EvaluateTaskSearchParams > ({}); - const [evaluateStatus, setEvaluateStatus] = useState < DictItem[] > ([]); + const [searchParams, setSearchParams] = useState({}); + const [evaluateStatus, setEvaluateStatus] = useState([]); // 获取评价结果列表 const fetchResultList = async ( current = 1, @@ -75,7 +72,7 @@ const SupplierEvaluateResult: React.FC = () => { pageNo: current, pageSize: pageSize, }, - selectBy: "create", + selectBy: 'create', }; // 添加搜索条件 @@ -96,7 +93,7 @@ const SupplierEvaluateResult: React.FC = () => { const { records, total, current: currentPage, size } = response.data; // 处理数据,增加表格需要的key属性 - const formattedData = records.map(record => ({ + const formattedData = records.map((record) => ({ ...record, key: record.id, })); @@ -109,7 +106,10 @@ const SupplierEvaluateResult: React.FC = () => { total, }); } else { - message.error(response.message || intl.formatMessage({ id: 'supplierEvaluateResult.message.fetchFailed' })); + message.error( + response.message || + intl.formatMessage({ id: 'supplierEvaluateResult.message.fetchFailed' }), + ); } } catch (error) { console.error('获取评价结果列表失败:', error); @@ -118,6 +118,7 @@ const SupplierEvaluateResult: React.FC = () => { setLoading(false); } }; + const [approveTypeList, setApproveTypeList] = useState([]); // 首次加载获取数据 useEffect(() => { @@ -127,6 +128,12 @@ const SupplierEvaluateResult: React.FC = () => { setEvaluateStatus(res.data); } }); + // 获取审批状态字典 + getDictList('approve_type').then((res) => { + if (res.success) { + setApproveTypeList(res.data); + } + }); }, []); // 处理表格分页变化 @@ -158,7 +165,7 @@ const SupplierEvaluateResult: React.FC = () => { title: intl.formatMessage({ id: 'supplierEvaluateResult.confirm.title' }), content: intl.formatMessage( { id: 'supplierEvaluateResult.confirm.content' }, - { theme: record.evaluateTheme } + { theme: record.evaluateTheme }, ), okText: intl.formatMessage({ id: 'supplierEvaluateResult.confirm.ok' }), cancelText: intl.formatMessage({ id: 'supplierEvaluateResult.confirm.cancel' }), @@ -166,17 +173,22 @@ const SupplierEvaluateResult: React.FC = () => { try { const response = await submitTaskForApproval(record.id); if (response.success) { - message.success(intl.formatMessage({ id: 'supplierEvaluateResult.message.approveSuccess' })); + message.success( + intl.formatMessage({ id: 'supplierEvaluateResult.message.approveSuccess' }), + ); // 刷新数据 fetchResultList(pagination.current, pagination.pageSize, searchParams); } else { - message.error(response.message || intl.formatMessage({ id: 'supplierEvaluateResult.message.approveFailed' })); + message.error( + response.message || + intl.formatMessage({ id: 'supplierEvaluateResult.message.approveFailed' }), + ); } } catch (error) { console.error('提交审批失败:', error); message.error(intl.formatMessage({ id: 'supplierEvaluateResult.message.approveError' })); } - } + }, }); }; @@ -184,11 +196,10 @@ const SupplierEvaluateResult: React.FC = () => { const handleViewDetail = (record: SupplierEvaluateResult.EvaluateTaskItem) => { history.push({ pathname: 'supplierEvaluateResultInfo', - state: { record } + state: { record }, }); }; - const columns = [ { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.index' }), @@ -219,7 +230,10 @@ const SupplierEvaluateResult: React.FC = () => { showTitle: false, }, render: (text: string) => ( - + {text || intl.formatMessage({ id: 'supplierEvaluateResult.text.unspecified' })} ), @@ -258,9 +272,12 @@ const SupplierEvaluateResult: React.FC = () => { }, { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.approveName' }), - dataIndex: 'approveName', - key: 'approveName', + dataIndex: 'approveStatus', + key: 'approveStatus', width: 100, + render: (text: string, record: any) => ( +
{approveTypeList.find((item) => item.code === text)?.dicName || '-'}
+ ), }, { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.action' }), @@ -278,11 +295,16 @@ const SupplierEvaluateResult: React.FC = () => { )} {record.approveStatus === '0' && userId == '8' && ( - )} @@ -294,27 +316,38 @@ const SupplierEvaluateResult: React.FC = () => { return (
-
- - + + + - + - +