diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py
index 4ee2699..caadf32 100644
--- a/hb_server/apps/wf/models.py
+++ b/hb_server/apps/wf/models.py
@@ -87,7 +87,7 @@ class CustomField(BaseModel):
         ('file', '附件')
     )
     workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='所属工作流')
-    field_type = models.IntegerField('类型', help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)')
+    field_type = models.IntegerField('类型', choices=field_type_choices, help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)')
     field_key = models.CharField('字段标识', max_length=50, help_text='字段类型请尽量特殊，避免与系统中关键字冲突')
     field_name = models.CharField('字段名称', max_length=50)
     sort = models.IntegerField('排序', default=0, help_text='工单基础字段在表单中排序为:流水号0,标题20,状态id40,状态名41,创建人80,创建时间100,更新时间120.前端展示工单信息的表单可以根据这个id顺序排列')
diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py
index f0ff192..3df6e29 100644
--- a/hb_server/apps/wf/serializers.py
+++ b/hb_server/apps/wf/serializers.py
@@ -1,6 +1,6 @@
 from rest_framework.serializers import ModelSerializer
 
-from .models import State, Workflow
+from .models import State, Workflow, Transition, CustomField
 
 
 class WorkflowSerializer(ModelSerializer):
@@ -12,3 +12,13 @@ class StateSerializer(ModelSerializer):
     class Meta:
         model = State
         fields = '__all__'
+
+class TransitionSerializer(ModelSerializer):
+    class Meta:
+        model = Transition
+        fields = '__all__'
+
+class CustomFieldSerializer(ModelSerializer):
+    class Meta:
+        model = CustomField
+        fields = '__all__'
diff --git a/hb_server/apps/wf/urls.py b/hb_server/apps/wf/urls.py
index d61f55d..abcd0a7 100644
--- a/hb_server/apps/wf/urls.py
+++ b/hb_server/apps/wf/urls.py
@@ -1,12 +1,14 @@
 from django.db.models import base
 from rest_framework import urlpatterns
-from apps.wf.views import StateViewSet, WorkflowViewSet
+from apps.wf.views import CustomFieldViewSet, StateViewSet, TransitionViewSet, WorkflowViewSet
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 
 router = DefaultRouter()
-router.register('workflow', WorkflowViewSet, basename='workflow')
-router.register('state', StateViewSet, basename='workflowstate')
+router.register('workflow', WorkflowViewSet, basename='wf')
+router.register('state', StateViewSet, basename='wf_state')
+router.register('transition', TransitionViewSet, basename='wf_transitions')
+router.register('customfield', CustomFieldViewSet, basename='wf_customfield')
 urlpatterns = [
     path('', include(router.urls)),
 ]
diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py
index bccd216..d9263e1 100644
--- a/hb_server/apps/wf/views.py
+++ b/hb_server/apps/wf/views.py
@@ -1,11 +1,11 @@
 from rest_framework.response import Response
 from rest_framework import serializers
 from rest_framework.mixins import CreateModelMixin, RetrieveModelMixin, UpdateModelMixin
-from apps.wf.serializers import StateSerializer, WorkflowSerializer
+from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TransitionSerializer, WorkflowSerializer
 from django.shortcuts import render
 from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from rest_framework.decorators import action
-from apps.wf.models import Workflow, State, Transition
+from apps.wf.models import CustomField, Workflow, State, Transition
 from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
 
 
@@ -28,6 +28,24 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet):
         wf = self.get_object()
         serializer = self.serializer_class(instance=State.objects.filter(workflow=wf), many=True)
         return Response(serializer.data)
+    
+    @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=TransitionSerializer)
+    def transitions(self, request, pk=None):
+        """
+        工作流下的流转规则
+        """
+        wf = self.get_object()
+        serializer = self.serializer_class(instance=Transition.objects.filter(workflow=wf), many=True)
+        return Response(serializer.data)
+    
+    @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=CustomFieldSerializer)
+    def customfields(self, request, pk=None):
+        """
+        工作流下的自定义字段
+        """
+        wf = self.get_object()
+        serializer = self.serializer_class(instance=CustomField.objects.filter(workflow=wf), many=True)
+        return Response(serializer.data)
 
 class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet):
     perms_map = {'*':'*'}
@@ -35,4 +53,20 @@ class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, Gener
     serializer_class = StateSerializer
     search_fields = ['name']
     filterset_fields = ['workflow']
+    ordering = ['sort']
+
+class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet):
+    perms_map = {'*':'*'}
+    queryset = Transition.objects.all()
+    serializer_class = TransitionSerializer
+    search_fields = ['name']
+    filterset_fields = ['workflow', 'state']
+    ordering = ['id']
+
+class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet):
+    perms_map = {'*':'*'}
+    queryset = CustomField.objects.all()
+    serializer_class = CustomFieldSerializer
+    search_fields = ['field_name']
+    filterset_fields = ['workflow', 'field_type']
     ordering = ['sort']
\ No newline at end of file