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

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})
@@ -447,3 +450,4 @@ class EmpJoinViewSet(TicketMixin, EuModelViewSet):
             "msg":"审批通过，人员入库",
             "count": len(person)
         })
+    

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)