From d720e993a4927389d6dd250e84b76b16a4e1dbe4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 9 Apr 2020 19:00:09 +0800
Subject: [PATCH] search phone

---
 test_client/src/views/crm/consumer.vue |  2 +-
 test_server/crm/views.py               | 37 +++++++++++++-------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index d784c71..ed5cf99 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -33,7 +33,7 @@
       </el-select> -->
       <el-input
         v-model="search"
-        placeholder="姓名"
+        placeholder="姓名或手机号"
         style="width: 200px;"
         class="filter-item"
         @keyup.enter.native="handleSearch"
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 65a992c..628614f 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -82,7 +82,7 @@ class ConsumerViewSet(ModelViewSet):
     ordering = ['company','-create_time']
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_fields = ('company',)
-    search_fields = ('^name',)
+    search_fields = ('^name','^username')
 
     def get_queryset(self):
         queryset = self.queryset
@@ -211,26 +211,27 @@ class ConsumerViewSet(ModelViewSet):
             subjects = sheet['d'+str(m)].value
             workscope = sheet['e'+str(m)].value
             if Consumer.objects.filter(username = username).exists():
-                consumerdict[username]=m
+                obj = Consumer.objects.filter(username = username).first()
             else:
                 obj = Consumer()
-                obj.name = name
                 obj.username = username
-                obj.company = companyobj
-                if workscope:
-                    workscope = workscope.replace(' ', '')
-                    try:
-                        workscopeobj = WorkScope.objects.get(name=workscope)
-                        obj.workscope = workscopeobj
-                    except:
-                        pass
-                obj.save()
-                if subjects:
-                    subjects_list = subjects.replace(' ','').split(',')
-                    for i in subjects_list:
-                        queryset = Questioncat.objects.filter(name=i,is_subject=True,is_delete=False)  
-                        if queryset.exists():
-                            PaySubject.objects.create(subject=queryset.first(), consumer=obj)
+            obj.name = name
+            obj.company = companyobj
+            obj.is_delete = False
+            if workscope:
+                workscope = workscope.replace(' ', '')
+                try:
+                    workscopeobj = WorkScope.objects.get(name=workscope)
+                    obj.workscope = workscopeobj
+                except:
+                    pass
+            obj.save()
+            if subjects:
+                subjects_list = subjects.replace(' ','').split(',')
+                for i in subjects_list:
+                    queryset = Questioncat.objects.filter(name=i,is_subject=True,is_delete=False)  
+                    if queryset.exists():
+                        PaySubject.objects.create(subject=queryset.first(), consumer=obj)
                 
             m = m + 1
         return Response(status=status.HTTP_200_OK)