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

apps/customer/models.py

@@ -52,7 +52,10 @@ class Customer(models.Model):
         if self.report_status == Customer.REPEAT_REPORT:
             raise CustomError('当前客户报备状态为重复报备！')
 
-        self.check_user = user
-        self.report_status = Customer.CHECKED
-        self.check_time = timezone.now()
-        self.save()
+        if self.report_status == Customer.NOT_CHECKED:
+            self.check_user = user
+            self.report_status = Customer.CHECKED
+            self.check_time = timezone.now()
+            self.save()
+        # if self.report_status == Customer.CHECKED:
+        #     # 撞单

apps/customer/urls.py

@@ -6,8 +6,8 @@ from .views import CustomerViewSet,SourceDictView,ProjectDictView
 
 
 urlpatterns = [
-    url(r'^source/dict/$',SourceDictView.as_view()),
-    url(r'^projects/dict/$',ProjectDictView.as_view()),
+    url(r'^source/dict/$', SourceDictView.as_view()),
+    url(r'^project/dict/$', ProjectDictView.as_view()),
 
 ]