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

apps/customer/views.py

@@ -336,14 +336,14 @@ class NewCustomerViewSet(CustomModelViewSet):
     def again_dispatch(self, request, pk):
         #重新分配
         check_permission(request, 'customer.again_dispatch')
-        user_id = request.POST.get('user')
+        track_user_id = request.POST.get('track_user')
         try:
             with transaction.atomic():
                 instance = NewCustomer.objects.filter(id=pk).first()
                 NewCustomerRemind.objects.filter(customer=instance, remind_user_id=instance.track_user_id).delete()
                 next_time = (timezone.now() + datetime.timedelta(days=instance.stage_progress.track_day)).strftime('%Y-%m-%d')
 
-                instance.track_user = User.objects.filter(id=user_id).first()
+                instance.track_user = User.objects.filter(id=track_user_id).first()
                 instance.next_time = next_time
                 instance.save()
                 NewCustomerRemind.objects.create(customer=instance, next_time=next_time,
@@ -354,6 +354,7 @@ class NewCustomerViewSet(CustomModelViewSet):
             return response_error(str(e))
         return response_ok()
 
+
 class StageCountView(APIView):
     permission_classes = [isLogin]