diff --git a/apps/enm/filters.py b/apps/enm/filters.py index c9efef29..396847cf 100644 --- a/apps/enm/filters.py +++ b/apps/enm/filters.py @@ -17,7 +17,7 @@ class MpointStatFilter(filters.FilterSet): "mgroup__name": ["exact"], "mpoint__mgroup": ["exact"], "mpoint__material": ["exact"], - "mpoint__material__code": ["exact"], + "mpoint__material__code": ["exact", "in"], "mpoint__need_display": ["exact"], "mpoint__mgroup__belong_dept": ["exact"], "mpoint__ep_belong": ["exact"], diff --git a/apps/enm/views.py b/apps/enm/views.py index 982e5e32..5ea5826e 100644 --- a/apps/enm/views.py +++ b/apps/enm/views.py @@ -24,7 +24,21 @@ class MpointViewSet(CustomModelViewSet): queryset = Mpoint.objects.all() serializer_class = MpointSerializer select_related_fields = ["create_by", "belong_dept", "ep_monitored", "ep_belong", "mgroup"] - filterset_fields = ["belong_dept", "ep_monitored", "ep_belong", "mgroup", "type", "mgroup__name", "val_type", "enabled", "need_display", "formula", "material", "material__code"] + filterset_fields = { + "belong_dept": ["exact"], + "ep_monitored": ["exact"], + "ep_belong": ["exact"], + "mgroup": ["exact"], + "type": ["exact"], + "mgroup__name": ["exact"], + "val_type": ["exact"], + "enabled": ["exact"], + "need_display": ["exact"], + "formula": ["exact", "contains"], + "material": ["exact"], + "material__code": ["exact", "in"] + } + search_fields = ["name", "code"] ordering = ["create_time", "name", "code"]