删减文件

src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx

@@ -26,16 +26,15 @@ import { TaskStatus, TaskStatusText, TaskStatusColor, TaskType, TaskTypeText } f
 import moment from 'moment';
 import styles from './supplierEvaluateResult.less';
 import { history } from 'umi';
+import { getEvaluateResultList } from '@/servers/api/supplierEvaluate';
 
 const { Option } = Select;
 const { RangePicker } = DatePicker;
 
-// 删除本地接口定义，使用全局定义
-
 const SupplierEvaluateResult: React.FC = () => {
   const [loading, setLoading] = useState<boolean>(false);
   const [form] = Form.useForm();
-  const [resultData, setResultData] = useState<SupplierEvaluate.EvaluateResultRecord[]>([]);
+  const [resultData, setResultData] = useState<API.EvaluateTaskRecord[]>([]);
   const [pagination, setPagination] = useState<TablePaginationConfig>({
     current: 1,
     pageSize: 10,
@@ -44,7 +43,7 @@ const SupplierEvaluateResult: React.FC = () => {
     showQuickJumper: true,
     showTotal: (total) => `共 ${total} 条记录`,
   });
-  const [searchParams, setSearchParams] = useState<SupplierEvaluate.EvaluateResultSearchParams>({});
+  const [searchParams, setSearchParams] = useState<API.EvaluateTaskSearchParams>({});
 
   // 品类数据
   const categoryOptions = [
@@ -63,11 +62,11 @@ const SupplierEvaluateResult: React.FC = () => {
     { label: '东莞市制造业有限公司', value: '东莞市制造业有限公司' },
   ];
 
-  // 模拟获取评价结果列表
+  // 获取评价结果列表
   const fetchResultList = async (
     current = 1,
     pageSize = 10,
-    params: SupplierEvaluate.EvaluateResultSearchParams = searchParams,
+    params: API.EvaluateTaskSearchParams = searchParams,
   ) => {
     // 更新搜索参数状态
     if (params !== searchParams) {
@@ -76,74 +75,51 @@ const SupplierEvaluateResult: React.FC = () => {
 
     setLoading(true);
     try {
-      // 模拟API请求
-      setTimeout(() => {
-        // 模拟数据
-        const mockData: SupplierEvaluate.EvaluateResultRecord[] = Array.from({ length: 35 }).map((_, index) => {
-          const id = `${index + 1}`;
-          const status = Object.values(TaskStatus)[Math.floor(Math.random() * 3)];
-          const taskType = Math.random() > 0.5 ? TaskType.REGULAR : TaskType.SPECIAL;
+      // 构建请求参数
+      const requestParams: API.EvaluateTaskRequest = {
+        basePageRequest: {
+          pageNo: current,
+          pageSize: pageSize,
+        },
+      };
 
-          // 随机选择单位和品类
-          const unitIndex = Math.floor(Math.random() * unitOptions.length);
-          const categoryIndex = Math.floor(Math.random() * categoryOptions.length);
+      // 添加搜索条件
+      if (params.evaluateTheme) {
+        requestParams.evaluateTheme = params.evaluateTheme;
+      }
+      if (params.status) {
+        requestParams.status = params.status;
+      }
+      if (params.timeRange && params.timeRange.length === 2) {
+        requestParams.startTime = params.timeRange[0];
+        requestParams.endTime = params.timeRange[1];
+      }
 
-          // 随机生成日期
-          const startDate = moment().subtract(Math.floor(Math.random() * 60), 'days');
-          const endDate = moment(startDate).add(Math.floor(Math.random() * 30) + 15, 'days');
+      // 调用接口获取数据
+      const response = await getEvaluateResultList(requestParams);
+      if (response.data && response.success) {
+        const { records, total, current: currentPage, size } = response.data;
 
-          return {
-            id,
-            key: id,
-            evaluateTitle: `${TaskTypeText[taskType]}任务${index + 1}`,
-            evaluateCategory: categoryOptions[categoryIndex].value,
-            initiatingUnit: unitOptions[unitIndex].value,
-            startTime: startDate.format('YYYY-MM-DD'),
-            endTime: endDate.format('YYYY-MM-DD'),
-            status,
-            createTime: moment().subtract(Math.floor(Math.random() * 90), 'days').format('YYYY-MM-DD HH:mm:ss'),
-          };
-        });
+        // 处理数据，增加表格需要的key属性
+        const formattedData = records.map(record => ({
+          ...record,
+          key: record.id,
+        }));
 
-        // 根据搜索条件过滤
-        let filteredData = [...mockData];
-        if (params.evaluateTitle) {
-          filteredData = filteredData.filter(item =>
-            item.evaluateTitle.includes(params.evaluateTitle || '')
-          );
-        }
-        if (params.status) {
-          filteredData = filteredData.filter(item =>
-            item.status === params.status
-          );
-        }
-        if (params.timeRange && params.timeRange.length === 2) {
-          const start = moment(params.timeRange[0]);
-          const end = moment(params.timeRange[1]);
-          filteredData = filteredData.filter(item => {
-            const itemStart = moment(item.startTime);
-            return itemStart.isBetween(start, end, null, '[]');
-          });
-        }
-
-        // 分页
-        const startIndex = (current - 1) * pageSize;
-        const endIndex = startIndex + pageSize;
-        const paginatedData = filteredData.slice(startIndex, endIndex);
-
-        setResultData(paginatedData);
+        setResultData(formattedData);
         setPagination({
           ...pagination,
-          current,
-          pageSize,
-          total: filteredData.length,
+          current: currentPage,
+          pageSize: size,
+          total,
         });
-
-        setLoading(false);
-      }, 500);
+      } else {
+        message.error(response.message || '获取评价结果列表失败');
+      }
     } catch (error) {
       console.error('获取评价结果列表失败:', error);
       message.error('获取评价结果列表失败');
+    } finally {
       setLoading(false);
     }
   };
@@ -161,7 +137,7 @@ const SupplierEvaluateResult: React.FC = () => {
   // 处理搜索
   const handleSearch = (values: any) => {
     const { timeRange, ...rest } = values;
-    const params: SupplierEvaluate.EvaluateResultSearchParams = { ...rest };
+    const params: API.EvaluateTaskSearchParams = { ...rest };
 
     if (timeRange && timeRange.length === 2) {
       params.timeRange = [timeRange[0].format('YYYY-MM-DD'), timeRange[1].format('YYYY-MM-DD')];
@@ -177,7 +153,7 @@ const SupplierEvaluateResult: React.FC = () => {
   };
 
   // 查看详情 - 修改为跳转到详情页
-  const handleViewDetail = (record: SupplierEvaluate.EvaluateResultRecord) => {
+  const handleViewDetail = (record: API.EvaluateTaskRecord) => {
     history.push({
       pathname: 'supplierEvaluateResultInfo',
       state: { record }
@@ -194,34 +170,28 @@ const SupplierEvaluateResult: React.FC = () => {
   const columns = [
     {
       title: '序号',
-      render: (_: any, __: SupplierEvaluate.EvaluateResultRecord, index: number) =>
+      render: (_: any, __: API.EvaluateTaskRecord, index: number) =>
         (pagination.current! - 1) * pagination.pageSize! + index + 1,
       width: 80,
     },
     {
       title: '评价主题',
-      dataIndex: 'evaluateTitle',
-      key: 'evaluateTitle',
+      dataIndex: 'evaluateTheme',
+      key: 'evaluateTheme',
       width: 200,
       ellipsis: {
         showTitle: false,
       },
-      render: (evaluateTitle: string) => (
-        <Tooltip placement="topLeft" title={evaluateTitle}>
-          {evaluateTitle}
+      render: (evaluateTheme: string) => (
+        <Tooltip placement="topLeft" title={evaluateTheme}>
+          {evaluateTheme}
         </Tooltip>
       ),
     },
-    {
-      title: '评价品类',
-      dataIndex: 'evaluateCategory',
-      key: 'evaluateCategory',
-      width: 120,
-    },
     {
       title: '发起单位',
-      dataIndex: 'initiatingUnit',
-      key: 'initiatingUnit',
+      dataIndex: 'tenantName',
+      key: 'tenantName',
       width: 200,
       ellipsis: {
         showTitle: false,
@@ -256,7 +226,7 @@ const SupplierEvaluateResult: React.FC = () => {
       key: 'action',
       width: 100,
       align: 'center' as const,
-      render: (_: unknown, record: SupplierEvaluate.EvaluateResultRecord) => (
+      render: (_: unknown, record: API.EvaluateTaskRecord) => (
         <Button type="link" onClick={() => handleViewDetail(record)}>
           查看
         </Button>
@@ -273,7 +243,7 @@ const SupplierEvaluateResult: React.FC = () => {
           onFinish={handleSearch}
           className="filter-form"
         >
-          <Form.Item name="evaluateTitle" label="评价主题">
+          <Form.Item name="evaluateTheme" label="评价主题">
             <Input placeholder="请输入评价主题" allowClear />
           </Form.Item>
           <Form.Item name="timeRange" label="评价时间">