From db6114cc99419fea2b4b352d027cb9d348a87f6c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 1 Jun 2020 17:13:54 +0800
Subject: [PATCH] search examtest

---
 test_client/src/views/analyse/examtest.vue | 9 ++++++++-
 test_server/examtest/views.py              | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/test_client/src/views/analyse/examtest.vue b/test_client/src/views/analyse/examtest.vue
index 08a6547..9ea25e5 100644
--- a/test_client/src/views/analyse/examtest.vue
+++ b/test_client/src/views/analyse/examtest.vue
@@ -41,6 +41,13 @@
       end-placeholder="结束日期"
       :picker-options="pickerOptions">
     </el-date-picker>
+    <el-input
+        v-model="listQuery.search"
+        placeholder="输入用户名或用户单位名搜索"
+        style="width: 200px;"
+        class="filter-item"
+        @keyup.enter.native="handleFilter"
+      />
       <el-button
         class="filter-item"
         type="primary"
@@ -66,7 +73,7 @@
       <el-table-column align="left" label="类型">
         <template slot-scope="scope">{{ scope.row.type }}</template>
       </el-table-column>
-      <el-table-column align="left" label="消费者">
+      <el-table-column align="left" label="用户">
         <template slot-scope="scope">{{ scope.row.consumer_name }}</template>
       </el-table-column>
       <el-table-column align="left" label="单位">
diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py
index 413d10f..dfc53c2 100644
--- a/test_server/examtest/views.py
+++ b/test_server/examtest/views.py
@@ -225,7 +225,7 @@ class ExamTestViewSet(ModelViewSet):
     serializer_class = ExamTestListSerializer
     ordering_fields = ('id','create_time','took','score')
     ordering = ['-create_time']
-    search_fields = ('^name',)
+    search_fields = ('consumer__name', 'consumer__company__name')
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_fields = ['type','is_pass']