diff --git a/apps/hrm/migrations/0019_alter_attendance_note.py b/apps/hrm/migrations/0019_alter_attendance_note.py new file mode 100644 index 00000000..504ebb59 --- /dev/null +++ b/apps/hrm/migrations/0019_alter_attendance_note.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2023-11-17 11:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hrm', '0018_alter_attendance_unique_together'), + ] + + operations = [ + migrations.AlterField( + model_name='attendance', + name='note', + field=models.TextField(blank=True, default='', verbose_name='备注信息'), + ), + ] diff --git a/apps/hrm/models.py b/apps/hrm/models.py index 0e8893bb..95d79b8c 100755 --- a/apps/hrm/models.py +++ b/apps/hrm/models.py @@ -105,7 +105,7 @@ class Attendance(CommonADModel): work_time_end = models.DateTimeField('工作结束时间') state = models.CharField('状态', max_length=20, choices=ATT_STATE_CHOICES, default='pending', help_text=str(ATT_STATE_CHOICES)) - note = models.TextField('备注信息', default='') + note = models.TextField('备注信息', default='', blank=True) class Meta: unique_together = ('employee', 'work_date', 'shift') diff --git a/apps/hrm/serializers.py b/apps/hrm/serializers.py index 506c7d08..5535cd0e 100755 --- a/apps/hrm/serializers.py +++ b/apps/hrm/serializers.py @@ -267,6 +267,8 @@ class CorrectSerializer(serializers.Serializer): class AttendanceSerializer(CustomModelSerializer): employee_name = serializers.CharField( source='employee.name', read_only=True) + belong_dept_name = serializers.CharField( + source='employee.belong_dept.name', read_only=True) post_name = serializers.CharField( source='employee.post.name', read_only=True) shift_name = serializers.CharField(source='shift.name', read_only=True) diff --git a/apps/hrm/views.py b/apps/hrm/views.py index b3a5ef81..d988a47c 100755 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -253,7 +253,8 @@ class AttendanceViewSet(CustomModelViewSet): serializer_class = AttendanceSerializer select_related_fields = ['employee', 'employee__belong_dept', 'employee__post', 'shift'] - filterset_fields = ['employee', 'employee__belong_dept', 'state'] + filterset_fields = ['employee', + 'employee__belong_dept', 'employee__post', 'state'] ordering = ['-create_time']