黑名单增加项目筛选项，看课记录增加所属公司筛选项

src/views/course/courseWatchLog/index.vue

@@ -95,6 +95,9 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="所属部门" prop="deptId">
+        <treeselect style="width:220px" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择所属部门" />
+      </el-form-item>
       <el-form-item v-if="companyName==2" label="所属销售" prop="companyUserId">
         <el-select v-model="queryParams.companyUserId" clearable filterable remote
                    placeholder="请输入关键词"
@@ -625,10 +628,14 @@ import Calendar from 'vue-mobile-calendar'
 import {infoSop} from "@/api/qw/sop";
 import {getCompanyUserListLikeName} from "../../../api/company/companyUser";
 import {getQwList} from "@/api/qw/qwUser";
+import {treeselect} from "@/api/company/companyDept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 Vue.use(Calendar)
 
 export default {
   name: "CourseWatchLog",
+  components: {Treeselect },
   data() {
     return {
       companyUserFirstLoad: true, // 首次加载标志
@@ -682,6 +689,7 @@ export default {
         }
       },
       courseLists:[],
+      deptOptions: undefined,
       scheduleLists:[], // 营期名称
       videoList:[],
       logTypeOptions:[],
@@ -781,6 +789,7 @@ export default {
         qwUserId: null,
         qwUserName: null,
         companyUserId: null,
+        deptId: null,
         companyId: null,
         courseId: null,
         periodId:null,
@@ -829,7 +838,7 @@ export default {
     courseList().then(response => {
       this.courseLists = response.list;
     });
-
+    this.getTreeselect();
     this.getDicts("sys_course_watch_log_type_new").then(response => {
       this.logTypeOptions = response.data;
     });
@@ -850,6 +859,11 @@ export default {
     this.loading=false;
   },
   methods: {
+    getTreeselect() {
+      treeselect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
     // 添加辅助方法
     isEmptyArray(arr) {
       return !arr || arr.length === 0;

src/views/users/user/blacklist.vue

@@ -11,6 +11,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="项目" prop="projectId">
+        <el-select v-model="queryParams.projectId" placeholder="请选择项目" filterable clearable size="small">
+          <el-option
+            v-for="dict in projectOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -111,11 +121,13 @@ export default {
       total: 0,
       // 用户列表数据
       userList: [],
+      projectOptions:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         keyword: null,
+        projectId: null,
         status: 2
       },
       selectUser: []
@@ -123,6 +135,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("sys_course_project").then(response => {
+      this.projectOptions = response.data;
+    });
   },
   methods: {
     /** 查询客户列表 */