子工序返回完整list
This commit is contained in:
parent
4bab6de73d
commit
2eabbf891e
|
|
@ -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']
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue