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 apps.utils.models import CommonBModel, CommonADModel
from apps.system.models import User, Dictionary
from enum import Enum
from apps.system.models import User
# 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
select_related_fields = ["create_by", "belong_dept", "keeper", "mgroup"]
search_fields = ["number", "name"]
filterset_class = EquipFilterSet
# def filter_queryset(self, queryset):
# if not self.detail and not self.request.query_params.get('type', None):
# raise ParseError('请指定设备类型')
# return super().filter_queryset(queryset)
def get_queryset(self):
if self.request.method == 'GET' and (not self.request.query_params.get('is_deleted', None)):
self.queryset = Equipment.objects.all()
return super().get_queryset()
@action(methods=["post"], detail=False, perms_map={"post": "equipment.create"}, serializer_class=Serializer)
@transaction.atomic