diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx index 6ae640d..4029a07 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx @@ -17,9 +17,9 @@ import { SearchOutlined, DeleteOutlined, } from '@ant-design/icons'; -import { TaskStatusText, TaskStatusColor } from '@/dicts/supplierTaskDict'; +import { TaskStatusText, TaskStatusColor } from '@/dicts/supplierTaskDict'; import { history, useIntl } from 'umi'; -import { getEvaluateResultList, submitTaskForApproval } 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'; @@ -38,11 +38,12 @@ const { Option } = Select; const { RangePicker } = DatePicker; const SupplierEvaluateResult: React.FC = () => { + const userId = sessionStorage.getItem('userId') || ''; const intl = useIntl(); - const [loading, setLoading] = useState(false); + const [loading, setLoading] = useState < boolean > (false); const [form] = Form.useForm(); - const [resultData, setResultData] = useState< SupplierEvaluateResult.EvaluateTaskItem []>([]); - const [pagination, setPagination] = useState({ + const [resultData, setResultData] = useState < SupplierEvaluateResult.EvaluateTaskItem[] > ([]); + const [pagination, setPagination] = useState < TablePaginationConfig > ({ current: 1, pageSize: 10, total: 0, @@ -53,8 +54,8 @@ const SupplierEvaluateResult: React.FC = () => { { total } ), }); - const [searchParams, setSearchParams] = useState({}); - const [evaluateStatus, setEvaluateStatus] = useState([]); + const [searchParams, setSearchParams] = useState < EvaluateTaskSearchParams > ({}); + const [evaluateStatus, setEvaluateStatus] = useState < DictItem[] > ([]); // 获取评价结果列表 const fetchResultList = async ( current = 1, @@ -152,7 +153,7 @@ const SupplierEvaluateResult: React.FC = () => { }; // 处理提交审批 - const handleApprove = (record: SupplierEvaluateResult.EvaluateTaskItem ) => { + const handleApprove = (record: SupplierEvaluateResult.EvaluateTaskItem) => { Modal.confirm({ title: intl.formatMessage({ id: 'supplierEvaluateResult.confirm.title' }), content: intl.formatMessage( @@ -180,7 +181,7 @@ const SupplierEvaluateResult: React.FC = () => { }; // 查看详情 - 修改为跳转到详情页 - const handleViewDetail = (record: SupplierEvaluateResult.EvaluateTaskItem ) => { + const handleViewDetail = (record: SupplierEvaluateResult.EvaluateTaskItem) => { history.push({ pathname: 'supplierEvaluateResultInfo', state: { record } @@ -191,7 +192,7 @@ const SupplierEvaluateResult: React.FC = () => { const columns = [ { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.index' }), - render: (_: any, __: SupplierEvaluateResult.EvaluateTaskItem , index: number) => + render: (_: any, __: SupplierEvaluateResult.EvaluateTaskItem, index: number) => (pagination.current! - 1) * pagination.pageSize! + index + 1, width: 80, }, @@ -266,7 +267,7 @@ const SupplierEvaluateResult: React.FC = () => { key: 'action', width: 100, align: 'center' as const, - render: (_: unknown, record: SupplierEvaluateResult.EvaluateTaskItem ) => ( + render: (_: unknown, record: SupplierEvaluateResult.EvaluateTaskItem) => ( )} + {record.approveStatus === '0' && userId == '8' && ( + + )} ), }, diff --git a/src/servers/api/supplierEvaluate.ts b/src/servers/api/supplierEvaluate.ts index 63b4e66..3b8c579 100644 --- a/src/servers/api/supplierEvaluate.ts +++ b/src/servers/api/supplierEvaluate.ts @@ -361,3 +361,5 @@ export async function submitTaskForApproval(id: string) { data: { id }, }); } + +export const supplierChangeApprove = (data: { workFlowId:string; approveStatus:string }) => request.post('/synchronous/evaluateApprove', { data });