search phone

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"

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,12 +211,13 @@ 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.name = name
             obj.company = companyobj
+            obj.is_delete = False
             if workscope:
                 workscope = workscope.replace(' ', '')
                 try: