Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/decorate

apps/customer/filters.py

@@ -1,12 +1,12 @@
 # coding=utf-8
 import django_filters
 
-from .models import Customer
+from .models import ReportCustomer
 
-class CustomerFilter(django_filters.FilterSet):
+class ReportCustomerFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
     tel = django_filters.CharFilter(field_name='tel', lookup_expr='icontains')
 
     class Meta:
-        model = Customer
+        model = ReportCustomer
         fields = '__all__'

apps/customer/models.py

@@ -7,7 +7,7 @@ from utils.exceptions import CustomError
 from apps.option.models import Option
 
 
-class Customer(models.Model):
+class ReportCustomer(models.Model):
     NOT_CHECKED = 0
     CHECKED = 1
     REPEAT_REPORT = 2
@@ -24,9 +24,9 @@ class Customer(models.Model):
     village = models.CharField(max_length=100, verbose_name=u'小区')
     address = models.CharField(max_length=100, verbose_name=u'地址')
     source = models.ForeignKey(Option, max_length=100, verbose_name=u'来源', related_name='customer_source',
-                               on_delete=models.PROTECT, null=True)
+                               on_delete=models.PROTECT)
     project = models.ForeignKey(Option, max_length=100, verbose_name=u'项目', related_name='customer_category',
-                                on_delete=models.PROTECT, null=True)
+                                on_delete=models.PROTECT)
     notes = models.CharField(max_length=500, verbose_name=u"备注", null=True)
     report_status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, verbose_name=u'报备状态', default=NOT_CHECKED)
     check_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'审核人', related_name='customer_check_user',
@@ -49,12 +49,12 @@ class Customer(models.Model):
 
     def check_customer(self, user):
         # 审核
-        if self.report_status == Customer.REPEAT_REPORT:
+        if self.report_status == ReportCustomer.REPEAT_REPORT:
             raise CustomError('当前客户报备状态为重复报备！')
 
-        if self.report_status == Customer.NOT_CHECKED:
+        if self.report_status == ReportCustomer.NOT_CHECKED:
             self.check_user = user
-            self.report_status = Customer.CHECKED
+            self.report_status = ReportCustomer.CHECKED
             self.check_time = timezone.now()
             self.save()
         # if self.report_status == Customer.CHECKED:

apps/customer/serializers.py

@@ -1,13 +1,13 @@
 # coding=utf-8
 from rest_framework import serializers
 
-from .models import Customer
+from .models import ReportCustomer
 
-class CustomerSerializer(serializers.ModelSerializer):
+class ReportCustomerSerializer(serializers.ModelSerializer):
     gender_text = serializers.CharField(source='get_gender_display', read_only=True)
     report_status_text = serializers.CharField(source='get_report_status_display', read_only=True)
     check_time= serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
 
     class Meta:
-        model = Customer
+        model = ReportCustomer
         fields = '__all__'

apps/customer/urls.py

@@ -2,15 +2,14 @@
 from django.conf.urls import url, include
 from rest_framework.routers import SimpleRouter
 
-from .views import CustomerViewSet,SourceDictView,ProjectDictView
+from .views import ReportCustomerViewSet,ReportCustomerDictView
 
 
 urlpatterns = [
-    url(r'^source/dict/$', SourceDictView.as_view()),
-    url(r'^project/dict/$', ProjectDictView.as_view()),
+    url(r'^dict/$', ReportCustomerDictView.as_view()),
 
 ]
 
 router = SimpleRouter()
-router.register(r'', CustomerViewSet)
+router.register(r'', ReportCustomerViewSet)
 urlpatterns += router.urls

apps/customer/views.py

@@ -1,8 +1,8 @@
 # coding=utf-8
 from rest_framework.decorators import action
 from rest_framework import permissions
-
 from rest_framework.views import APIView
+from django.db.models import Q
 
 from utils.custom_modelviewset import CustomModelViewSet
 from utils.permission import IsAdministratorUser,IsTenantUser
@@ -10,27 +10,27 @@ from utils.exceptions import CustomError
 from utils import response_ok, response_error
 from apps.option.models import Option
 from apps.option.serializers import OptionComboboxSerializer
-from .models import Customer
-from .serializers import CustomerSerializer
-from .filters import CustomerFilter
+from .models import ReportCustomer
+from .serializers import ReportCustomerSerializer
+from .filters import ReportCustomerFilter
 
 
-class CustomerViewSet(CustomModelViewSet):
+class ReportCustomerViewSet(CustomModelViewSet):
     permission_classes = []
-    queryset = Customer.objects.filter()
-    serializer_class = CustomerSerializer
+    queryset = ReportCustomer.objects.filter()
+    serializer_class = ReportCustomerSerializer
 
     def filter_queryset(self, queryset):
-        f = CustomerFilter(self.request.GET, queryset=queryset)
+        f = ReportCustomerFilter(self.request.GET, queryset=queryset)
         return f.qs
 
     def perform_create(self, serializer):
-        super(CustomerViewSet, self).perform_create(serializer)
+        super(ReportCustomerViewSet, self).perform_create(serializer)
         instance = serializer.instance
         validated_data = serializer.validated_data
 
     def perform_update(self, serializer):
-        super(CustomerViewSet, self).perform_update(serializer)
+        super(ReportCustomerViewSet, self).perform_update(serializer)
         instance = serializer.instance
         validated_data = serializer.validated_data
 
@@ -38,7 +38,7 @@ class CustomerViewSet(CustomModelViewSet):
         instance = self.get_object()
         # if instance.tenant != request.user.employee.tenant:
         #     raise CustomError(u'禁止跨企业操作！')
-        super(CustomerViewSet, self).destroy(self, request, *args, **kwargs)
+        super(ReportCustomerViewSet, self).destroy(self, request, *args, **kwargs)
         return response_ok()
 
     # @action(methods=['post'], detail=False)
@@ -61,19 +61,15 @@ class CustomerViewSet(CustomModelViewSet):
     #         return response_error(str(e))
     #     return response_ok('审核完成！')
 
-class SourceDictView(APIView):
+class ReportCustomerDictView(APIView):
     permission_classes = []
 
     def get(self, request):
-        rows = Option.objects.filter(type=Option.CUSTOMER_SOURCE,enable=True)
+        rows = Option.objects.filter(Q(type=Option.CUSTOMER_SOURCE)|Q(type=Option.CATEGORY), enable=True)
         serializer = OptionComboboxSerializer(rows, many=True)
-        return response_ok(serializer.data)
-
+        return response_ok({
+            "source": serializer.data,
+            "project": serializer.data,
+        })
 
-class ProjectDictView(APIView):
-    permission_classes = []
 
-    def get(self, request):
-        rows = Option.objects.filter(type=Option.CATEGORY, enable=True)
-        serializer = OptionComboboxSerializer(rows, many=True)
-        return response_ok(serializer.data)