Compare commits
No commits in common. "aad329061bb11375638792b634448ab4112d3d1e" and "4536c136bb4b9ba81e7e35ef2f91e6e6ceb54049" have entirely different histories.
aad329061b
...
4536c136bb
|
|
@ -438,9 +438,6 @@ class EmpJoinViewSet(TicketMixin, EuModelViewSet):
|
||||||
serializer_class = EmpJoinSerializer
|
serializer_class = EmpJoinSerializer
|
||||||
workflow_key = "wf_empjoin"
|
workflow_key = "wf_empjoin"
|
||||||
|
|
||||||
def gen_other_ticket_data(self, instance):
|
|
||||||
return {"dept_need": instance.dept_need}
|
|
||||||
|
|
||||||
@action(methods=['post'], detail=True)
|
@action(methods=['post'], detail=True)
|
||||||
def approve(self, request, pk=None):
|
def approve(self, request, pk=None):
|
||||||
serializer = EmpJoinApproveSerializer(data={'empjoin_id': pk})
|
serializer = EmpJoinApproveSerializer(data={'empjoin_id': pk})
|
||||||
|
|
@ -450,4 +447,3 @@ class EmpJoinViewSet(TicketMixin, EuModelViewSet):
|
||||||
"msg":"审批通过,人员入库",
|
"msg":"审批通过,人员入库",
|
||||||
"count": len(person)
|
"count": len(person)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
@ -41,7 +41,6 @@ class TicketMixin:
|
||||||
raise ParseError('非工单创建人不可修改')
|
raise ParseError('非工单创建人不可修改')
|
||||||
transitions = WfService.get_state_transitions(source_state)
|
transitions = WfService.get_state_transitions(source_state)
|
||||||
if transitions.count() == 1:
|
if transitions.count() == 1:
|
||||||
transition = transitions.first()
|
|
||||||
ticket_data = self.gen_ticket_data(ins)
|
ticket_data = self.gen_ticket_data(ins)
|
||||||
WfService.handle_ticket(ticket=ins.ticket, transition=transition, new_ticket_data=ticket_data,
|
WfService.handle_ticket(ticket=ins.ticket, transition=transition, new_ticket_data=ticket_data,
|
||||||
handler=self.request.user, oinfo=self.request.data)
|
handler=self.request.user, oinfo=self.request.data)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue