diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue index a715356..8cc3efe 100644 --- a/client/src/views/supervision/record.vue +++ b/client/src/views/supervision/record.vue @@ -9,7 +9,21 @@ class="filter-item" @keyup.enter.native="handleFilter" /> - + + + - - + + + 主动上报 + + + + 确认 + + + + - - - + @@ -101,7 +143,7 @@ scope.row.up_user_.name }} - + @@ -225,8 +267,10 @@ diff --git a/server/apps/supervision/filters.py b/server/apps/supervision/filters.py index 4bc0dfb..a72bf80 100644 --- a/server/apps/supervision/filters.py +++ b/server/apps/supervision/filters.py @@ -8,6 +8,7 @@ class RecordFilter(filters.FilterSet): belong_dept=filters.NumberFilter(field_name='belong_dept') content_name = filters.CharFilter(field_name='content__name') state = filters.CharFilter(field_name='state',lookup_expr='icontains') + isself = filters.BooleanFilter(field_name='is_self', lookup_expr='isnull') class Meta: model = Record - fields = ['up_date','content__name','belong_dept','state', 'task', 'content'] + fields = ['up_date','content__name','belong_dept','state','is_self','task', 'content']