feat: add personnel and department manage pages

2025-09-20 21:01:02 +08:00
parent ef9a5b5618
commit 4a0b845dff
29 changed files with 2617 additions and 18 deletions
@@ -38,6 +38,12 @@ class EmailNotificationMiddleware(MiddlewareMixin):
                self._handle_item_operation_async(request, response, user_info)
            elif '/api/records/' in request.path or '/api/finance/' in request.path:
                self._handle_finance_operation_async(request, response, user_info)
+            elif '/api/personnel/' in request.path:
+                self._handle_personnel_operation_async(request, response, user_info)
+            elif '/api/departments/' in request.path:
+                self._handle_department_operation_async(request, response, user_info)
+            elif '/api/project-groups/' in request.path:
+                self._handle_project_group_operation_async(request, response, user_info)

        except Exception as e:
            logger.error(f"邮件通知中间件处理失败: {e}")
@@ -137,7 +143,7 @@ class EmailNotificationMiddleware(MiddlewareMixin):
                    'department': finance_data.get('department', ''),
                    'category': finance_data.get('category', ''),
                    'approver': finance_data.get('approver', ''),
-                    'timestamp': finance_data.get('transaction_date', ''),
+                    'timestamp': finance_data.get('updated_at', ''),
                    'operation_path': request.path,
                    'operation_method': request.method
                }
@@ -154,6 +160,148 @@ class EmailNotificationMiddleware(MiddlewareMixin):
        thread.daemon = True  # 设置为守护线程
        thread.start()

+    def _handle_personnel_operation_async(self, request, response, user_info):
+        """异步处理人员操作"""
+        def send_notification():
+            try:
+                operation_type = self._get_operation_type(request.method, request.path)
+
+                # 尝试从响应中获取数据
+                if hasattr(response, 'data'):
+                    personnel_data = response.data
+                else:
+                    try:
+                        content = response.content.decode('utf-8')
+                        personnel_data = json.loads(content) if content else {}
+                    except:
+                        personnel_data = {}
+
+                # 确保personnel_data不为None
+                if personnel_data is None:
+                    personnel_data = {}
+
+                # 构建通知数据，使用正确的字段名
+                message = personnel_data['message', '']
+                personnel_data = personnel_data['data', '']
+                notification_data = {
+                    'message': message,
+                    'id': personnel_data.get('id', ''),
+                    'name': personnel_data.get('name', ''),
+                    'student_id': personnel_data.get('student_id', ''),
+                    'gender': personnel_data.get('gender', ''),
+                    'grader_major': personnel_data.get('grade_major', ''),
+                    'department': personnel_data.get('department', ''),
+                    'project_group': personnel_data.get('project_group', ''),
+                    'position': personnel_data.get('position', ''),
+                    'start_date': personnel_data.get('start_date', ''),
+                    'end_date': personnel_data.get('end_date', ''),
+                    'is_active': personnel_data.get('is_active', ''),
+                    'phone': personnel_data.get('phone', ''),
+                    'qq': personnel_data.get('qq', ''),
+                    'email': personnel_data.get('email', ''),
+                    'description': personnel_data.get('description', ''),
+                    'timestamp': personnel_data.get('updated_at', ''),
+                    'operation_path': request.path,
+                    'operation_method': request.method
+                }
+
+                EmailNotificationService.send_operation_notification(
+                    operation_type, '人员', notification_data, user_info
+                )
+
+            except Exception as e:
+                logger.error(f"异步处理人员操作通知失败: {e}")
+
+        # 创建并启动后台线程
+        thread = threading.Thread(target=send_notification)
+        thread.daemon = True  # 设置为守护线程
+        thread.start()
+
+    def _handle_department_operation_async(self, request, response, user_info):
+        """异步处理部门操作"""
+        def send_notification():
+            try:
+                operation_type = self._get_operation_type(request.method, request.path)
+
+                # 尝试从响应中获取数据
+                if hasattr(response, 'data'):
+                    department_data = response.data
+                else:
+                    try:
+                        content = response.content.decode('utf-8')
+                        department_data = json.loads(content) if content else {}
+                    except:
+                        department_data = {}
+
+                # 确保department_data不为None
+                if department_data is None:
+                    department_data = {}
+
+                # 构建通知数据
+                notification_data = {
+                    'id': department_data.get('id', ''),
+                    'name': department_data.get('name', ''),
+                    'timestamp': department_data.get('updated_at', ''),
+                    'operation_path': request.path,
+                    'operation_method': request.method
+                }
+
+                EmailNotificationService.send_operation_notification(
+                    operation_type, '部门', notification_data, user_info
+                )
+
+            except Exception as e:
+                logger.error(f"异步处理部门操作通知失败: {e}")
+
+        # 创建并启动后台线程
+        thread = threading.Thread(target=send_notification)
+        thread.daemon = True  # 设置为守护线程
+        thread.start()
+
+    def _handle_project_group_operation_async(self, request, response, user_info):
+        """异步处理项目组操作"""
+        def send_notification():
+            try:
+                operation_type = self._get_operation_type(request.method, request.path)
+
+                # 尝试从响应中获取数据
+                if hasattr(response, 'data'):
+                    project_group_data = response.data
+                else:
+                    try:
+                        content = response.content.decode('utf-8')
+                        project_group_data = json.loads(content) if content else {}
+                    except:
+                        project_group_data = {}
+
+                # 确保project_group_data不为None
+                if project_group_data is None:
+                    project_group_data = {}
+
+                # 构建通知数据
+                notification_data = {
+                    'id': project_group_data.get('id', ''),
+                    'name': project_group_data.get('name', ''),
+                    'department': project_group_data.get('department', ''),
+                    'department_name': project_group_data.get('department_name', ''),
+                    'description': project_group_data.get('description', ''),
+                    'timestamp': project_group_data.get('updated_at', ''),
+                    'operation_path': request.path,
+                    'operation_method': request.method
+                }
+
+                EmailNotificationService.send_operation_notification(
+                    operation_type, '项目组', notification_data, user_info
+                )
+
+            except Exception as e:
+                logger.error(f"异步处理项目组操作通知失败: {e}")
+
+        # 创建并启动后台线程
+        thread = threading.Thread(target=send_notification)
+        thread.daemon = True  # 设置为守护线程
+        thread.start()
+
    def _get_operation_type(self, method, path):
        """根据HTTP方法和路径判断操作类型"""
        if method == 'POST':
@@ -15,7 +15,7 @@ from .serializers import (

 class FinancialRecordViewSet(viewsets.ModelViewSet):
    """
-    API endpoint that allows financial records to be viewed or edited.
+    获取财务记录
    """
    queryset = FinancialRecord.objects.all()

@@ -56,6 +56,7 @@ class FinancialRecordViewSet(viewsets.ModelViewSet):
            'description': instance.description,
            'record_type': instance.record_type,
            'transaction_date': str(instance.transaction_date),
+            'timestamp': timezone.now().isoformat(),
            'department': instance.department.name if instance.department else '',
            'category': instance.category.name if instance.category else '',
            'fund_manager': instance.fund_manager if hasattr(instance, 'fund_manager') else ''
@@ -76,7 +77,6 @@ class FinancialRecordViewSet(viewsets.ModelViewSet):
        # 立即删除财务记录（会级联删除相关的凭证图片记录）
        super().destroy(request, *args, **kwargs)

-        # 异步发送删除通知邮件
        def send_delete_notification():
            """异步发送删除通知邮件"""
            try:
@@ -96,7 +96,7 @@ class FinancialRecordViewSet(viewsets.ModelViewSet):
                    'category': record_info['category'],
                    'fund_manager': record_info['fund_manager'],
                    'transaction_date': record_info['transaction_date'],
-                    'deleted_at': timezone.now().isoformat(),
+                    'timestamp': timezone.now().isoformat(), # 删除条目的时间 :(
                    'operation_path': request.path,
                    'operation_method': request.method
                }
@@ -147,7 +147,7 @@ class FinancialRecordViewSet(viewsets.ModelViewSet):

 class ProofImageViewSet(viewsets.ModelViewSet):
    """
-    API endpoint that allows proof images to be viewed or edited.
+    凭证API
    """
    queryset = ProofImage.objects.all()
    serializer_class = ProofImageSerializer
@@ -182,15 +182,70 @@ class ProofImageViewSet(viewsets.ModelViewSet):

 class DepartmentViewSet(viewsets.ModelViewSet):
    """
-    API endpoint that allows departments to be viewed or edited.
+    获取部门
    """
    queryset = Department.objects.all()
    serializer_class = DepartmentSerializer

+    def destroy(self, request, *args, **kwargs):
+        """删除部门，发送邮件通知"""
+        from email_notice.services import EmailNotificationService
+        import threading
+        import logging
+
+        logger = logging.getLogger(__name__)
+
+        # 获取要删除的部门信息
+        department = self.get_object()
+        department_data = {
+            'id': department.id,
+            'name': department.name,
+        }
+
+        # 获取用户信息
+        user_info = self._get_user_info(request)
+
+        # 执行删除操作
+        response = super().destroy(request, *args, **kwargs)
+
+        # 异步发送删除通知邮件
+        def send_delete_notification():
+            try:
+                EmailNotificationService.send_operation_notification(
+                    'DELETE', '部门', department_data, user_info
+                )
+            except Exception as e:
+                logger.error(f"发送部门删除通知邮件失败: {e}")
+
+        thread = threading.Thread(target=send_delete_notification)
+        thread.daemon = True
+        thread.start()
+
+        return response
+
+    def _get_user_info(self, request):
+        """获取用户信息"""
+        try:
+            if hasattr(request, 'user') and request.user.is_authenticated:
+                return f"{request.user.username} ({request.user.email})"
+            else:
+                return f"匿名用户 (IP: {self._get_client_ip(request)})"
+        except:
+            return "未知用户"
+
+    def _get_client_ip(self, request):
+        """获取客户端IP"""
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip
+

 class CategoryViewSet(viewsets.ModelViewSet):
    """
-    API endpoint that allows categories to be viewed or edited.
+    获取分类
    """
    queryset = Category.objects.all()
    serializer_class = CategorySerializer
