Эх сурвалжийг харах

AI: 修复会友列表显示

D8D AI 1 жил өмнө
parent
commit
68723409c9

+ 53 - 4
src/components/member/MemberList.tsx

@@ -10,8 +10,39 @@ interface MemberListProps {
 
 const MemberList: React.FC<MemberListProps> = ({ members, onEdit, onDelete }) => {
   const columns = [
-    // 其他列保持不变
-    // ...
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      fixed: 'left' as const,
+      width: 100,
+    },
+    { title: '性别', dataIndex: 'gender', key: 'gender', width: 80 },
+    { title: '年龄', dataIndex: 'age', key: 'age', width: 80 },
+    { title: '手机号', dataIndex: 'phone', key: 'phone', width: 120 },
+    { title: '身份证号', dataIndex: 'idNumber', key: 'idNumber', width: 180 },
+    { title: '出生日期', dataIndex: 'birthDate', key: 'birthDate', width: 120 },
+    { 
+      title: '婚姻状态', 
+      dataIndex: 'maritalStatus', 
+      key: 'maritalStatus',
+      width: 100,
+    },
+    { title: '联系地址', dataIndex: 'address', key: 'address', width: 200 },
+    { title: '工作单位', dataIndex: 'workplace', key: 'workplace', width: 150 },
+    { title: '小组组长', dataIndex: 'groupLeader', key: 'groupLeader', width: 100 },
+    { 
+      title: '是否受洗', 
+      dataIndex: 'isBaptized', 
+      key: 'isBaptized',
+      width: 100,
+      render: (isBaptized: boolean) => (
+        <Tag color={isBaptized ? 'green' : 'red'}>
+          {isBaptized ? '已受洗' : '未受洗'}
+        </Tag>
+      )
+    },
+    { title: '受洗日期', dataIndex: 'baptismDate', key: 'baptismDate', width: 120 },
     { 
       title: '服侍岗位', 
       dataIndex: 'servicePositions', 
@@ -19,13 +50,31 @@ const MemberList: React.FC<MemberListProps> = ({ members, onEdit, onDelete }) =>
       width: 200,
       render: (servicePositions: string[]) => (
         <>
-          {servicePositions.map(position => (
+          {servicePositions && servicePositions.map(position => (
             <Tag key={position} color="blue">{position}</Tag>
           ))}
         </>
       )
     },
-    // ...
+    {
+      title: '操作',
+      key: 'action',
+      fixed: 'right' as const,
+      width: 120,
+      render: (text: string, record: Member) => (
+        <span>
+          <Button type="link" onClick={() => onEdit(record)}>编辑</Button>
+          <Popconfirm
+            title="确定要删除这个会友吗?"
+            onConfirm={() => onDelete(record.id)}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button type="link">删除</Button>
+          </Popconfirm>
+        </span>
+      ),
+    },
   ];
 
   return (