fix: 修改客户列表

boyang
1 parent ddc5a9a0
Showing 1 changed file with 57 additions and 56 deletions
src/pages/Client/Client/index.tsx
@@ -9,7 +9,6 @@ import {
   postAdminClientQueryClientPage,
   postServiceConstClientLevels,
   postServiceConstClientSource,
-  postServiceOrderQueryCustomerInformation,
 } from '@/services';
 import { downloadFile } from '@/services/order';
 import { enumToSelect } from '@/utils';
@@ -76,33 +75,8 @@ const columns = [
   {
     title: '课题组',
     dataIndex: 'institutionContactName',
-    valueType: 'select',
+    valueType: 'text',
     hideInTable: true,
-    fieldProps: {
-      showSearch: true,
-      // mode: 'tags', // 允许自定义输入
-    },
-    request: async (value, { params }) => {
-      const keywords = value.keyWords;
-      const { data } = await postServiceOrderQueryCustomerInformation({
-        data: {
-          name: 'institutionContactName',
-          institutionContactName: keywords,
-        },
-        params: params,
-      });
-      let options = data
-        .filter((c: any) => {
-          return c.orderName === 'institutionCustomerUser';
-        })
-        .map((item: any) => {
-          return {
-            label: item.orderValue,
-            value: item.orderValue,
-          };
-        });
-      return options;
-    },
   },
   {
     title: '关联销售',
@@ -195,15 +169,15 @@ const columns = [
     valueType: 'dateTime',
     hideInSearch: true,
   },
-  {
-    title: '最新更进时间',
-    key: 'since',
-    width: 150,
-    ellipsis: true,
-    dataIndex: 'updateTime',
-    valueType: 'dateTime',
-    hideInSearch: true,
-  },
+  // {
+  //   title: '最新更进时间',
+  //   key: 'since',
+  //   width: 150,
+  //   ellipsis: true,
+  //   dataIndex: 'updateTime',
+  //   valueType: 'dateTime',
+  //   hideInSearch: true,
+  // },
   // {
   //   title: '最新跟进时间',
   //   key: 'since',
@@ -435,28 +409,55 @@ export default () =&gt; {
             // 获取分页参数
             const { current, pageSize, ...restParams } = params;
  
-            const res = await postAdminClientQueryClientPage({
-              data: {
-                ...restParams,
-                groupFilter: groupFilter,
-                // 明确传递分页参数
-                current: current,
-                pageSize: pageSize,
-              },
-            });
+            try {
+              const res = await postAdminClientQueryClientPage({
+                data: {
+                  ...restParams,
+                  groupFilter: groupFilter,
+                  // 明确传递分页参数
+                  current: current,
+                  pageSize: pageSize,
+                },
+              });
+
+              console.log('API Response:', res); // 添加日志来查看API返回的数据结构
+              console.log('API Response data:', res.data); // 查看data部分的结构
+
+              // 检查返回数据结构
+              if (!res.data) {
+                console.error('API response data is undefined');
+                return { data: [], success: false, total: 0 };
+              }
+
+              // 根据API返回的数据结构调整处理方式
+              let records = [];
+              let total = 0;
+
+              // 处理两种可能的数据结构
+              if (res.data.records) {
+                // 标准分页结构 {records, total, current, pages, size}
+                records = res.data.records;
+                total = res.data.total || 0;
+              } else if (Array.isArray(res.data)) {
+                // 直接返回数组的情况
+                records = res.data;
+                total = res.data.length;
+              }
  
-            // 处理后端返回的实际数据格式
-            // 根据提供的JSON，格式已经是 {records, total, current, pages, size, count}
-            const result = {
-              data: res.data?.records || [], // 数据源是 records 数组
-              success: true,
-              total: res.data?.total || 0, // 总记录数
-              // 返回服务器端的分页信息，让ProTable使用
-              current: res.data?.current || 1,
-              pageSize: res.data?.size || 10,
-            };
+              const result = {
+                data: records,
+                success: true,
+                total: total,
+                current: res.data.current || current || 1,
+                pageSize: res.data.size || pageSize || 10,
+              };
  
-            return result;
+              console.log('Processed result for ProTable:', result);
+              return result;
+            } catch (error) {
+              console.error('Error fetching client data:', error);
+              return { data: [], success: false, total: 0 };
+            }
           }}
           search={{
             labelWidth: 'auto',