|
|
@@ -6,154 +6,38 @@ import MemberForm from './MemberForm';
|
|
|
import MemberEditForm from './MemberEditForm';
|
|
|
|
|
|
const MemberList = () => {
|
|
|
- const [members, setMembers] = useState([]);
|
|
|
- const [loading, setLoading] = useState(false);
|
|
|
- const [isAddModalVisible, setIsAddModalVisible] = useState(false);
|
|
|
- const [isEditModalVisible, setIsEditModalVisible] = useState(false);
|
|
|
- const [editingMember, setEditingMember] = useState(null);
|
|
|
-
|
|
|
- useEffect(() => {
|
|
|
- fetchMembers();
|
|
|
- }, []);
|
|
|
-
|
|
|
- const fetchMembers = async () => {
|
|
|
- setLoading(true);
|
|
|
- try {
|
|
|
- const data = await deviceApi.getAllPersons();
|
|
|
- console.log('Fetched members:', data); // 调试日志
|
|
|
- setMembers(data);
|
|
|
- } catch (error) {
|
|
|
- console.error('获取会友列表失败', error);
|
|
|
- message.error('获取会友列表失败');
|
|
|
- } finally {
|
|
|
- setLoading(false);
|
|
|
- }
|
|
|
- };
|
|
|
-
|
|
|
- const handleAdd = () => {
|
|
|
- setIsAddModalVisible(true);
|
|
|
- };
|
|
|
-
|
|
|
- const handleEdit = (record) => {
|
|
|
- setEditingMember(record);
|
|
|
- setIsEditModalVisible(true);
|
|
|
- };
|
|
|
+ // ... 其他状态和函数保持不变
|
|
|
|
|
|
const handleDelete = async (id) => {
|
|
|
try {
|
|
|
- await deviceApi.deletePerson(id);
|
|
|
- message.success('会友删除成功');
|
|
|
- fetchMembers();
|
|
|
+ console.log('尝试删除会员,ID:', id); // 调试日志
|
|
|
+ Modal.confirm({
|
|
|
+ title: '确认删除',
|
|
|
+ content: '您确定要删除这个会员吗?此操作不可逆。',
|
|
|
+ onOk: async () => {
|
|
|
+ const result = await deviceApi.deletePerson(id);
|
|
|
+ console.log('删除会员结果:', result); // 调试日志
|
|
|
+ if (result.success) {
|
|
|
+ message.success('会友删除成功');
|
|
|
+ fetchMembers(); // 重新获取会员列表
|
|
|
+ } else {
|
|
|
+ throw new Error(result.message || '删除失败');
|
|
|
+ }
|
|
|
+ },
|
|
|
+ onCancel() {
|
|
|
+ console.log('取消删除操作');
|
|
|
+ },
|
|
|
+ });
|
|
|
} catch (error) {
|
|
|
console.error('删除会友失败', error);
|
|
|
- message.error('删除会友失败');
|
|
|
+ message.error(`删除会友失败: ${error.message}`);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- const handleMemberAdded = (newMember) => {
|
|
|
- setMembers([...members, newMember]);
|
|
|
- setIsAddModalVisible(false);
|
|
|
- };
|
|
|
-
|
|
|
- const handleMemberEdited = (editedMember) => {
|
|
|
- setMembers(members.map(member =>
|
|
|
- member.personId === editedMember.personId ? editedMember : member
|
|
|
- ));
|
|
|
- setIsEditModalVisible(false);
|
|
|
- };
|
|
|
-
|
|
|
- const columns = [
|
|
|
- {
|
|
|
- title: 'ID',
|
|
|
- dataIndex: 'personId',
|
|
|
- key: 'personId',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '姓名',
|
|
|
- dataIndex: 'name',
|
|
|
- key: 'name',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '性别',
|
|
|
- dataIndex: 'gender',
|
|
|
- key: 'gender',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '年龄',
|
|
|
- dataIndex: 'age',
|
|
|
- key: 'age',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '出生日期',
|
|
|
- dataIndex: 'birthDate',
|
|
|
- key: 'birthDate',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '婚姻状况',
|
|
|
- dataIndex: 'maritalStatus',
|
|
|
- key: 'maritalStatus',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '是否受洗',
|
|
|
- dataIndex: 'isBaptized',
|
|
|
- key: 'isBaptized',
|
|
|
- render: (isBaptized) => isBaptized ? '是' : '否',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '受洗日期',
|
|
|
- dataIndex: 'baptismDate',
|
|
|
- key: 'baptismDate',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '联系方式',
|
|
|
- dataIndex: 'contact',
|
|
|
- key: 'contact',
|
|
|
- },
|
|
|
- {
|
|
|
- title: '操作',
|
|
|
- key: 'action',
|
|
|
- render: (_, record) => (
|
|
|
- <Space size="middle">
|
|
|
- <Button onClick={() => handleEdit(record)}>编辑</Button>
|
|
|
- <Button onClick={() => handleDelete(record.personId)} danger>删除</Button>
|
|
|
- </Space>
|
|
|
- ),
|
|
|
- },
|
|
|
- ];
|
|
|
+ // ... 其他代码保持不变
|
|
|
|
|
|
return (
|
|
|
- <div>
|
|
|
- <h2>会友列表</h2>
|
|
|
- <Button onClick={handleAdd} type="primary" style={{ marginBottom: 16 }}>
|
|
|
- 添加会友
|
|
|
- </Button>
|
|
|
- <ExcelImportExport members={members} onImport={fetchMembers} />
|
|
|
- <Table
|
|
|
- columns={columns}
|
|
|
- dataSource={members}
|
|
|
- rowKey="personId"
|
|
|
- loading={loading}
|
|
|
- />
|
|
|
- <Modal
|
|
|
- title="添加会友"
|
|
|
- visible={isAddModalVisible}
|
|
|
- onCancel={() => setIsAddModalVisible(false)}
|
|
|
- footer={null}
|
|
|
- >
|
|
|
- <MemberForm onMemberAdded={handleMemberAdded} />
|
|
|
- </Modal>
|
|
|
- <Modal
|
|
|
- title="编辑会友"
|
|
|
- visible={isEditModalVisible}
|
|
|
- onCancel={() => setIsEditModalVisible(false)}
|
|
|
- footer={null}
|
|
|
- >
|
|
|
- <MemberEditForm
|
|
|
- member={editingMember}
|
|
|
- onMemberEdited={handleMemberEdited}
|
|
|
- />
|
|
|
- </Modal>
|
|
|
- </div>
|
|
|
+ // ... JSX 保持不变
|
|
|
);
|
|
|
};
|
|
|
|