总代理下拉框

apps/agent/serializers.py

@@ -36,6 +36,12 @@ class AgentSerializer(serializers.ModelSerializer):
         return instance
 
 
+class GeneralAgentComboboxSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = GeneralAgent
+        fields = ('id', 'name',)
+
+
 class AgentComboboxSerializer(serializers.ModelSerializer):
     class Meta:
         model = Agent

apps/agent/views.py

@@ -9,15 +9,15 @@ from django.conf import settings
 from utils import response_ok, response_error
 from utils.exceptions import CustomError
 from apps.log.models import BizLog
-from .models import GeneralAgent,Agent,Store
-from .serializers import GeneralAgentSerializer,AgentSerializer,StoreSerializer
-from .filters import GeneralAgentFilter,AgentFilter,StoreFilter
+from .models import GeneralAgent, Agent, Store
+from .serializers import GeneralAgentSerializer, AgentSerializer, StoreSerializer
+from .filters import GeneralAgentFilter, AgentFilter, StoreFilter
 from utils.permission import isLogin, permission_required
-from apps.agent.serializers import AgentComboboxSerializer,StoreComboboxSerializer
+from apps.agent.serializers import AgentComboboxSerializer, StoreComboboxSerializer, GeneralAgentComboboxSerializer
 
 
 class GeneralAgentViewSet(CustomModelViewSet):
-    permission_classes = []
+    permission_classes = [isLogin, ]
     queryset = GeneralAgent.objects.filter()
     serializer_class = GeneralAgentSerializer
 
@@ -42,7 +42,7 @@ class GeneralAgentViewSet(CustomModelViewSet):
 
 
 class AgentViewSet(CustomModelViewSet):
-    permission_classes = []
+    permission_classes = [isLogin, ]
     queryset = Agent.objects.filter()
     serializer_class = AgentSerializer
 
@@ -69,7 +69,7 @@ class AgentViewSet(CustomModelViewSet):
         return response_ok()
 
 class StoreViewSet(CustomModelViewSet):
-    permission_classes = []
+    permission_classes = [isLogin, ]
     queryset = Store.objects.filter()
     serializer_class = StoreSerializer
 
@@ -124,14 +124,19 @@ class AgentDictView(APIView):
     permission_classes = [isLogin, ]
 
     def get(self, request):
+        general_agent = GeneralAgent.objects.filter(Q(create_user=request.user) | Q(id=request.user.general_agent_id))
+        general_agents = GeneralAgentComboboxSerializer(general_agent, many=True).data
+
         rows = Agent.objects.filter(Q(create_user=request.user) | Q(id=request.user.agent_id))
         agents = AgentComboboxSerializer(rows, many=True).data
         stores = []
+
         for row in rows:
             store = Store.objects.filter(agent=row, enable=True, end_date__gte=timezone.now().date())
             store_serializer = StoreComboboxSerializer(store, many=True).data
             stores.extend(store_serializer)
         return response_ok({
+            'general_agents': general_agents,
             'agents': agents,
             'stores': stores,
         })

apps/customer/views.py

@@ -147,7 +147,7 @@ class UserDictView(APIView):
 
 
 class NewCustomerViewSet(CustomModelViewSet):
-    permission_classes = []
+    permission_classes = [isLogin, ]
     queryset = NewCustomer.objects.filter()
     serializer_class = NewCustomerSerializer