hujingpei 4 vuotta sitten
vanhempi
sitoutus
148aba858c

+ 3 - 2
apps/new_customer/customer/models.py

@@ -19,12 +19,13 @@ class Customer(models.Model):
                                               default=settings.MALE)
     village = models.CharField(max_length=100,verbose_name=u'小区')
     address = models.CharField(max_length=100,verbose_name=u'地址')
-    source = models.CharField(max_length=100,verbose_name=u'地址')
+    source = models.CharField(max_length=100,verbose_name=u'来源')
 
     # project = models.ForeignKey('',max_length=20, verbose_name=u'项目', null=True)
     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', on_delete=models.PROTECT)
+    check_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'审核人',related_name='customer_check_user',
+                                   on_delete=models.PROTECT,null=True)
     check_time = models.DateTimeField(verbose_name=u'审核时间', editable=False, null=True)
 
 

+ 13 - 0
apps/new_customer/customer/urls.py

@@ -0,0 +1,13 @@
+# coding=utf-8
+from django.conf.urls import url, include
+from rest_framework.routers import SimpleRouter
+
+from .views import CustomerViewSet
+
+urlpatterns = [
+
+]
+
+router = SimpleRouter()
+router.register(r'', CustomerViewSet)
+urlpatterns += router.urls

+ 4 - 3
apps/new_customer/customer/views.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 from rest_framework.decorators import action
+from rest_framework import permissions
 from django.utils import timezone
 
 from utils.custom_modelviewset import CustomModelViewSet
@@ -12,7 +13,7 @@ from .filters import CustomerFilter
 
 
 class CustomerViewSet(CustomModelViewSet):
-    permission_classes = [IsTenantUser, ]
+    permission_classes = []
     queryset = Customer.objects.filter()
     serializer_class = CustomerSerializer
 
@@ -48,11 +49,11 @@ class CustomerViewSet(CustomModelViewSet):
             if instance.report_status == Customer.CHECKED:
                 instance.report_status = Customer.REPEAT_REPORT
                 instance.save()
-                raise CustomError('当前客户已审核!')
+                return response_ok('当前客户已审核!')
             if instance.report_status == Customer.REPEAT_REPORT:
                 raise CustomError('当前用户已重复报备!')
 
-            instance.status = report_status
+            instance.report_status = report_status
             instance.check_time = timezone.now()
             instance.save()
 

+ 13 - 0
apps/new_customer/urls.py

@@ -0,0 +1,13 @@
+# coding=utf-8
+from django.conf.urls import url, include
+from rest_framework.routers import SimpleRouter
+
+
+
+urlpatterns = [
+    url(r'^customer/', include('apps.new_customer.customer.urls')),
+]
+
+# router = SimpleRouter()
+# router.register(r'', )
+# urlpatterns += router.urls

+ 1 - 0
decorate/settings.py

@@ -48,6 +48,7 @@ INSTALLED_APPS = [
     'apps.api',
     'apps.upload',
     'apps.agent',
+    'apps.new_customer',
     'apps.option',
 
 ]

+ 1 - 0
decorate/urls.py

@@ -25,6 +25,7 @@ urlpatterns = [
     url(r'^$', index),
     url(r'^account/', include('apps.account.urls')),
     url(r'^api/', include('apps.api.urls')),
+    url(r'^new_customer/', include('apps.new_customer.urls')),
     url(r'^option/', include('apps.option.urls')),
 ]