diff --git a/apps/hrm/views.py b/apps/hrm/views.py index c2634921..1716cd1b 100755 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -438,6 +438,9 @@ 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}) @@ -446,4 +449,5 @@ class EmpJoinViewSet(TicketMixin, EuModelViewSet): return Response({ "msg":"审批通过,人员入库", "count": len(person) - }) \ No newline at end of file + }) + \ No newline at end of file diff --git a/apps/wf/mixins.py b/apps/wf/mixins.py index d39a6ebc..6e38771f 100644 --- a/apps/wf/mixins.py +++ b/apps/wf/mixins.py @@ -41,6 +41,7 @@ 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)