@@ -44,9 +44,13 @@ INSTALLED_APPS = [
    "django.contrib.staticfiles",
    "rest_framework",
    "corsheaders",
+    "django_filters",
+    "django_apscheduler",
    "items",
    "finance",
    "email_notice",
+    "personnel",
+    "scheduler",
 ]

 MIDDLEWARE = [
@@ -170,4 +174,39 @@ ADMINS = SECURE["SMTP"]["ADMINS"]
 # Default primary key field type
 # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field

+# 日志配置
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'verbose': {
+            'format': '{levelname} {asctime} {module} {process:d} {thread:d} {message}',
+            'style': '{',
+        },
+        'simple': {
+            'format': '{levelname} {message}',
+            'style': '{',
+        },
+    },
+    'handlers': {
+        'file': {
+            'level': 'INFO',
+            'class': 'logging.FileHandler',
+            'filename': BASE_DIR / 'logs' / 'scheduler.log',
+            'formatter': 'verbose',
+        },
+        'console': {
+            'level': 'INFO',
+            'class': 'logging.StreamHandler',
+            'formatter': 'simple',
+        },
+    },
+    'loggers': {
+        'scheduler': {
+            'handlers': ['file', 'console'],
+            'level': 'INFO',
+            'propagate': True,
+        },
+    },
+}
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
@@ -25,6 +25,7 @@ urlpatterns = [
    path("", include("items.urls")),
    path("", include("finance.urls")),
    path("", include("email_notice.urls")),
+    path("", include("personnel.urls")),
    path("api-auth/", include("rest_framework.urls")),
 ]

