订单

apps/customer/filters.py

@@ -33,13 +33,12 @@ class NewCustomerFilter(django_filters.FilterSet):
         return queryset
 
     def count_param_filter(self, queryset, name,value):
-        today = timezone.now()
+        # 查询主跟踪人
+        today = timezone.now().date()
         if value == 'today':
-            customer_ids = NewCustomerRemind.objects.filter(next_time=today).values_list('customer_id', flat=True)
-            queryset = queryset.filter(id__in=customer_ids)
+            queryset = queryset.filter(next_time=today)
         elif value == 'overdue':
-            customer_ids = NewCustomerRemind.objects.filter(next_time__lt=today).values_list('customer_id',flat=True)
-            queryset = queryset.filter(id__in=customer_ids)
+            queryset = queryset.filter(next_time__lt=today)
         return queryset
 
     class Meta:

apps/customer/views.py

@@ -351,7 +351,8 @@ class StageCountView(APIView):
         stage_progress = Option.objects.filter(type=Option.STAGE_PROGRESS, enable=True).order_by('sort').values('id','name')
         time_now = timezone.now().strftime('%Y-%m-%d')
         for stage in stage_progress:
-            reminds = NewCustomerRemind.objects.filter(customer__stage_progress=stage['id'])
+            # 查询正常状态客户
+            reminds = NewCustomerRemind.objects.filter(customer__stage_progress=stage['id'], customer__status=NewCustomer.NORMAL)
             if type == 'store':
                 reminds = reminds.filter(customer__store_id=id, is_employee=True)
             elif type == 'user':

apps/order/views.py

@@ -31,12 +31,14 @@ class GetProcessView(APIView):
         if not instance:
             raise CustomError('当前客户信息有误,请刷新重试！')
         if instance.stage_progress.end_stage:
-            raise CustomError('当前客户进度已到最后阶段，请勿重复更新！')
+            data = {
+                'error_message': u'当前客户订单等待分配中，请勿重复更新！',
+            }
+            return response_ok(data)
         order = Order.objects.filter(customer=instance).first()
         # 分配服务人员，不做重复更新判断
         if order and order.status == Order.WAIT_DISPATCH and not dispatch:
             data = {
-                'error': True,
                 'error_message': u'当前客户订单等待分配中，请勿重复更新！',
             }
             return response_ok(data)
@@ -52,7 +54,6 @@ class GetProcessView(APIView):
             return response_ok(data)
         else:
             data = {
-                'error': True,
                 'error_message': u'未找到下个阶段进度，请联系管理员设置！',
             }
             return response_ok(data)

uis/views/order/update_process.html

@@ -160,7 +160,7 @@
             url: '/order/get_process/?customer_id=' + customer_id
             , type: 'get'
             , done: function (res) {
-                if (res.data.error) {
+                if (res.data.error_message) {
                     layer.open({
                         type: 1
                         , offset: 'auto' //具体配置参考：http://www.layui.com/doc/modules/layer.html#offset