zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

This commit is contained in:
caoqianming 2025-12-23 10:25:19 +08:00
parent 55c94a83ce aad329061b
commit da1f587036
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/hrm/views.py
View File

@ -438,6 +438,9 @@ 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})
@ -446,4 +449,5 @@ class EmpJoinViewSet(TicketMixin, EuModelViewSet):
return Response({ return Response({
"msg":"审批通过，人员入库", "msg":"审批通过，人员入库",
"count": len(person) "count": len(person)
}) })

1
apps/wf/mixins.py
View File

@ -41,6 +41,7 @@ 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)