diff --git a/apps/rpm/views.py b/apps/rpm/views.py index 77faa712..580d6e29 100644 --- a/apps/rpm/views.py +++ b/apps/rpm/views.py @@ -195,8 +195,10 @@ class RpjViewSet(CustomModelViewSet): def destroy(self, request, *args, **kwargs): obj = self.get_object() - if obj.state != Rpj.RPJ_CREATE: - raise ParseError('项目非创建状态不可删除') + if obj.state in [Rpj.RPJ_ENTER, Rpj.RPJ_DONE]: + raise ParseError('该项目不可删除') + elif obj.state == Rpj.RPJ_WORKING and Remployee.objects.filter(rpj=obj).exists(): + raise ParseError('该项目人员在厂不可删除') return super().destroy(request, *args, **kwargs) diff --git a/apps/vm/views.py b/apps/vm/views.py index 82a6c4e3..21678c96 100644 --- a/apps/vm/views.py +++ b/apps/vm/views.py @@ -52,8 +52,10 @@ class VisitViewSet(CustomModelViewSet): def destroy(self, request, *args, **kwargs): obj = self.get_object() - if obj.state != Visit.V_CREATE: - raise ParseError('项目非创建状态不可删除') + if obj.state in [Visit.V_ENTER, Visit.V_DONE]: + raise ParseError('该项目不可删除') + elif obj.state == Visit.V_WORKING and Visitor.objects.filter(visit=obj).exists(): + raise ParseError('该项目人员在厂不可删除') return super().destroy(request, *args, **kwargs) # @action(methods=['post'], detail=True, permission_classes=[],