选巡查人员优化

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) => {
+      getUserList({pageoff:true, roles__name:'质量巡查成员'}).then((res) => {
-        this.memberOptions =  genTree(res.data);
+        this.leaderOptions = genTree(res.data);
+        this.memberOptions = genTree(res.data);
       });
     },
     //组织列表

client/src/views/system/user.vue

@@ -43,8 +43,8 @@
               />
             </el-select>
             <el-input
-              v-model="listQuery.name"
+              v-model="listQuery.search"
-              placeholder="姓名"
+              placeholder="姓名/邮箱"
               style="width: 200px"
               class="filter-item"
               @keyup.enter.native="handleFilter"

server/apps/system/filters.py

@@ -5,7 +5,4 @@ from .models import User
 class UserFilter(filters.FilterSet):
     class Meta:
         model = User
-        fields = {
+        fields = ['name', 'is_active', 'roles', 'roles__name']
-            'name': ['exact', 'contains'],
-            'is_active': ['exact']
-        }