diff --git a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/BasicInfoStep.tsx b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/BasicInfoStep.tsx index 920ccb6..a04980e 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/BasicInfoStep.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/BasicInfoStep.tsx @@ -43,7 +43,7 @@ const BasicInfoStepComponent = (props: BasicInfoStepProps) => { const fetchTemplates = async () => { setLoading(true); try { - const response = await getAllAnnualTemplates(); + const response = await getAllAnnualTemplates({ status: '1' }); if (response.success && response.data) { setTemplates(response.data); } diff --git a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManageAdd.tsx b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManageAdd.tsx index 1a8c419..a8386af 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManageAdd.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManageAdd.tsx @@ -1,13 +1,13 @@ import React, { useRef, useEffect } from 'react'; import { Card, Steps, Button, message, Space, Row, Col, Modal } from 'antd'; -import { connect, ConnectProps, history, Dispatch } from 'umi'; +import { connect, history } from 'umi'; +import type { ConnectProps, Dispatch } from 'umi'; import { ArrowLeftOutlined, SaveOutlined } from '@ant-design/icons'; import BasicInfoStep from './components/BasicInfoStep'; import SupplierSelectStep from './components/SupplierSelectStep'; import EvaluatorSelectStep from './components/EvaluatorSelectStep'; import styles from './supplierAnnualTaskManageAdd.less'; -import { TaskNotifyLowerUnits } from '@/dicts/supplierTaskDict'; -import { SupplierTaskModelState } from '@/models/supplierAnnualTaskManage'; +import type { SupplierTaskModelState } from '@/models/supplierAnnualTaskManage'; const { Step } = Steps; diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx index 2510c32..41c3c05 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx @@ -179,12 +179,6 @@ const SupplierEvaluateResult: React.FC = () => { }); }; - // 获取状态标签 - const getStatusTag = (status: string) => { - const color = TaskStatusColor[status as keyof typeof TaskStatusColor] || 'default'; - const text = TaskStatusText[status as keyof typeof TaskStatusText] || '未知状态'; - return {text}; - }; const columns = [ { @@ -253,6 +247,12 @@ const SupplierEvaluateResult: React.FC = () => { key: 'statusName', width: 100, }, + { + title: '审核状态', + dataIndex: 'approveName', + key: 'approveName', + width: 100, + }, { title: '操作', key: 'action', diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx index 57057bb..00c9f37 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx @@ -22,7 +22,7 @@ const SupplierEvaluateResultByZb: React.FC = () => { const [scoreRecord, setScoreRecord] = useState(null); const [parentRecord, setParentRecord] = useState(null); const [supplierRecord, setSupplierRecord] = useState(null); - const [indicatorDetail, setIndicatorDetail] = useState(null); + const [indicatorDetail, setIndicatorDetail] = useState(null); // 获取上级页面传递的数据 useEffect(() => { diff --git a/src/pages/supplierEvaluateManage/supplierTaskManage/components/BasicInfoStep.tsx b/src/pages/supplierEvaluateManage/supplierTaskManage/components/BasicInfoStep.tsx index 366959a..7eb59f6 100644 --- a/src/pages/supplierEvaluateManage/supplierTaskManage/components/BasicInfoStep.tsx +++ b/src/pages/supplierEvaluateManage/supplierTaskManage/components/BasicInfoStep.tsx @@ -43,7 +43,7 @@ const BasicInfoStepComponent = (props: BasicInfoStepProps) => { const fetchTemplates = async () => { setLoading(true); try { - const response = await getAllTemplates(); + const response = await getAllTemplates({ status: '1' }); if (response.success && response.data) { setTemplates(response.data); } diff --git a/src/servers/api/supplierAnnual.ts b/src/servers/api/supplierAnnual.ts index 2fba314..708da37 100644 --- a/src/servers/api/supplierAnnual.ts +++ b/src/servers/api/supplierAnnual.ts @@ -18,9 +18,10 @@ export async function getAnnualTemplateList(params: supplierAnnualTemplateManage * 获取所有供应商年度模板列表 * @returns Promise */ -export async function getAllAnnualTemplates() { +export async function getAllAnnualTemplates(params?: {status: string}) { return request('/annualreview/template/getAllList', { method: 'GET', + params }); } diff --git a/src/servers/api/supplierEvaluate.ts b/src/servers/api/supplierEvaluate.ts index 3dee397..13ea062 100644 --- a/src/servers/api/supplierEvaluate.ts +++ b/src/servers/api/supplierEvaluate.ts @@ -3,9 +3,10 @@ import request from '@/utils/request'; * 获取所有模板列表 * @returns 所有模板列表 */ -export async function getAllTemplates() { +export async function getAllTemplates(params?: {status: string}) { return request('/coscoEvaluate/template/getAllList', { method: 'GET', + params }); }