From 27591e5fd3e21c969d91bd386bae5747e413a974 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 29 Apr 2021 09:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E5=B7=A1=E6=9F=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/qualityinspect/inspecttaskdo.vue | 10 ++++++----
 client/src/views/system/user.vue                  |  4 ++--
 server/apps/system/filters.py                     |  5 +----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/src/views/qualityinspect/inspecttaskdo.vue b/client/src/views/qualityinspect/inspecttaskdo.vue
index 892e296..9632155 100644
--- a/client/src/views/qualityinspect/inspecttaskdo.vue
+++ b/client/src/views/qualityinspect/inspecttaskdo.vue
@@ -394,7 +394,7 @@ export default {
   created() {
     this.task.id = this.$route.params.id;
     this.getinspecttask();//主任务信息
-    this.getTypeAll();//组长
+    //this.getTypeAll();//组长
     this.getUserList();//组员
      this.getOrgList();//组织
      this.getsubinspecttasklist();//子任务名
@@ -416,14 +416,16 @@ export default {
     },
     //组长列表
     getTypeAll() {
-      getUserList({pageoff:true}).then((res) => {
+      getUserList({pageoff:true, roles__name:'质量巡查成员'}).then((res) => {
         this.leaderOptions = genTree(res.data);
+        this.memberOptions = genTree(res.data);
       });
     },
     //组员列表
     getUserList() {
-      getUserList({pageoff:true}).then((res) => {
-        this.memberOptions =  genTree(res.data);
+      getUserList({pageoff:true, roles__name:'质量巡查成员'}).then((res) => {
+        this.leaderOptions = genTree(res.data);
+        this.memberOptions = genTree(res.data);
       });
     },
     //组织列表
diff --git a/client/src/views/system/user.vue b/client/src/views/system/user.vue
index 17a26d0..a225cd1 100644
--- a/client/src/views/system/user.vue
+++ b/client/src/views/system/user.vue
@@ -43,8 +43,8 @@
               />
             </el-select>
             <el-input
-              v-model="listQuery.name"
-              placeholder="姓名"
+              v-model="listQuery.search"
+              placeholder="姓名/邮箱"
               style="width: 200px"
               class="filter-item"
               @keyup.enter.native="handleFilter"
diff --git a/server/apps/system/filters.py b/server/apps/system/filters.py
index 9d1814d..2914020 100644
--- a/server/apps/system/filters.py
+++ b/server/apps/system/filters.py
@@ -5,7 +5,4 @@ from .models import User
 class UserFilter(filters.FilterSet):
     class Meta:
         model = User
-        fields = {
-            'name': ['exact', 'contains'],
-            'is_active': ['exact']
-        }
+        fields = ['name', 'is_active', 'roles', 'roles__name']