@@ -0,0 +1,117 @@
+from django.contrib import admin
+from .models import Personnel, ProjectGroup
+
+
+@admin.register(ProjectGroup)
+class ProjectGroupAdmin(admin.ModelAdmin):
+    """项目组管理"""
+    list_display = ['name', 'department', 'description', 'created_at']
+    list_filter = ['department', 'created_at']
+    search_fields = ['name', 'description']
+    ordering = ['department', 'name']
+
+import django_filters
+@admin.register(Personnel)
+class PersonnelAdmin(admin.ModelAdmin):
+    """人员信息管理"""
+    list_display = [
+        'name', 'student_id', 'department', 'project_group', 'position',
+        'is_active', 'start_date', 'end_date'
+    ]
+    list_filter = [
+        'department', 'project_group', 'position', 'gender',
+        'is_active', 'start_date'
+    ]
+    search_fields = ['name', 'student_id', 'phone', 'email', 'grade_major']
+    ordering = ['-is_active', 'department', 'position', 'name']
+
+    fieldsets = (
+        ('基本信息', {
+            'fields': ('name', 'student_id', 'gender', 'grade_major')
+        }),
+        ('职位信息', {
+            'fields': ('department', 'project_group', 'position', 'start_date', 'end_date', 'is_active')
+        }),
+        ('联系方式', {
+            'fields': ('phone', 'qq', 'email')
+        }),
+        ('其他信息', {
+            'fields': ('description',),
+            'classes': ('collapse',)
+        })
+    )
+
+    readonly_fields = ('created_at', 'updated_at')
+
+    def save_model(self, request, obj, form, change):
+        """保存模型时的额外处理"""
+        super().save_model(request, obj, form, change)
+
+    def get_queryset(self, request):
+        """优化查询"""
+        return super().get_queryset(request).select_related('department', 'project_group')
+from .models import Personnel, ProjectGroup
+from finance.models import Department
+
+
+class PersonnelFilter(django_filters.FilterSet):
+    """人员信息过滤器"""
+
+    # 基本筛选
+    department = django_filters.ModelChoiceFilter(
+        queryset=Department.objects.all(),
+        field_name='department',
+        label='部门'
+    )
+
+    project_group = django_filters.ModelChoiceFilter(
+        queryset=ProjectGroup.objects.all(),
+        field_name='project_group',
+        label='项目组'
+    )
+
+    position = django_filters.CharFilter(
+        field_name='position',
+        lookup_expr='icontains',
+        label='职位'
+    )
+
+    gender = django_filters.ChoiceFilter(
+        choices=Personnel.GENDER_CHOICES,
+        field_name='gender',
+        label='性别'
+    )
+
+    is_active = django_filters.BooleanFilter(
+        field_name='is_active',
+        label='在职状态'
+    )
+
+    # 日期范围筛选
+    start_date_from = django_filters.DateFilter(
+        field_name='start_date',
+        lookup_expr='gte',
+        label='任职开始时间（从）'
+    )
+
+    start_date_to = django_filters.DateFilter(
+        field_name='start_date',
+        lookup_expr='lte',
+        label='任职开始时间（到）'
+    )
+
+    end_date_from = django_filters.DateFilter(
+        field_name='end_date',
+        lookup_expr='gte',
+        label='任职结束时间（从）'
+    )
+
+    end_date_to = django_filters.DateFilter(
+        field_name='end_date',
+        lookup_expr='lte',
+        label='任职结束时间（到）'
+    )
+
+    class Meta:
+        model = Personnel
+        fields = ['department', 'project_group', 'position', 'gender', 'is_active']
@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class PersonnelConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'personnel'
+    verbose_name = '人员管理'
@@ -0,0 +1,67 @@
+import django_filters
+from django.db import models
+from .models import Personnel, ProjectGroup
+from finance.models import Department
+
+
+class PersonnelFilter(django_filters.FilterSet):
+    """人员信息过滤器"""
+
+    # 基本筛选
+    department = django_filters.ModelChoiceFilter(
+        queryset=Department.objects.all(),
+        field_name='department',
+        label='部门'
+    )
+
+    project_group = django_filters.ModelChoiceFilter(
+        queryset=ProjectGroup.objects.all(),
+        field_name='project_group',
+        label='项目组'
+    )
+
+    position = django_filters.CharFilter(
+        field_name='position',
+        lookup_expr='icontains',
+        label='职位'
+    )
+
+    gender = django_filters.ChoiceFilter(
+        choices=Personnel.GENDER_CHOICES,
+        field_name='gender',
+        label='性别'
+    )
+
+    is_active = django_filters.BooleanFilter(
+        field_name='is_active',
+        label='在职状态'
+    )
+
+    # 日期范围筛选
+    start_date_from = django_filters.DateFilter(
+        field_name='start_date',
+        lookup_expr='gte',
+        label='任职开始时间（从）'
+    )
+
+    start_date_to = django_filters.DateFilter(
+        field_name='start_date',
+        lookup_expr='lte',
+        label='任职开始时间（到）'
+    )
+
+    end_date_from = django_filters.DateFilter(
+        field_name='end_date',
+        lookup_expr='gte',
+        label='任职结束时间（从）'
+    )
+
+    end_date_to = django_filters.DateFilter(
+        field_name='end_date',
+        lookup_expr='lte',
+        label='任职结束时间（到）'
+    )
+
+    class Meta:
+        model = Personnel
+        fields = ['department', 'project_group', 'position', 'gender', 'is_active']
@@ -0,0 +1,57 @@
+from django.core.management.base import BaseCommand
+from django.utils import timezone
+from personnel.models import Personnel
+
+
+class Command(BaseCommand):
+    help = '检查人员任职结束时间，自动设置已到期人员为已卸任状态'
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--dry-run',
+            action='store_true',
+            help='仅显示将要更新的人员，不实际执行更新',
+        )
+
+    def handle(self, *args, **options):
+        today = timezone.now().date()
+        dry_run = options['dry_run']
+
+        # 查找任职结束时间已到期但仍在职的人员
+        expired_personnel = Personnel.objects.filter(
+            end_date__lte=today,
+            is_active=True
+        )
+
+        if not expired_personnel.exists():
+            self.stdout.write(
+                self.style.SUCCESS('没有需要设置为已卸任状态的人员')
+            )
+            return
+
+        self.stdout.write(
+            self.style.WARNING(f'发现 {expired_personnel.count()} 名任职已到期的人员:')
+        )
+
+        updated_count = 0
+        for person in expired_personnel:
+            self.stdout.write(
+                f'  - {person.name} (学号: {person.student_id}) '
+                f'任职结束时间: {person.end_date} '
+                f'部门: {person.department.name} '
+                f'职位: {person.position}'
+            )
+
+            if not dry_run:
+                person.is_active = False
+                person.save()
+                updated_count += 1
+
+        if dry_run:
+            self.stdout.write(
+                self.style.WARNING('这是预览模式，未实际更新任何数据')
+            )
+        else:
+            self.stdout.write(
+                self.style.SUCCESS(f'成功将 {updated_count} 名人员设置为已卸任状态')
+            )
@@ -0,0 +1,88 @@
+from django.core.management.base import BaseCommand
+from finance.models import Department
+from personnel.models import ProjectGroup
+
+
+class Command(BaseCommand):
+    help = '创建示例的项目组数据'
+
+    def handle(self, *args, **options):
+        # 确保部门存在，如果不存在则创建
+        departments_data = [
+            '爱特工作室本部',
+            '程序部',
+            'Web部',
+            '游戏部',
+            'IOS部',
+            'APP部',
+            'UI部',
+            '智能应用部',
+            'OpenHarmony部',
+            'FOSS部'
+        ]
+
+        self.stdout.write('正在创建部门...')
+        for dept_name in departments_data:
+            dept, created = Department.objects.get_or_create(name=dept_name)
+            if created:
+                self.stdout.write(f'  创建部门: {dept_name}')
+            else:
+                self.stdout.write(f'  部门已存在: {dept_name}')
+
+        # 创建项目组数据
+        project_groups_data = [
+            # 程序部项目组
+            {'name': '后端开发组', 'department_name': '程序部', 'description': '负责后端系统开发与维护'},
+            {'name': '算法研究组', 'department_name': '程序部', 'description': '专注算法研究与优化'},
+
+            # Web部项目组
+            {'name': '前端开发组', 'department_name': 'Web部', 'description': '负责前端页面开发'},
+            {'name': 'UI设计组', 'department_name': 'Web部', 'description': '负责用户界面设计'},
+
+            # 游戏部项目组
+            {'name': 'Unity开发组', 'department_name': '游戏部', 'description': '使用Unity引擎开发游戏'},
+            {'name': '游戏策划组', 'department_name': '游戏部', 'description': '负责游戏策划与设计'},
+
+            # IOS部项目组
+            {'name': 'iOS原生开发组', 'department_name': 'IOS部', 'description': '开发iOS原生应用'},
+            {'name': 'Swift开发组', 'department_name': 'IOS部', 'description': '使用Swift语言开发'},
+
+            # APP部项目组
+            {'name': 'Android开发组', 'department_name': 'APP部', 'description': '开发Android应用'},
+            {'name': '跨平台开发组', 'department_name': 'APP部', 'description': '使用Flutter、React Native等开发'},
+
+            # UI部项目组
+            {'name': '视觉设计组', 'department_name': 'UI部', 'description': '负责视觉设计与品牌设计'},
+            {'name': '交互设计组', 'department_name': 'UI部', 'description': '负责用户体验与交互设计'},
+
+            # 智能应用部项目组
+            {'name': 'AI研发组', 'department_name': '智能应用部', 'description': '人工智能技术研发'},
+            {'name': '机器学习组', 'department_name': '智能应用部', 'description': '机器学习算法应用'},
+
+            # OpenHarmony部项目组
+            {'name': 'HarmonyOS开发组', 'department_name': 'OpenHarmony部', 'description': '开发HarmonyOS应用'},
+            {'name': '鸿蒙系统组', 'department_name': 'OpenHarmony部', 'description': '鸿蒙生态系统开发'},
+
+            # FOSS部项目组
+            {'name': '开源项目组', 'department_name': 'FOSS部', 'description': '维护和开发开源项目'},
+            {'name': 'Linux系统组', 'department_name': 'FOSS部', 'description': 'Linux系统维护与开发'},
+        ]
+
+        self.stdout.write('正在创建项目组...')
+        for group_data in project_groups_data:
+            try:
+                department = Department.objects.get(name=group_data['department_name'])
+                group, created = ProjectGroup.objects.get_or_create(
+                    name=group_data['name'],
+                    department=department,
+                    defaults={'description': group_data['description']}
+                )
+                if created:
+                    self.stdout.write(f'  创建项目组: {group_data["name"]} ({group_data["department_name"]})')
+                else:
+                    self.stdout.write(f'  项目组已存在: {group_data["name"]}')
+            except Department.DoesNotExist:
+                self.stdout.write(self.style.ERROR(f'  部门不存在: {group_data["department_name"]}'))
+
+        self.stdout.write(self.style.SUCCESS('示例数据创建完成！'))
+        self.stdout.write('现在您可以在人员管理界面中看到这些项目组选项了。')
@@ -0,0 +1,124 @@
+from django.db import models
+from django.core.validators import RegexValidator
+from finance.models import Department
+
+
+class ProjectGroup(models.Model):
+    """项目组模型"""
+    name = models.CharField(max_length=100, unique=True, verbose_name="项目组名称")
+    department = models.ForeignKey(Department, on_delete=models.CASCADE, verbose_name="所属部门")
+    description = models.TextField(blank=True, null=True, verbose_name="项目组描述")
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name="创建时间")
+
+    class Meta:
+        verbose_name = "项目组"
+        verbose_name_plural = verbose_name
+        ordering = ['department', 'name']
+
+    def __str__(self):
+        return f"{self.department.name} - {self.name}"
+
+
+class Personnel(models.Model):
+    """人员信息模型"""
+    GENDER_CHOICES = [
+        ('male', '男'),
+        ('female', '女'),
+    ]
+
+    # 基本信息
+    name = models.CharField(max_length=50, verbose_name="姓名")
+    student_id = models.CharField(
+        max_length=20,
+        unique=True,
+        verbose_name="学号",
+        validators=[RegexValidator(
+            regex=r'^\d{8,12}$',
+            message='学号应为8-12位数字'
+        )]
+    )
+    gender = models.CharField(max_length=10, choices=GENDER_CHOICES, verbose_name="性别")
+    grade_major = models.CharField(max_length=100, verbose_name="年级专业")
+
+    # 职位信息
+    department = models.ForeignKey(Department, on_delete=models.CASCADE, verbose_name="所属部门")
+    project_group = models.ForeignKey(
+        ProjectGroup,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        verbose_name="项目组"
+    )
+    position = models.CharField(max_length=50, verbose_name="职位")
+    start_date = models.DateField(verbose_name="任职开始时间")
+    end_date = models.DateField(null=True, blank=True, verbose_name="任职结束时间")
+    is_active = models.BooleanField(default=True, verbose_name="是否在职")
+
+    # 联系方式
+    phone = models.CharField(
+        max_length=11,
+        verbose_name="手机号",
+        validators=[RegexValidator(
+            regex=r'^1[3-9]\d{9}$',
+            message='请输入有效的手机号码'
+        )]
+    )
+    qq = models.CharField(
+        max_length=15,
+        verbose_name="QQ号",
+        validators=[RegexValidator(
+            regex=r'^\d{5,15}$',
+            message='QQ号应为5-15位数字'
+        )]
+    )
+    email = models.EmailField(verbose_name="邮箱")
+
+    # 详细信息
+    description = models.TextField(blank=True, null=True, verbose_name="备注信息")
+
+    # 时间戳
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name="创建时间")
+    updated_at = models.DateTimeField(auto_now=True, verbose_name="更新时间")
+
+    class Meta:
+        verbose_name = "人员信息"
+        verbose_name_plural = verbose_name
+        ordering = ['-is_active', 'department', 'position', 'name']
+        indexes = [
+            models.Index(fields=['department', 'is_active']),
+            models.Index(fields=['student_id']),
+        ]
+
+    def __str__(self):
+        return f"{self.name} ({self.department.name} - {self.position})"
+
+    @property
+    def status_display(self):
+        """返回在职状态显示"""
+        if self.is_active:
+            return "在职"
+        return "已卸任"
+
+    def save(self, *args, **kwargs):
+        """保存时自动更新在职状态"""
+        from django.utils import timezone
+
+        # 如果设置了结束时间且已到期，自动设置为已卸任
+        if self.end_date and self.end_date <= timezone.now().date():
+            self.is_active = False
+
+        super().save(*args, **kwargs)
+
+    @classmethod
+    def check_and_update_expired_personnel(cls):
+        """检查并更新所有已到期的人员状态"""
+        from django.utils import timezone
+        today = timezone.now().date()
+
+        expired_personnel = cls.objects.filter(
+            end_date__lte=today,
+            is_active=True
+        )
+
+        updated_count = expired_personnel.update(is_active=False)
+        return updated_count, list(expired_personnel.values_list('name', flat=True))
@@ -0,0 +1,73 @@
+from rest_framework import serializers
+from .models import Personnel, ProjectGroup
+from finance.models import Department
+
+
+class ProjectGroupSerializer(serializers.ModelSerializer):
+    """项目组序列化器"""
+    department_name = serializers.CharField(source='department.name', read_only=True)
+
+    class Meta:
+        model = ProjectGroup
+        fields = ['id', 'name', 'department', 'department_name', 'description', 'created_at']
+        read_only_fields = ['created_at']
+
+
+class PersonnelReadSerializer(serializers.ModelSerializer):
+    """人员信息读取序列化器"""
+    department_name = serializers.CharField(source='department.name', read_only=True)
+    project_group_name = serializers.CharField(source='project_group.name', read_only=True)
+    position_display = serializers.CharField(source='position', read_only=True)
+    gender_display = serializers.CharField(source='get_gender_display', read_only=True)
+    status_display = serializers.CharField(read_only=True)
+
+    class Meta:
+        model = Personnel
+        fields = [
+            'id', 'name', 'student_id', 'gender', 'gender_display', 'grade_major',
+            'department', 'department_name', 'project_group', 'project_group_name',
+            'position', 'position_display', 'start_date', 'end_date', 'is_active',
+            'status_display', 'phone', 'qq', 'email', 'description',
+            'created_at', 'updated_at'
+        ]
+
+
+class PersonnelWriteSerializer(serializers.ModelSerializer):
+    """人员信息写入序列化器"""
+
+    class Meta:
+        model = Personnel
+        fields = [
+            'id', 'name', 'student_id', 'gender', 'grade_major',
+            'department', 'project_group', 'position', 'start_date', 'end_date',
+            'is_active', 'phone', 'qq', 'email', 'description'
+        ]
+
+    def validate_student_id(self, value):
+        """验证学号唯一性"""
+        if self.instance and self.instance.student_id == value:
+            return value
+
+        if Personnel.objects.filter(student_id=value).exists():
+            raise serializers.ValidationError("该学号已存在")
+        return value
+
+    def validate_project_group(self, value):
+        """验证项目组是否属于选定的部门"""
+        if value and hasattr(self, 'initial_data'):
+            department_id = self.initial_data.get('department')
+            if department_id and value.department_id != int(department_id):
+                raise serializers.ValidationError("项目组必须属于选定的部门")
+        return value
+
+    def validate(self, attrs):
+        """整体验证"""
+        start_date = attrs.get('start_date')
+        end_date = attrs.get('end_date')
+
+        if start_date and end_date and start_date >= end_date:
+            raise serializers.ValidationError({
+                'end_date': '任职结束时间必须晚于开始时间'
+            })
+
+        return attrs
@@ -0,0 +1,11 @@
+from django.urls import path, include
+from rest_framework.routers import DefaultRouter
+from .views import PersonnelViewSet, ProjectGroupViewSet
+
+router = DefaultRouter()
+router.register(r'personnel', PersonnelViewSet)
+router.register(r'project-groups', ProjectGroupViewSet)
+
+urlpatterns = [
+    path('api/', include(router.urls)),
+]
@@ -0,0 +1,269 @@
+from rest_framework import viewsets, status
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.filters import SearchFilter, OrderingFilter
+from django.utils import timezone
+import logging
+from .models import Personnel, ProjectGroup
+from .serializers import (
+    PersonnelReadSerializer,
+    PersonnelWriteSerializer,
+    ProjectGroupSerializer
+)
+from .filters import PersonnelFilter
+
+logger = logging.getLogger(__name__)
+
+
+class PersonnelViewSet(viewsets.ModelViewSet):
+    """人员信息视图集"""
+    queryset = Personnel.objects.all()
+    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
+    filterset_class = PersonnelFilter
+    search_fields = ['name', 'student_id', 'phone', 'email', 'grade_major']
+    ordering_fields = ['created_at', 'start_date', 'end_date', 'name']
+    ordering = ['-is_active', 'department', 'position', 'name']
+
+    def get_serializer_class(self):
+        """根据操作类型返回不同的序列化器"""
+        if self.action in ['list', 'retrieve']:
+            return PersonnelReadSerializer
+        return PersonnelWriteSerializer
+
+    @action(detail=False, methods=['get'])
+    def statistics(self, request):
+        """获取人员统计信息"""
+        total_count = Personnel.objects.count()
+        active_count = Personnel.objects.filter(is_active=True).count()
+        inactive_count = total_count - active_count
+
+        # 按部门统计
+        department_stats = {}
+        for person in Personnel.objects.select_related('department'):
+            dept_name = person.department.name
+            if dept_name not in department_stats:
+                department_stats[dept_name] = {'total': 0, 'active': 0, 'inactive': 0}
+            department_stats[dept_name]['total'] += 1
+            if person.is_active:
+                department_stats[dept_name]['active'] += 1
+            else:
+                department_stats[dept_name]['inactive'] += 1
+
+        # 按职位统计
+        position_stats = {}
+        for person in Personnel.objects.all():
+            position = person.position
+            if position not in position_stats:
+                position_stats[position] = {'total': 0, 'active': 0, 'inactive': 0}
+            position_stats[position]['total'] += 1
+            if person.is_active:
+                position_stats[position]['active'] += 1
+            else:
+                position_stats[position]['inactive'] += 1
+
+        return Response({
+            'overview': {
+                'total': total_count,
+                'active': active_count,
+                'inactive': inactive_count
+            },
+            'by_department': department_stats,
+            'by_position': position_stats
+        })
+
+    @action(detail=True, methods=['post'])
+    def set_inactive(self, request, pk=None):
+        """设置人员为已卸任状态"""
+        personnel = self.get_object()
+        personnel.is_active = False
+        personnel.end_date = timezone.now().date()
+        personnel.save()
+
+        serializer = self.get_serializer(personnel)
+        return Response({
+            'message': f'{personnel.name} 已设置为已卸任状态',
+            'data': serializer.data
+        })
+
+    @action(detail=True, methods=['post'])
+    def set_active(self, request, pk=None):
+        """设置人员为在职状态"""
+        personnel = self.get_object()
+        personnel.is_active = True
+        personnel.end_date = None
+        personnel.save()
+
+        serializer = self.get_serializer(personnel)
+        return Response({
+            'message': f'{personnel.name} 已设置为在职状态',
+            'data': serializer.data
+        })
+
+    def destroy(self, request, *args, **kwargs):
+        """删除人员，发送邮件通知"""
+        from email_notice.services import EmailNotificationService
+        import threading
+
+        # 获取要删除的人员信息
+        personnel = self.get_object()
+        personnel_data = {
+            'id': personnel.id,
+            'name': personnel.name,
+            'student_id': personnel.student_id,
+            'email': personnel.email,
+            'phone': personnel.phone,
+            'department_name': personnel.department.name if personnel.department else '',
+            'project_group_name': personnel.project_group.name if personnel.project_group else '',
+            'position': personnel.position,
+            'is_active': personnel.is_active,
+            'start_date': str(personnel.start_date),
+            'end_date': str(personnel.end_date) if personnel.end_date else '',
+            'timestamp': timezone.now().isoformat(),
+
+        }
+
+        # 获取用户信息
+        user_info = self._get_user_info(request)
+
+        # 执行删除操作
+        response = super().destroy(request, *args, **kwargs)
+
+        # 异步发送删除通知邮件
+        def send_delete_notification():
+            try:
+                EmailNotificationService.send_operation_notification(
+                    'DELETE', '人员', personnel_data, user_info
+                )
+            except Exception as e:
+                logger.error(f"发送人员删除通知邮件失败: {e}")
+
+        thread = threading.Thread(target=send_delete_notification)
+        thread.daemon = True
+        thread.start()
+
+        return response
+
+    def _get_user_info(self, request):
+        """获取用户信息"""
+        try:
+            if hasattr(request, 'user') and request.user.is_authenticated:
+                return f"{request.user.username} ({request.user.email})"
+            else:
+                return f"匿名用户 (IP: {self._get_client_ip(request)})"
+        except:
+            return "未知用户"
+
+    def _get_client_ip(self, request):
+        """获取客户端IP"""
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip
+
+    @action(detail=False, methods=['post'])
+    def check_expired(self, request):
+        """检查并更新已到期的人员状态"""
+        updated_count, updated_names = Personnel.check_and_update_expired_personnel()
+
+        if updated_count > 0:
+            return Response({
+                'message': f'成功将 {updated_count} 名人员设置为已卸任状态',
+                'updated_personnel': updated_names,
+                'count': updated_count
+            })
+        else:
+            return Response({
+                'message': '没有需要更新的人员',
+                'updated_personnel': [],
+                'count': 0
+            })
+
+
+class ProjectGroupViewSet(viewsets.ModelViewSet):
+    """项目组视图集"""
+    queryset = ProjectGroup.objects.all()
+    serializer_class = ProjectGroupSerializer
+    filter_backends = [DjangoFilterBackend, SearchFilter]
+    filterset_fields = ['department']
+    search_fields = ['name', 'description']
+    ordering = ['department', 'name']
+
+    @action(detail=False, methods=['get'])
+    def by_department(self, request):
+        """按部门获取项目组"""
+        department_id = request.query_params.get('department_id')
+        if department_id:
+            project_groups = ProjectGroup.objects.filter(department_id=department_id)
+            serializer = self.get_serializer(project_groups, many=True)
+            return Response(serializer.data)
+        return Response([])
+
+    def destroy(self, request, *args, **kwargs):
+        """删除项目组，发送邮件通知"""
+        from email_notice.services import EmailNotificationService
+        import threading
+
+        # 获取要删除的项目组信息
+        project_group = self.get_object()
+        project_group_data = {
+            'id': project_group.id,
+            'name': project_group.name,
+            'department_name': project_group.department.name if project_group.department else '',
+            'description': project_group.description,
+            'created_at': str(project_group.created_at),
+            'operation_path': request.path,
+            'operation_method': request.method
+        }
+
+        # 获取用户信息
+        user_info = self._get_user_info(request)
+
+        # 执行删除操作
+        response = super().destroy(request, *args, **kwargs)
+
+        # 异步发送删除通知邮件
+        def send_delete_notification():
+            try:
+                EmailNotificationService.send_operation_notification(
+                    'DELETE', '项目组', project_group_data, user_info
+                )
+            except Exception as e:
+                logger.error(f"发送项目组删除通知邮件失败: {e}")
+
+        thread = threading.Thread(target=send_delete_notification)
+        thread.daemon = True
+        thread.start()
+
+        return response
+
+    def _get_user_info(self, request):
+        """获取用户信息"""
+        try:
+            if hasattr(request, 'user') and request.user.is_authenticated:
+                return f"{request.user.username} ({request.user.email})"
+            else:
+                return f"匿名用户 (IP: {self._get_client_ip(request)})"
+        except:
+            return "未知用户"
+
+    def _get_client_ip(self, request):
+        """获取客户端IP"""
+        x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+        if x_forwarded_for:
+            ip = x_forwarded_for.split(',')[0]
+        else:
+            ip = request.META.get('REMOTE_ADDR')
+        return ip
+
+    @action(detail=False, methods=['get'])
+    def by_department(self, request):
+        """按部门获取项目组"""
+        department_id = request.query_params.get('department_id')
+        if department_id:
+            project_groups = ProjectGroup.objects.filter(department_id=department_id)
+            serializer = self.get_serializer(project_groups, many=True)
+            return Response(serializer.data)
+        return Response([])
@@ -0,0 +1,10 @@
+from django.apps import AppConfig
+
+
+class SchedulerConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'scheduler'
+
+    def ready(self):
+        from . import jobs
+        jobs.start_scheduler()
@@ -0,0 +1,10 @@
+from django.apps import AppConfig
+
+
+class SchedulerConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'scheduler'
+
+    def ready(self):
+        from . import jobs
+        jobs.start_scheduler()
@@ -0,0 +1,66 @@
+import logging
+from apscheduler.schedulers.background import BackgroundScheduler
+from django_apscheduler.jobstores import DjangoJobStore
+from django_apscheduler.models import DjangoJobExecution
+from django_apscheduler import util
+from personnel.models import Personnel
+
+logger = logging.getLogger(__name__)
+
+def check_expired_personnel():
+    """检查并更新已到期的人员状态"""
+    try:
+        updated_count, updated_names = Personnel.check_and_update_expired_personnel()
+
+        if updated_count > 0:
+            logger.info(f"定时任务执行成功：将 {updated_count} 名人员设置为已卸任状态")
+            logger.info(f"更新的人员：{', '.join(updated_names)}")
+        else:
+            logger.info("定时任务执行成功：没有需要更新的人员")
+
+    except Exception as e:
+        logger.error(f"定时任务执行失败：{str(e)}")
+
+@util.close_old_connections
+def delete_old_job_executions(max_age=604_800):
+    """删除旧的任务执行记录（默认保留7天）"""
+    DjangoJobExecution.objects.delete_old_job_executions(max_age)
+
+def start_scheduler():
+    """启动定时任务调度器"""
+    scheduler = BackgroundScheduler()
+    scheduler.add_jobstore(DjangoJobStore(), "default")
+
+    # 添加人员到期检测任务 - 每天早上8点执行
+    scheduler.add_job(
+        check_expired_personnel,
+        trigger="cron",
+        hour=8,
+        minute=0,
+        id="check_expired_personnel",
+        max_instances=1,
+        replace_existing=True,
+    )
+    logger.info("已添加人员到期检测定时任务：每天早上8:00执行")
+
+    # 添加清理旧任务记录的任务 - 每周执行一次
+    scheduler.add_job(
+        delete_old_job_executions,
+        trigger="cron",
+        day_of_week="mon",
+        hour=1,
+        minute=0,
+        id="delete_old_job_executions",
+        max_instances=1,
+        replace_existing=True,
+    )
+    logger.info("已添加清理旧任务记录任务：每周一凌晨1:00执行")
+
+    try:
+        logger.info("正在启动定时任务调度器...")
+        scheduler.start()
+        logger.info("定时任务调度器启动成功")
+    except KeyboardInterrupt:
+        logger.info("正在停止定时任务调度器...")
+        scheduler.shutdown()
+        logger.info("定时任务调度器已停止")
@@ -20,6 +20,14 @@
          <el-icon><Document /></el-icon>
          使用记录
        </el-menu-item>
