|
|
@@ -19,63 +19,24 @@ const MemberList = () => {
|
|
|
const fetchMembers = async () => {
|
|
|
setLoading(true);
|
|
|
try {
|
|
|
+ console.log('开始获取会友列表'); // 调试日志
|
|
|
const data = await deviceApi.getAllPersons();
|
|
|
- console.log('Fetched members:', data); // 调试日志
|
|
|
- setMembers(data);
|
|
|
+ console.log('获取到的会友列表数据:', data); // 调试日志
|
|
|
+ if (Array.isArray(data)) {
|
|
|
+ setMembers(data);
|
|
|
+ message.success('会友列表获取成功');
|
|
|
+ } else {
|
|
|
+ throw new Error('返回的数据不是数组');
|
|
|
+ }
|
|
|
} catch (error) {
|
|
|
console.error('获取会友列表失败', error);
|
|
|
- message.error('获取会友列表失败');
|
|
|
+ message.error(`获取会友列表失败: ${error.message}`);
|
|
|
} finally {
|
|
|
setLoading(false);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- const handleAdd = () => {
|
|
|
- setIsAddModalVisible(true);
|
|
|
- };
|
|
|
-
|
|
|
- const handleEdit = (record) => {
|
|
|
- setEditingMember(record);
|
|
|
- setIsEditModalVisible(true);
|
|
|
- };
|
|
|
-
|
|
|
- const handleDelete = async (id) => {
|
|
|
- try {
|
|
|
- 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(`删除会友失败: ${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 = [
|
|
|
{
|
|
|
@@ -139,7 +100,10 @@ const MemberList = () => {
|
|
|
return (
|
|
|
<div>
|
|
|
<h2>会友列表</h2>
|
|
|
- <Button onClick={handleAdd} type="primary" style={{ marginBottom: 16 }}>
|
|
|
+ <Button onClick={fetchMembers} type="primary" style={{ marginBottom: 16, marginRight: 16 }}>
|
|
|
+ 刷新列表
|
|
|
+ </Button>
|
|
|
+ <Button onClick={() => setIsAddModalVisible(true)} type="primary" style={{ marginBottom: 16 }}>
|
|
|
添加会友
|
|
|
</Button>
|
|
|
<ExcelImportExport members={members} onImport={fetchMembers} />
|