From 2eabbf891e68a10cf1c899f92d9c02991cd5cb58 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 12 Oct 2021 17:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=B7=A5=E5=BA=8F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AE=8C=E6=95=B4list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/views.py | 4 ++-- hb_server/apps/wf/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index 7c63a27..a8a85d9 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -53,11 +53,11 @@ class ProcessViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet): serializer = self.serializer_class(instance=Step.objects.prefetch_related('equipments').filter(process=process, is_deleted=False), many=True) return Response(serializer.data) -class StepViewSet(OptimizationMixin, CreateUpdateModelAMixin, CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): +class StepViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet): """ 子工序-增删改查 """ - perms_map = {'*':'process_update'} + perms_map = {'*':'*'} queryset = Step.objects.all() serializer_class = StepSerializer search_fields = ['name', 'number'] diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index f041c1a..22eb977 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -294,9 +294,9 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin """ ticket = self.get_object() if ticket.create_by != request.user: - raise APIException('非创建人不可撤单') + raise APIException('非创建人不可撤回') if not ticket.state.enable_retreat: - raise APIException('该状态不可撤单') + raise APIException('该状态不可撤回') start_state = WfService.get_workflow_start_state(ticket.workflow) ticket.state = start_state ticket.participant_type = State.PARTICIPANT_TYPE_PERSONAL