feat: equipment 列表支持is_deleted查询

This commit is contained in:
caoqianming 2024-11-20 13:18:42 +08:00
parent 16272cd15f
commit 8667267046
2 changed files with 6 additions and 7 deletions

View File

@ -1,7 +1,6 @@
from django.db import models from django.db import models
from apps.utils.models import CommonBModel, CommonADModel from apps.utils.models import CommonBModel, CommonADModel
from apps.system.models import User, Dictionary from apps.system.models import User
from enum import Enum
# Create your models here. # Create your models here.

View File

@ -41,16 +41,16 @@ class EquipmentViewSet(CustomModelViewSet):
设备列表 设备列表
""" """
queryset = Equipment.objects.all() queryset = Equipment.objects.get_queryset(all=True)
serializer_class = EquipmentSerializer serializer_class = EquipmentSerializer
select_related_fields = ["create_by", "belong_dept", "keeper", "mgroup"] select_related_fields = ["create_by", "belong_dept", "keeper", "mgroup"]
search_fields = ["number", "name"] search_fields = ["number", "name"]
filterset_class = EquipFilterSet filterset_class = EquipFilterSet
# def filter_queryset(self, queryset): def get_queryset(self):
# if not self.detail and not self.request.query_params.get('type', None): if self.request.method == 'GET' and (not self.request.query_params.get('is_deleted', None)):
# raise ParseError('请指定设备类型') self.queryset = Equipment.objects.all()
# return super().filter_queryset(queryset) return super().get_queryset()
@action(methods=["post"], detail=False, perms_map={"post": "equipment.create"}, serializer_class=Serializer) @action(methods=["post"], detail=False, perms_map={"post": "equipment.create"}, serializer_class=Serializer)
@transaction.atomic @transaction.atomic