Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_daq/main.aardio

@@ -76,6 +76,7 @@ if(!atom){
 mainForm.onMinimize = function(lParam){
 	var tray = win.util.tray(mainForm) //创建托盘图标 
 	tray.tip = "数据采集";
+	tray.pop("数据采集已最小化运行" )
 	mainForm.show(false); //隐藏窗口
 	return true;//阻击默认消息传递,取消最小化过程
 }

hb_server/apps/wf/serializers.py

@@ -79,3 +79,7 @@ class TicketFlowSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
     
+class TicketHandleSerializer(serializers.Serializer):
+    transition = serializers.IntegerField(label="流转id")
+    ticket_data = serializers.JSONField(label="表单数据json")
+    suggestion = serializers.CharField(label="处理意见", required = False)

hb_server/apps/wf/views.py

@@ -2,7 +2,7 @@ from django.core.exceptions import AppRegistryNotReady
 from rest_framework.response import Response
 from rest_framework import serializers
 from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModelMixin, RetrieveModelMixin, UpdateModelMixin
-from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketCreateSerializer, TicketFlowSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer
+from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketCreateSerializer, TicketFlowSerializer, TicketHandleSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer
 from django.shortcuts import get_object_or_404, render
 from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from rest_framework.decorators import action, api_view
@@ -99,6 +99,8 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin
     def get_serializer_class(self):
         if self.action == 'create':
             return TicketCreateSerializer
+        elif self.action == 'handle':
+            return TicketHandleSerializer
         return super().get_serializer_class()
 
     def create(self, request, *args, **kwargs):