diff --git a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx index 6519286..2f05887 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx @@ -27,7 +27,7 @@ const { Option } = Select; // 搜索参数类型 interface AnnualTemplateSearchParams { templateName?: string; - tenantName?: string; + deptId?: string; categoryId?: string; dateRange?: string[]; [key: string]: any; @@ -81,8 +81,8 @@ const SupplierAnnualTemplateManage: React.FC = () => { if (params.templateName) { requestParams.templateName = params.templateName; } - if (params.tenantName) { - requestParams.tenantName = params.tenantName; + if (params.deptId) { + requestParams.deptId = params.deptId; } if (params.categoryId) { requestParams.categoryId = params.categoryId; @@ -352,7 +352,7 @@ const SupplierAnnualTemplateManage: React.FC = () => { - + - + diff --git a/src/pages/supplierEvaluateManage/supplierTaskManage/supplierTaskManage.tsx b/src/pages/supplierEvaluateManage/supplierTaskManage/supplierTaskManage.tsx index beb0db4..c2d951e 100644 --- a/src/pages/supplierEvaluateManage/supplierTaskManage/supplierTaskManage.tsx +++ b/src/pages/supplierEvaluateManage/supplierTaskManage/supplierTaskManage.tsx @@ -31,51 +31,32 @@ const SupplierTaskManage: React.FC = () => { }, }); - // 获取任务列表 const fetchTaskList = async ( - current = 1, - pageSize = 10, - params: TaskSearchParams = searchParams, + current: number = 1, + pageSize: number = 10, + params: TaskSearchParams, ) => { - // 更新搜索参数状态 - if (params !== searchParams) { - setSearchParams(params); - } - setLoading(true); try { - // 构造请求参数 const requestParams: TaskSearchParams = { + ...params, basePageRequest: { pageNo: current, - pageSize: pageSize, + pageSize, }, }; - // 添加搜索条件 - if (params.evaluateTheme) { - requestParams.evaluateTheme = params.evaluateTheme; - } - if (params.status) { - requestParams.status = params.status; - } - if (params.dateRange && params.dateRange.length === 2) { - requestParams.startTime = params.dateRange[0]; - requestParams.endTime = params.dateRange[1]; - } - const response = await getTaskList(requestParams); if (response.success) { - // 处理返回的数据 const { records, total, current: currentPage, size } = response.data; setTaskData(records); - setPagination({ - ...pagination, + setPagination((prev) => ({ + ...prev, current: currentPage, pageSize: size, - total: total, - }); + total, + })); } else { message.error(response.message || '获取任务列表失败'); } @@ -87,39 +68,67 @@ const SupplierTaskManage: React.FC = () => { } }; - // 首次加载获取数据 useEffect(() => { - fetchTaskList(pagination.current, pagination.pageSize, searchParams); + fetchTaskList(pagination.current!, pagination.pageSize!, searchParams); }, []); - // 处理查看 const handleView = (record: TaskItem) => { - // 跳转到详情页面 history.push(`supplierTaskManageDetail?id=${record.id}`); }; - // 处理编辑 const handleEdit = (record: TaskItem) => { - // 跳转到编辑页面(复用新增页面) history.push(`supplierTaskManageAdd?id=${record.id}&mode=edit`); }; - // 处理分工 const handleDivision = (record: TaskItem) => { - // 跳转到分工页面 history.push(`supplierTaskManageAdd?id=${record.id}&mode=division`); }; - // 获取状态标签 const getStatusTag = (status: string) => { const color = TaskStatusColor[status as keyof typeof TaskStatusColor] || 'default'; const text = TaskStatusText[status as keyof typeof TaskStatusText] || '未知状态'; return {text}; }; - // 处理表格分页变化 const handleTableChange = (newPagination: TablePaginationConfig) => { - fetchTaskList(newPagination.current, newPagination.pageSize, searchParams); + fetchTaskList(newPagination.current!, newPagination.pageSize!, searchParams); + }; + + const handleSearch = (values: any) => { + const { evaluateTheme, status, dateRange } = values; + + const params: TaskSearchParams = { + basePageRequest: { + pageNo: 1, + pageSize: pagination.pageSize!, + }, + evaluateTheme, + status, + }; + + if (dateRange && dateRange.length === 2) { + params.startTime = dateRange[0].format('YYYY-MM-DD'); + params.endTime = dateRange[1].format('YYYY-MM-DD'); + } + + setSearchParams(params); + fetchTaskList(1, pagination.pageSize!, params); + }; + + const handleReset = () => { + form.resetFields(); + const resetParams: TaskSearchParams = { + basePageRequest: { + pageNo: 1, + pageSize: pagination.pageSize!, + }, + }; + setSearchParams(resetParams); + fetchTaskList(1, pagination.pageSize!, resetParams); + }; + + const handleAdd = () => { + history.push('supplierTaskManageAdd'); }; const columns = [ @@ -175,41 +184,16 @@ const SupplierTaskManage: React.FC = () => { align: 'center' as const, render: (_: unknown, record: TaskItem) => ( - + {record.division == '1' && ( - + )} - - + ), }, ]; - // 处理添加 - const handleAdd = () => { - // 跳转到新增页面 - history.push('supplierTaskManageAdd'); - }; - - // 处理搜索 - const handleSearch = (values: any) => { - const { dateRange, ...rest } = values; - const params: SupplierEvaluate.TaskSearchParams = { ...rest }; - - if (dateRange && dateRange.length === 2) { - params.dateRange = [dateRange[0].format('YYYY-MM-DD'), dateRange[1].format('YYYY-MM-DD')]; - } - - fetchTaskList(1, pagination.pageSize, searchParams); - }; - return (
@@ -234,32 +218,12 @@ const SupplierTaskManage: React.FC = () => { - - + +
- +