+        <el-menu-item index="/personnel">
+          <el-icon><User /></el-icon>
+          人员管理
+        </el-menu-item>
+        <el-menu-item index="/department-management">
+          <el-icon><OfficeBuilding /></el-icon>
+          部门管理
+        </el-menu-item>
        <el-menu-item index="/finance">
          <el-icon><Money /></el-icon>
          财务管理
@@ -30,12 +38,8 @@
        </el-menu-item>
      </el-menu>
      <div class="header-actions">
-        <el-button
-          type="text"
-          @click="goToSettings"
-          class="settings-btn"
-        >
-          <el-icon size="20"><Setting /></el-icon>
+        <el-button type="text" class="settings-btn" @click="goToSettings">
+          <el-icon><Setting /></el-icon>
        </el-button>
      </div>
    </div>
@@ -43,7 +47,7 @@
 </template>

 <script>
-import { House, Box, Document, Money, Tickets, Setting } from '@element-plus/icons-vue'
+import { House, Box, Document, Money, Tickets, Setting, User, OfficeBuilding } from '@element-plus/icons-vue'

 export default {
  name: 'AppHeader',
@@ -53,7 +57,9 @@ export default {
    Document,
    Money,
    Tickets,
-    Setting
+    Setting,
+    User,
+    OfficeBuilding
  },
  methods: {
    goToSettings() {
@@ -32,5 +32,6 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 app.use(ElementPlus, {
  locale: zhCn,
 })
+
 app.use(router)
 app.mount('#app')
@@ -7,6 +7,8 @@ import Dashboard from '../views/Dashboard.vue'
 import FinanceDashboard from '../views/FinanceDashboard.vue'
 import FinanceRecordList from '../views/FinanceRecordList.vue'
 import FinanceRecordDetail from '../views/FinanceRecordDetail.vue'
+import PersonnelList from '../views/PersonnelList.vue'
+import DepartmentProjectGroupManagement from '../views/DepartmentProjectGroupManagement.vue'
 import Settings from '../views/Settings.vue'

 const routes = [
@@ -52,6 +54,16 @@ const routes = [
    component: FinanceRecordDetail,
    props: true
  },
+  {
+    path: '/personnel',
+    name: 'PersonnelList',
+    component: PersonnelList
+  },
+  {
+    path: '/department-management',
+    name: 'DepartmentProjectGroupManagement',
+    component: DepartmentProjectGroupManagement
+  },
  {
    path: '/settings',
    name: 'Settings',
@@ -92,9 +92,9 @@ export const usageService = {
    return apiClient.get('/usages/current/')
  },

-  // 根据用户获取使用记录
-  getUserUsages(userId) {
-    return apiClient.get(`/usages/by_user/?user_id=${userId}`)
+  // 根据用户姓名获取使用记录
+  getUserUsages(userName) {
+    return apiClient.get(`/usages/by_user/?user_name=${userName}`)
  },

  // 创建使用记录
@@ -190,8 +190,128 @@ export const financeService = {
        return apiClient.get('/departments/')
    },

+    // 创建部门
+    createDepartment(department) {
+        return apiClient.post('/departments/', department)
+    },
+
+    // 更新部门
+    updateDepartment(id, department) {
+        return apiClient.put(`/departments/${id}/`, department)
+    },
+
+    // 删除部门
+    deleteDepartment(id) {
+        return apiClient.delete(`/departments/${id}/`)
+    },
+
    // 获取所有类别
    getAllCategories() {
        return apiClient.get('/finance_categories/')
    },
 }
+
+// 人员管理服务
+export const personnelService = {
+    // 获取所有人员
+    getAllPersonnel() {
+        return apiClient.get('/personnel/')
+    },
+
+    // 获取人员详情
+    getPersonnelDetail(id) {
+        return apiClient.get(`/personnel/${id}/`)
+    },
+
+    // 创建新人员
+    createPersonnel(personnel) {
+        return apiClient.post('/personnel/', personnel)
+    },
+
+    // 更新人员信息
+    updatePersonnel(id, personnel) {
+        return apiClient.put(`/personnel/${id}/`, personnel)
+    },
+
+    // 删除人员
+    deletePersonnel(id) {
+        return apiClient.delete(`/personnel/${id}/`)
+    },
+
+    // 设置人员已卸任
+    setPersonnelInactive(id) {
+        return apiClient.post(`/personnel/${id}/set_inactive/`)
+    },
+
+    // 设置人员在职
+    setPersonnelActive(id) {
+        return apiClient.post(`/personnel/${id}/set_active/`)
+    },
+
+    // 获取人员统计信息
+    getPersonnelStatistics() {
+        return apiClient.get('/personnel/statistics/')
+    },
+
+    // 按部门筛选人员
+    getPersonnelByDepartment(departmentId) {
+        return apiClient.get('/personnel/', {
+            params: { department: departmentId }
+        })
+    },
+
+    // 按项目组筛选人员
+    getPersonnelByProjectGroup(projectGroupId) {
+        return apiClient.get('/personnel/', {
+            params: { project_group: projectGroupId }
+        })
+    },
+
+    // 搜索人员
+    searchPersonnel(keyword) {
+        return apiClient.get('/personnel/', {
+            params: { search: keyword }
+        })
+    },
+
+    // 检查并更新到期人员状态
+    checkExpiredPersonnel() {
+        return apiClient.post('/personnel/check_expired/')
+    }
+}
+
+// 项目组管理服务
+export const projectGroupService = {
+    // 获取所有项目组
+    getAllProjectGroups() {
+        return apiClient.get('/project-groups/')
+    },
+
+    // 获取项目组详情
+    getProjectGroupDetail(id) {
+        return apiClient.get(`/project-groups/${id}/`)
+    },
+
+    // 创建新项目组
+    createProjectGroup(projectGroup) {
+        return apiClient.post('/project-groups/', projectGroup)
+    },
+
+    // 更新项目组
+    updateProjectGroup(id, projectGroup) {
+        return apiClient.put(`/project-groups/${id}/`, projectGroup)
+    },
+
+    // 删除项目组
+    deleteProjectGroup(id) {
+        return apiClient.delete(`/project-groups/${id}/`)
+    },
+
+    // 按部门获取项目组
+    getProjectGroupsByDepartment(departmentId) {
+        return apiClient.get('/project-groups/by_department/', {
+            params: { department_id: departmentId }
+        })
+    }
+}
+
@@ -0,0 +1,344 @@
+<template>
+  <div>
+    <AppHeader />
+    <div class="management-container">
+      <el-row :gutter="20">
+        <!-- 部门管理 -->
+        <el-col :span="12">
+          <el-card>
+            <template #header>
+              <div class="card-header">
+                <span>部门管理</span>
+                <el-button type="primary" @click="showAddDepartmentDialog">
+                  <el-icon><Plus /></el-icon>
+                  添加部门
+                </el-button>
+              </div>
+            </template>
+
+            <el-table :data="departments" style="width: 100%" v-loading="departmentLoading">
+              <el-table-column prop="name" label="部门名称" />
+              <el-table-column label="操作" width="150">
+                <template #default="scope">
+                  <el-button size="small" @click="editDepartment(scope.row)">编辑</el-button>
+                  <el-button size="small" type="danger" @click="deleteDepartment(scope.row.id)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+        </el-col>
+
+        <!-- 项目组管理 -->
+        <el-col :span="12">
+          <el-card>
+            <template #header>
+              <div class="card-header">
+                <span>项目组管理</span>
+                <el-button type="primary" @click="showAddProjectGroupDialog">
+                  <el-icon><Plus /></el-icon>
+                  添加项目组
+                </el-button>
+              </div>
+            </template>
+
+            <div class="filter-section" style="margin-bottom: 15px;">
+              <el-select v-model="departmentFilter" placeholder="筛选部门" clearable @change="filterProjectGroups">
+                <el-option label="全部部门" value="" />
+                <el-option
+                  v-for="dept in departments"
+                  :key="dept.id"
+                  :label="dept.name"
+                  :value="dept.id" />
+              </el-select>
+            </div>
+
+            <el-table :data="filteredProjectGroups" style="width: 100%" v-loading="projectGroupLoading">
+              <el-table-column prop="name" label="项目组名称" />
+              <el-table-column prop="department_name" label="所属部门" />
+              <el-table-column prop="description" label="描述" show-overflow-tooltip />
+              <el-table-column label="操作" width="150">
+                <template #default="scope">
+                  <el-button size="small" @click="editProjectGroup(scope.row)">编辑</el-button>
+                  <el-button size="small" type="danger" @click="deleteProjectGroup(scope.row.id)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+        </el-col>
+      </el-row>
+
+      <!-- 添加/编辑部门对话框 -->
+      <el-dialog :title="departmentDialogTitle" v-model="departmentDialogVisible" width="40%">
+        <el-form :model="departmentForm" :rules="departmentRules" ref="departmentFormRef" label-width="100px">
+          <el-form-item label="部门名称" prop="name">
+            <el-input v-model="departmentForm.name" placeholder="请输入部门名称" />
+          </el-form-item>
+        </el-form>
+        <template #footer>
+          <el-button @click="departmentDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="submitDepartmentForm">保存</el-button>
+        </template>
+      </el-dialog>
+
+      <!-- 添加/编辑项目组对话框 -->
+      <el-dialog :title="projectGroupDialogTitle" v-model="projectGroupDialogVisible" width="50%">
+        <el-form :model="projectGroupForm" :rules="projectGroupRules" ref="projectGroupFormRef" label-width="100px">
+          <el-form-item label="项目组名称" prop="name">
+            <el-input v-model="projectGroupForm.name" placeholder="请输入项目组名称" />
+          </el-form-item>
+          <el-form-item label="所属部门" prop="department">
+            <el-select v-model="projectGroupForm.department" placeholder="请选择所属部门">
+              <el-option
+                v-for="dept in departments"
+                :key="dept.id"
+                :label="dept.name"
+                :value="dept.id" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="项目组描述" prop="description">
+            <el-input
+              v-model="projectGroupForm.description"
+              type="textarea"
+              :rows="3"
+              placeholder="请输入项目组描述（可选）" />
+          </el-form-item>
+        </el-form>
+        <template #footer>
+          <el-button @click="projectGroupDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="submitProjectGroupForm">保存</el-button>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { financeService, projectGroupService } from '@/services/api'
+import AppHeader from '@/components/AppHeader.vue'
+import { Plus } from '@element-plus/icons-vue'
+
+export default {
+  name: 'DepartmentProjectGroupManagement',
+  components: {
+    AppHeader,
+    Plus
+  },
+  data() {
+    return {
+      departments: [],
+      projectGroups: [],
+      departmentLoading: false,
+      projectGroupLoading: false,
+
+      // 筛选
+      departmentFilter: '',
+
+      // 部门对话框
+      departmentDialogVisible: false,
+      departmentDialogTitle: '',
+      departmentForm: {
+        id: null,
+        name: ''
+      },
+      departmentRules: {
+        name: [
+          { required: true, message: '请输入部门名称', trigger: 'blur' }
+        ]
+      },
+
+      // 项目组对话框
+      projectGroupDialogVisible: false,
+      projectGroupDialogTitle: '',
+      projectGroupForm: {
+        id: null,
+        name: '',
+        department: '',
+        description: ''
+      },
+      projectGroupRules: {
+        name: [
+          { required: true, message: '请输入项目组名称', trigger: 'blur' }
+        ],
+        department: [
+          { required: true, message: '请选择所属部门', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  computed: {
+    filteredProjectGroups() {
+      if (!this.departmentFilter) {
+        return this.projectGroups
+      }
+      return this.projectGroups.filter(group => group.department === parseInt(this.departmentFilter))
+    }
+  },
+  async created() {
+    await this.loadData()
+  },
+  methods: {
+    async loadData() {
+      await Promise.all([
+        this.fetchDepartments(),
+        this.fetchProjectGroups()
+      ])
+    },
+
+    async fetchDepartments() {
+      this.departmentLoading = true
+      try {
+        const response = await financeService.getAllDepartments()
+        this.departments = response.data
+      } catch (error) {
+        this.$message.error('获取部门列表失败')
+        console.error('获取部门列表失败:', error)
+      } finally {
+        this.departmentLoading = false
+      }
+    },
+
+    async fetchProjectGroups() {
+      this.projectGroupLoading = true
+      try {
+        const response = await projectGroupService.getAllProjectGroups()
+        this.projectGroups = response.data
+      } catch (error) {
+        this.$message.error('获取项目组列表失败')
+        console.error('获取项目组列表失败:', error)
+      } finally {
+        this.projectGroupLoading = false
+      }
+    },
+
+    filterProjectGroups() {
+      // 筛选逻辑在computed中处理
+    },
+
+    // 部门管理方法
+    showAddDepartmentDialog() {
+      this.departmentForm = { id: null, name: '' }
+      this.departmentDialogTitle = '添加部门'
+      this.departmentDialogVisible = true
+    },
+
+    editDepartment(department) {
+      this.departmentForm = { ...department }
+      this.departmentDialogTitle = '编辑部门'
+      this.departmentDialogVisible = true
+    },
+
+    async submitDepartmentForm() {
+      try {
+        await this.$refs.departmentFormRef.validate()
+
+        if (this.departmentForm.id) {
+          // 更新部门
+          await financeService.updateDepartment(this.departmentForm.id, this.departmentForm)
+          this.$message.success('部门更新成功')
+        } else {
+          // 创建部门
+          await financeService.createDepartment(this.departmentForm)
+          this.$message.success('部门创建成功')
+        }
+
+        this.departmentDialogVisible = false
+        await this.fetchDepartments()
+      } catch (error) {
+        this.$message.error('操作失败')
+        console.error('部门操作失败:', error)
+      }
+    },
+
+    async deleteDepartment(id) {
+      try {
+        await this.$confirm('确认删除该部门？删除后所有相关数据将受到影响。', '确认删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+
+        await financeService.deleteDepartment(id)
+        this.$message.success('部门删除成功')
+        await this.fetchDepartments()
+      } catch (error) {
+        if (error !== 'cancel') {
+          this.$message.error('删除失败')
+          console.error('删除部门失败:', error)
+        }
+      }
+    },
+
+    // 项目组管理方法
+    showAddProjectGroupDialog() {
+      this.projectGroupForm = { id: null, name: '', department: '', description: '' }
+      this.projectGroupDialogTitle = '添加项目组'
+      this.projectGroupDialogVisible = true
+    },
+
+    editProjectGroup(projectGroup) {
+      this.projectGroupForm = { ...projectGroup }
+      this.projectGroupDialogTitle = '编辑项目组'
+      this.projectGroupDialogVisible = true
+    },
+
+    async submitProjectGroupForm() {
+      try {
+        await this.$refs.projectGroupFormRef.validate()
+
+        if (this.projectGroupForm.id) {
+          // 更新项目组
+          await projectGroupService.updateProjectGroup(this.projectGroupForm.id, this.projectGroupForm)
+          this.$message.success('项目组更新成功')
+        } else {
+          // 创建项目组
+          await projectGroupService.createProjectGroup(this.projectGroupForm)
+          this.$message.success('项目组创建成功')
+        }
+
+        this.projectGroupDialogVisible = false
+        await this.fetchProjectGroups()
+      } catch (error) {
+        this.$message.error('操作失败')
+        console.error('项目组操作失败:', error)
+      }
+    },
+
+    async deleteProjectGroup(id) {
+      try {
+        await this.$confirm('确认删除该项目组？', '确认删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+
+        await projectGroupService.deleteProjectGroup(id)
+        this.$message.success('项目组删除成功')
+        await this.fetchProjectGroups()
+      } catch (error) {
+        if (error !== 'cancel') {
+          this.$message.error('删除失败')
+          console.error('删除项目组失败:', error)
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.management-container {
+  padding: 20px;
+  background-color: #f5f7fa;
+  min-height: calc(100vh - 60px);
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.filter-section {
+  padding: 10px 0;
+}
+</style>
@@ -0,0 +1,102 @@
+<template>
+  <div class="personnel-detail">
+    <el-descriptions :column="2" border>
+      <el-descriptions-item label="姓名">
+        <el-tag type="primary" size="large">{{ personnel.name }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="学号">{{ personnel.student_id }}</el-descriptions-item>
+      <el-descriptions-item label="性别">{{ personnel.gender_display }}</el-descriptions-item>
+      <el-descriptions-item label="年级专业">{{ personnel.grade_major }}</el-descriptions-item>
+      <el-descriptions-item label="所属部门">
+        <el-tag>{{ personnel.department_name }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="项目组">
+        {{ personnel.project_group_name || '-' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="职位">
+        <el-tag type="warning">{{ personnel.position }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="在职状态">
+        <el-tag :type="personnel.is_active ? 'success' : 'danger'">
+          {{ personnel.is_active ? '在职' : '已卸任' }}
+        </el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="任职开始时间">{{ personnel.start_date }}</el-descriptions-item>
+      <el-descriptions-item label="任职结束时间">{{ personnel.end_date || '-' }}</el-descriptions-item>
+    </el-descriptions>
+
+    <el-divider content-position="left">联系方式</el-divider>
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="手机号">
+        <el-text tag="a" :href="'tel:' + personnel.phone">{{ personnel.phone }}</el-text>
+      </el-descriptions-item>
+      <el-descriptions-item label="QQ号">
+        <el-text tag="a" :href="'tencent://message/?uin=' + personnel.qq">{{ personnel.qq }}</el-text>
+      </el-descriptions-item>
+      <el-descriptions-item label="邮箱">
+        <el-text tag="a" :href="'mailto:' + personnel.email">{{ personnel.email }}</el-text>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-divider content-position="left" v-if="personnel.description">备注信息</el-divider>
+    <el-card v-if="personnel.description" shadow="never" class="description-card">
+      <p>{{ personnel.description }}</p>
+    </el-card>
+
+    <el-divider content-position="left">时间信息</el-divider>
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="创建时间">{{ formatDateTime(personnel.created_at) }}</el-descriptions-item>
+      <el-descriptions-item label="更新时间">{{ formatDateTime(personnel.updated_at) }}</el-descriptions-item>
+    </el-descriptions>
+
+    <div class="detail-actions">
+      <el-button @click="$emit('close')">关闭</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import moment from 'moment'
+
+export default {
+  name: 'PersonnelDetail',
+  props: {
+    personnel: {
+      type: Object,
+      required: true
+    }
+  },
+  emits: ['close'],
+  methods: {
+    formatDateTime(dateTime) {
+      return moment(dateTime).format('YYYY-MM-DD HH:mm:ss')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.personnel-detail {
+  padding: 20px 0;
+}
+
+.description-card {
+  margin: 10px 0;
+  background-color: #f8f9fa;
+}
+
+.description-card p {
+  margin: 0;
+  line-height: 1.6;
+}
+
+.detail-actions {
+  display: flex;
+  justify-content: center;
+  margin-top: 30px;
+}
+
+:deep(.el-descriptions__label) {
+  font-weight: bold;
+}
+</style>
@@ -0,0 +1,312 @@
+<template>
+  <el-form :model="form" :rules="rules" ref="personnelForm" label-width="120px">
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="学号" prop="student_id">
+          <el-input v-model="form.student_id" placeholder="请输入学号" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="性别" prop="gender">
+          <el-select v-model="form.gender" placeholder="请选择性别">
+            <el-option label="男" value="male" />
+            <el-option label="女" value="female" />
+            <el-option label="其他" value="other" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="年级专业" prop="grade_major">
+          <el-input v-model="form.grade_major" placeholder="如：2023级计算机科学与技术" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="所属部门" prop="department">
+          <el-select v-model="form.department" placeholder="请选择部门" @change="onDepartmentChange">
+            <el-option
+              v-for="dept in departments"
+              :key="dept.id"
+              :label="dept.name"
+              :value="dept.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目组" prop="project_group">
+          <el-select v-model="form.project_group" placeholder="请选择项目组（可选）" clearable>
+            <el-option
+              v-for="group in filteredProjectGroups"
+              :key="group.id"
+              :label="group.name"
+              :value="group.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="职位" prop="position">
+          <el-input v-model="form.position" placeholder="请输入职位" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="在职状态" prop="is_active">
+          <el-switch
+            v-model="form.is_active"
+            active-text="在职"
+            inactive-text="已卸任" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="任职开始时间" prop="start_date">
+          <el-date-picker
+            v-model="form.start_date"
+            type="date"
+            placeholder="选择任职开始时间"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="任职结束时间" prop="end_date">
+          <el-date-picker
+            v-model="form.end_date"
+            type="date"
+            placeholder="选择任职结束时间（可选）"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            clearable />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="QQ号" prop="qq">
+          <el-input v-model="form.qq" placeholder="请输入QQ号" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="邮箱" prop="email">
+          <el-input v-model="form.email" placeholder="请输入邮箱" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-form-item label="备注信息" prop="description">
+      <el-input
+        v-model="form.description"
+        type="textarea"
+        :rows="3"
+        placeholder="请输入备注信息（可选）" />
+    </el-form-item>
+
+    <div class="form-actions">
+      <el-button @click="$emit('cancel')">取消</el-button>
+      <el-button type="primary" @click="submitForm">保存</el-button>
+    </div>
+  </el-form>
+</template>
+
+<script>
+import { personnelService } from '@/services/api'
+
+export default {
+  name: 'PersonnelForm',
+  props: {
+    personnel: {
+      type: Object,
+      default: null
+    },
+    departments: {
+      type: Array,
+      default: () => []
+    },
+    projectGroups: {
+      type: Array,
+      default: () => []
+    }
+  },
+  emits: ['submit', 'cancel'],
+  data() {
+    return {
+      form: {
+        name: '',
+        student_id: '',
+        gender: '',
+        grade_major: '',
+        department: '',
+        project_group: '',
+        position: '',
+        start_date: '',
+        end_date: '',
+        is_active: true,
+        phone: '',
+        qq: '',
+        email: '',
+        description: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入姓名', trigger: 'blur' }
+        ],
+        student_id: [
+          { required: true, message: '请输入学号', trigger: 'blur' },
+          { pattern: /^\d{11}$/, message: '学号应为11位数字', trigger: 'blur' }
+        ],
+        gender: [
+          { required: true, message: '请选择性别', trigger: 'change' }
+        ],
+        grade_major: [
+          { required: true, message: '请输入年级专业', trigger: 'blur' }
+        ],
+        department: [
+          { required: true, message: '请选择所属部门', trigger: 'change' }
+        ],
+        position: [
+          { required: true, message: '请选择职位', trigger: 'change' }
+        ],
+        start_date: [
+          { required: true, message: '请选择任职开始时间', trigger: 'change' }
+        ],
+        phone: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入有效的手机号码', trigger: 'blur' }
+        ],
+        qq: [
+          { required: true, message: '请输入QQ号', trigger: 'blur' },
+          { pattern: /^\d{5,15}$/, message: 'QQ号应为5-15位数字', trigger: 'blur' }
+        ],
+        email: [
+          { required: true, message: '请输入邮箱', trigger: 'blur' },
+          { type: 'email', message: '请输入有效的邮箱地址', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  computed: {
+    filteredProjectGroups() {
+      if (!this.form.department) {
+        return []
+      }
+      const departmentId = parseInt(this.form.department)
+      return this.projectGroups.filter(group => group.department === departmentId)
+    }
+  },
+  watch: {
+    personnel: {
+      handler(newVal) {
+        if (newVal) {
+          this.form = { ...newVal }
+        } else {
+          this.resetForm()
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    onDepartmentChange() {
+      // 部门变更时清空项目组选择
+      this.form.project_group = ''
+    },
+
+    resetForm() {
+      this.form = {
+        name: '',
+        student_id: '',
+        gender: '',
+        grade_major: '',
+        department: '',
+        project_group: '',
+        position: '',
+        start_date: '',
+        end_date: '',
+        is_active: true,
+        phone: '',
+        qq: '',
+        email: '',
+        description: ''
+      }
+    },
+
+    async submitForm() {
+      try {
+        await this.$refs.personnelForm.validate()
+
+        // 验证结束时间
+        if (this.form.end_date && this.form.start_date >= this.form.end_date) {
+          this.$message.error('任职结束时间必须晚于开始时间')
+          return
+        }
+
+        const formData = { ...this.form }
+
+        // 如果没有选择项目组，设为null
+        if (!formData.project_group) {
+          formData.project_group = null
+        }
+
+        // 如果没有结束时间，设为null
+        if (!formData.end_date) {
+          formData.end_date = null
+        }
+
+        if (this.personnel && this.personnel.id) {
+          // 更新人员信息
+          await personnelService.updatePersonnel(this.personnel.id, formData)
+          this.$message.success('人员信息更新成功')
+        } else {
+          // 创建新人员
+          await personnelService.createPersonnel(formData)
+          this.$message.success('人员添加成功')
+        }
+
+        this.$emit('submit')
+      } catch (error) {
+        if (error.response && error.response.data) {
+          // 处理后端验证错误
+          const errors = error.response.data
+          for (const field in errors) {
+            if (errors[field] && Array.isArray(errors[field])) {
+              this.$message.error(`${field}: ${errors[field][0]}`)
+            }
+          }
+        } else {
+          this.$message.error('操作失败，请重试')
+        }
+        console.error('提交人员信息失败:', error)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-actions {
+  display: flex;
+  justify-content: center;
+  gap: 20px;
+  margin-top: 30px;
+}
+</style>
@@ -0,0 +1,430 @@
+<template>
+  <div>
+    <AppHeader />
+    <div class="personnel-container">
+      <el-card>
+        <template #header>
+          <div class="card-header">
+            <span>人员管理</span>
+            <el-button type="primary" @click="showAddDialog">
+              <el-icon><Plus /></el-icon>
+              添加人员
+            </el-button>
+          </div>
+        </template>
+
+        <!-- 搜索和筛选区域 -->
+        <div class="filter-section">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-input
+                v-model="searchKeyword"
+                placeholder="搜索姓名、学号、手机号"
+                clearable
+                @input="handleSearch">
+                <template #prefix>
+                  <el-icon><Search /></el-icon>
+                </template>
+              </el-input>
+            </el-col>
+            <el-col :span="4">
+              <el-select v-model="departmentFilter" placeholder="部门筛选" clearable @change="handleFilter">
+                <el-option label="全部部门" value="" />
+                <el-option
+                  v-for="dept in departments"
+                  :key="dept.id"
+                  :label="dept.name"
+                  :value="dept.id" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select v-model="projectGroupFilter" placeholder="项目组筛选" clearable @change="handleFilter">
+                <el-option label="全部项目组" value="" />
+                <el-option
+                  v-for="group in projectGroups"
+                  :key="group.id"
+                  :label="group.name"
+                  :value="group.id" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-input
+                v-model="positionFilter"
+                placeholder="职位搜索"
+                clearable
+                @input="handleFilter">
+                <template #prefix>
+                  <el-icon><Search /></el-icon>
+                </template>
+              </el-input>
+            </el-col>
+            <el-col :span="3">
+              <el-select v-model="statusFilter" placeholder="状态筛选" clearable @change="handleFilter">
+                <el-option label="全部状态" value="" />
+                <el-option label="在职" value="true" />
+                <el-option label="已卸任" value="false" />
+              </el-select>
+            </el-col>
+            <el-col :span="3">
+              <el-button @click="showStatistics" type="success">
+                <el-icon><DataAnalysis /></el-icon>
+                统计信息
+              </el-button>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 人员列表表格 -->
+        <el-table :data="paginatedPersonnel" style="width: 100%" v-loading="loading">
+          <el-table-column prop="name" label="姓名" width="100" />
+          <el-table-column prop="student_id" label="学号" width="120" />
+          <el-table-column prop="gender_display" label="性别" width="80" />
+          <el-table-column prop="grade_major" label="年级专业" min-width="150" />
+          <el-table-column prop="department_name" label="部门" width="120" />
+          <el-table-column prop="project_group_name" label="项目组" width="120">
+            <template #default="scope">
+              {{ scope.row.project_group_name || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="position" label="职位" width="100" />
+          <el-table-column prop="is_active" label="状态" width="80">
+            <template #default="scope">
+              <el-tag :type="scope.row.is_active ? 'success' : 'danger'">
+                {{ scope.row.is_active ? '在职' : '已卸任' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="phone" label="手机号" width="120" />
+          <el-table-column prop="start_date" label="任职开始" width="110" />
+          <el-table-column label="操作" width="300" fixed="right">
+            <template #default="scope">
+              <el-button size="small" @click="viewDetail(scope.row)">详情</el-button>
+              <el-button size="small" @click="editPersonnel(scope.row)">编辑</el-button>
+              <el-button
+                v-if="scope.row.is_active"
+                size="small"
+                type="warning"
+                @click="setInactive(scope.row.id)">
+                设为已卸任
+              </el-button>
+              <el-button
+                v-else
+                size="small"
+                type="success"
+                @click="setActive(scope.row.id)">
+                设为在职
+              </el-button>
+              <el-button size="small" type="danger" @click="deletePersonnel(scope.row.id)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 分页组件 -->
+        <div class="pagination-wrapper">
+          <el-pagination
+            v-model:current-page="currentPage"
+            v-model:page-size="pageSize"
+            :page-sizes="[10, 20, 50, 100]"
+            :total="filteredPersonnel.length"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange">
+          </el-pagination>
+        </div>
+      </el-card>
+
+      <!-- 添加/编辑人员对话框 -->
+      <el-dialog :title="dialogTitle" v-model="dialogVisible" width="60%">
+        <PersonnelForm
+          :personnel="selectedPersonnel"
+          :departments="departments"
+          :project-groups="projectGroups"
+          @submit="handleFormSubmit"
+          @cancel="dialogVisible = false"
+        />
+      </el-dialog>
+
+      <!-- 人员详情对话框 -->
+      <el-dialog title="人员详情" v-model="detailDialogVisible" width="50%">
+        <PersonnelDetail
+          v-if="selectedPersonnel"
+          :personnel="selectedPersonnel"
+          @close="detailDialogVisible = false"
+        />
+      </el-dialog>
+
+      <!-- 统计信息对话框 -->
+      <el-dialog title="人员统计信息" v-model="statisticsDialogVisible" width="70%">
+        <PersonnelStatistics
+          v-if="statistics"
+          :statistics="statistics"
+          @close="statisticsDialogVisible = false"
+        />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { personnelService, projectGroupService, financeService } from '@/services/api'
+import AppHeader from '@/components/AppHeader.vue'
+import PersonnelForm from './PersonnelForm.vue'
+import PersonnelDetail from './PersonnelDetail.vue'
+import PersonnelStatistics from './PersonnelStatistics.vue'
+import { Search, Plus, DataAnalysis } from '@element-plus/icons-vue'
+
+export default {
+  name: 'PersonnelList',
+  components: {
+    AppHeader,
+    PersonnelForm,
+    PersonnelDetail,
+    PersonnelStatistics,
+    Search,
+    Plus,
+    DataAnalysis
+  },
+  data() {
+    return {
+      personnel: [],
+      departments: [],
+      projectGroups: [],
+      statistics: null,
+      loading: false,
+
+      // 搜索和筛选
+      searchKeyword: '',
+      departmentFilter: '',
+      projectGroupFilter: '',
+      positionFilter: '',
+      statusFilter: '',
+
+      // 分页
+      currentPage: 1,
+      pageSize: 20,
+
+      // 对话框
+      dialogVisible: false,
+      detailDialogVisible: false,
+      statisticsDialogVisible: false,
+      dialogTitle: '',
+      selectedPersonnel: null
+    }
+  },
+  computed: {
+    filteredPersonnel() {
+      let filtered = [...this.personnel]
+
+      // 搜索过滤
+      if (this.searchKeyword) {
+        const keyword = this.searchKeyword.toLowerCase()
+        filtered = filtered.filter(person =>
+          person.name.toLowerCase().includes(keyword) ||
+          person.student_id.includes(keyword) ||
+          person.phone.includes(keyword) ||
+          person.email.toLowerCase().includes(keyword)
+        )
+      }
+
+      // 部门筛选
+      if (this.departmentFilter) {
+        filtered = filtered.filter(person => person.department === parseInt(this.departmentFilter))
+      }
+
+      // 项目组筛选
+      if (this.projectGroupFilter) {
+        filtered = filtered.filter(person => person.project_group === parseInt(this.projectGroupFilter))
+      }
+
+      // 职位筛选
+      if (this.positionFilter) {
+        const positionKeyword = this.positionFilter.toLowerCase()
+        filtered = filtered.filter(person =>
+          person.position && person.position.toLowerCase().includes(positionKeyword)
+        )
+      }
+
+      // 状态筛选
+      if (this.statusFilter !== '') {
+        filtered = filtered.filter(person => person.is_active === (this.statusFilter === 'true'))
+      }
+
+      return filtered
+    },
+    paginatedPersonnel() {
+      const start = (this.currentPage - 1) * this.pageSize
+      const end = start + this.pageSize
+      return this.filteredPersonnel.slice(start, end)
+    }
+  },
+  async created() {
+    await this.loadData()
+  },
+  methods: {
+    async loadData() {
+      await Promise.all([
+        this.fetchPersonnel(),
+        this.fetchDepartments(),
+        this.fetchProjectGroups()
+      ])
+    },
+
+    async fetchPersonnel() {
+      this.loading = true
+      try {
+        const response = await personnelService.getAllPersonnel()
+        this.personnel = response.data
+      } catch (error) {
+        this.$message.error('获取人员列表失败')
+        console.error('获取人员列表失败:', error)
+      } finally {
+        this.loading = false
+      }
+    },
+
+    async fetchDepartments() {
+      try {
+        const response = await financeService.getAllDepartments()
+        this.departments = response.data
+      } catch (error) {
+        console.error('获取部门列表失败:', error)
+      }
+    },
+
+    async fetchProjectGroups() {
+      try {
+        const response = await projectGroupService.getAllProjectGroups()
+        this.projectGroups = response.data
+      } catch (error) {
+        console.error('获取项目组列表失败:', error)
+      }
+    },
+
+    handleSearch() {
+      this.currentPage = 1
+    },
+
+    handleFilter() {
+      this.currentPage = 1
+    },
+
+    handleSizeChange(size) {
+      this.pageSize = size
+      this.currentPage = 1
+    },
+
+    handleCurrentChange(page) {
+      this.currentPage = page
+    },
+
+    showAddDialog() {
+      this.selectedPersonnel = null
+      this.dialogTitle = '添加人员'
+      this.dialogVisible = true
+    },
+
+    editPersonnel(personnel) {
+      this.selectedPersonnel = { ...personnel }
+      this.dialogTitle = '编辑人员'
+      this.dialogVisible = true
+    },
+
+    viewDetail(personnel) {
+      this.selectedPersonnel = personnel
+      this.detailDialogVisible = true
+    },
+
+    async showStatistics() {
+      try {
+        const response = await personnelService.getPersonnelStatistics()
+        this.statistics = response.data
+        this.statisticsDialogVisible = true
+      } catch (error) {
+        this.$message.error('获取统计信息失败')
+        console.error('获取统计信息失败:', error)
+      }
+    },
+
+    async setActive(id) {
+      try {
+        await personnelService.setPersonnelActive(id)
+        this.$message.success('已设置为在职状态')
+        await this.fetchPersonnel()
+      } catch (error) {
+        this.$message.error('操作失败')
+        console.error('设置在职状态失败:', error)
+      }
+    },
+
+    async setInactive(id) {
+      try {
+        await this.$confirm('确认设置该人员为已卸任状态？', '确认操作', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+
+        await personnelService.setPersonnelInactive(id)
+        this.$message.success('已设置为已卸任状态')
+        await this.fetchPersonnel()
+      } catch (error) {
+        if (error !== 'cancel') {
+          this.$message.error('操作失败')
+          console.error('设置已卸任状态失败:', error)
+        }
+      }
+    },
+
+    async deletePersonnel(id) {
+      try {
+        await this.$confirm('确认删除该人员信息？此操作不可恢复。', '确认删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+
+        await personnelService.deletePersonnel(id)
+        this.$message.success('删除成功')
+        await this.fetchPersonnel()
+      } catch (error) {
+        if (error !== 'cancel') {
+          this.$message.error('删除失败')
+          console.error('删除人员失败:', error)
+        }
+      }
+    },
+
+    async handleFormSubmit() {
+      this.dialogVisible = false
+      await this.fetchPersonnel()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.personnel-container {
+  padding: 20px;
+  background-color: #f5f7fa;
+  min-height: calc(100vh - 60px);
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.filter-section {
+  margin-bottom: 20px;
+  padding: 20px;
+  background-color: #f8f9fa;
+  border-radius: 8px;
+}
+
+.pagination-wrapper {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+}
+</style>
@@ -0,0 +1,130 @@
+<template>
+  <div class="personnel-statistics">
+    <!-- 总体统计 -->
+    <el-row :gutter="20" class="overview-stats">
+      <el-col :span="8">
+        <el-statistic title="总人数" :value="statistics.overview.total" />
+      </el-col>
+      <el-col :span="8">
+        <el-statistic title="在职人员" :value="statistics.overview.active" />
+      </el-col>
+      <el-col :span="8">
+        <el-statistic title="已卸任人员" :value="statistics.overview.inactive" />
+      </el-col>
+    </el-row>
+
+    <el-divider />
+
+    <!-- 按部门统计 -->
+    <div class="department-stats">
+      <h3>按部门统计</h3>
+      <el-table :data="departmentStatsData" border style="width: 100%">
+        <el-table-column prop="name" label="部门名称" />
+        <el-table-column prop="total" label="总人数" align="center" />
+        <el-table-column prop="active" label="在职" align="center">
+          <template #default="scope">
+            <el-tag type="success">{{ scope.row.active }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="inactive" label="已卸任" align="center">
+          <template #default="scope">
+            <el-tag type="danger">{{ scope.row.inactive }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="在职率" align="center">
+          <template #default="scope">
+            <el-progress
+              :percentage="Math.round((scope.row.active / scope.row.total) * 100)"
+              :color="getProgressColor(scope.row.active / scope.row.total)" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <el-divider />
+
+    <!-- 按职位统计 -->
+    <div class="position-stats">
+      <h3>按职位统计</h3>
+      <el-table :data="positionStatsData" border style="width: 100%">
+        <el-table-column prop="name" label="职位名称" />
+        <el-table-column prop="total" label="总人数" align="center" />
+        <el-table-column prop="active" label="在职" align="center">
+          <template #default="scope">
+            <el-tag type="success">{{ scope.row.active }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="inactive" label="已卸任" align="center">
+          <template #default="scope">
+            <el-tag type="danger">{{ scope.row.inactive }}</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="stats-actions">
+      <el-button @click="$emit('close')">关闭</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PersonnelStatistics',
+  props: {
+    statistics: {
+      type: Object,
+      required: true
+    }
+  },
+  emits: ['close'],
+  computed: {
+    departmentStatsData() {
+      return Object.entries(this.statistics.by_department).map(([name, stats]) => ({
+        name,
+        ...stats
+      }))
+    },
+    positionStatsData() {
+      return Object.entries(this.statistics.by_position).map(([name, stats]) => ({
+        name,
+        ...stats
+      }))
+    }
+  },
+  methods: {
+    getProgressColor(ratio) {
+      if (ratio >= 0.8) return '#67c23a'
+      if (ratio >= 0.6) return '#e6a23c'
+      return '#f56c6c'
+    }
+  }
+}
+</script>
+
+<style scoped>
+.personnel-statistics {
+  padding: 20px 0;
+}
+
+.overview-stats {
+  margin-bottom: 30px;
+}
+
+.department-stats,
+.position-stats {
+  margin-bottom: 30px;
+}
+
+.department-stats h3,
+.position-stats h3 {
+  margin-bottom: 20px;
+  color: #409eff;
+}
+
+.stats-actions {
+  display: flex;
+  justify-content: center;
+  margin-top: 30px;
+}
+</style>