Compare commits

..

No commits in common. "aad329061bb11375638792b634448ab4112d3d1e" and "4536c136bb4b9ba81e7e35ef2f91e6e6ceb54049" have entirely different histories.

2 changed files with 1 additions and 6 deletions

View File

@ -438,9 +438,6 @@ class EmpJoinViewSet(TicketMixin, EuModelViewSet):
serializer_class = EmpJoinSerializer
workflow_key = "wf_empjoin"
def gen_other_ticket_data(self, instance):
return {"dept_need": instance.dept_need}
@action(methods=['post'], detail=True)
def approve(self, request, pk=None):
serializer = EmpJoinApproveSerializer(data={'empjoin_id': pk})
@ -449,5 +446,4 @@ class EmpJoinViewSet(TicketMixin, EuModelViewSet):
return Response({
"msg":"审批通过,人员入库",
"count": len(person)
})
})

View File

@ -41,7 +41,6 @@ class TicketMixin:
raise ParseError('非工单创建人不可修改')
transitions = WfService.get_state_transitions(source_state)
if transitions.count() == 1:
transition = transitions.first()
ticket_data = self.gen_ticket_data(ins)
WfService.handle_ticket(ticket=ins.ticket, transition=transition, new_ticket_data=ticket_data,
handler=self.request.user, oinfo=self.request.data)