今正企微看课分析定制查询条件-公司细分到部门和社群

src/views/course/courseUserStatistics/qw/statistics.vue

@@ -13,7 +13,9 @@
       <el-form-item label="添加时间" prop="createTime">
         <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
       </el-form-item>
-      <el-form-item label="公司名称" prop="companyId">
+      
+      <el-form-item label="公司名称" prop="companyId" v-if="!showCompanyField"
+      >
         <el-select style="width: 220px" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
           <el-option
             v-for="item in companys"
@@ -22,7 +24,32 @@
             :value="item.companyId"
           />
         </el-select>
+      </el-form-item> 
+      <el-form-item label="公司" prop="companyId" v-else>
+        <select-tree
+            v-model="selectedCompanyList"
+            :raw-data="deptList"
+            :parentSelectable="true"
+            placeholder="请选择销售"
+            :multiple="true"
+            component-width="300px"
+            :max-display-tags="3"
+            :check-strictly="false"
+            :return-leaf-only="false"
+            @change="handleMultiChange"
+        ></select-tree>
       </el-form-item>
+      <!-- <el-form-item label="公司名称" prop="companyId" v-else
+      >
+        <el-select style="width: 220px" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
+          <el-option
+            v-for="item in companys"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId"
+          />
+        </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>
@@ -462,11 +489,14 @@
 </template>
 
 <script>
+import SelectTree from "@/components/TreeSelect/index.vue";
+import { getDeptData } from '@/api/system/employeeStats'
 import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog,statisticsList,qwWatchLogStatisticsList,qwWatchLogAllStatisticsList } from "@/api/course/courseWatchLog";
 import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import {getCompanyList} from "@/api/company/company";
 export default {
   name: "CourseWatchLog",
+  components: {SelectTree},
   data() {
     return {
       companys: [],
@@ -513,6 +543,7 @@ export default {
         eTime:null,
         scheduleStartTime: null,
         scheduleEndTime: null,
+        userIds:[],
       },
       // 表单参数
       form: {},
@@ -520,8 +551,18 @@ export default {
       rules: {
       },
       scheduleTime: null,
+       // 选中的公司列表
+    selectedCompanyList: null,
+    // 部门/公司树形数据
+    deptList: [],
     };
   },
+computed: {
+    // 计算属性判断是否显示
+    showCompanyField() {
+      return process.env.VUE_APP_TITLE_INDEX === '挑宝网';
+    },
+  },
   created() {
     getCompanyList().then(response => {
       this.companys = response.data;
@@ -534,6 +575,7 @@ export default {
     this.getDicts("sys_course_watch_log_type").then(response => {
       this.logTypeOptions = response.data;
     });
+    this.initCompanyData();
   },
   methods: {
     courseChange(row){
@@ -566,13 +608,18 @@ export default {
     },
     /** 查询短链课程看课记录列表 */
     getList() {
+    if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = JSON.stringify(this.selectedCompanyList);
+    } else {
+        this.queryParams.userIds = [];
+    }
       this.loading = true;
-      qwWatchLogAllStatisticsList(this.queryParams).then(response => {
+    qwWatchLogAllStatisticsList(this.queryParams).then(response => {
         this.courseWatchLogList = response.rows;
         this.total = response.total;
       }).finally(()=>{
         this.loading = false;
-      })
+      })      
     },
     // 取消按钮
     cancel() {
@@ -604,6 +651,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+        this.selectedCompanyList = []; // 清空公司选择
       this.resetForm("queryForm");
       this.createTime = null;
       this.scheduleTime = null;
@@ -671,6 +719,11 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+        if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+    this.queryParams.userIds = this.selectedCompanyList;
+  } else {
+    this.queryParams.userIds = [];
+  }
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有短链课程看课记录数据项?', "警告", {
           confirmButtonText: "确定",
@@ -693,6 +746,17 @@ export default {
         this.queryParams.scheduleEndTime = null;
       }
     },
+    // 公司选择框变化处理
+  handleMultiChange(e) {
+    // 处理公司选择变化
+    // console.log(this.selectedCompanyList)
+  },
+  // 初始化获取公司数据
+  initCompanyData() {
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    });
+  },
   }
 };
 </script>

src/views/course/courseWatchLog/qw/statistics.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公司名" prop="companyId">
+      <el-form-item label="公司名" prop="companyId" v-if="!showCompanyField">
         <el-select filterable style="width: 220px" v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
           <el-option
             v-for="item in companys"
@@ -11,6 +11,20 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="公司" prop="companyId" v-else>
+        <select-tree
+            v-model="selectedCompanyList"
+            :raw-data="deptList"
+            :parentSelectable="true"
+            placeholder="请选择销售"
+            :multiple="true"
+            component-width="300px"
+            :max-display-tags="3"
+            :check-strictly="false"
+            :return-leaf-only="false"
+            @change="handleMultiChange"
+        ></select-tree>
+      </el-form-item>
       <el-form-item label="课程" prop="courseId">
         <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(queryParams.courseId)">
           <el-option
@@ -111,6 +125,8 @@
 </template>
 
 <script>
+  import SelectTree from "@/components/TreeSelect/index.vue";
+import { getDeptData } from '@/api/system/employeeStats'
 import {
   listCourseWatchLog,
   getCourseWatchLog,
@@ -127,6 +143,8 @@ import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import {getCompanyList} from "@/api/company/company";
 export default {
   name: "CourseWatchLog",
+    components: {SelectTree},
+
   data() {
     return {
       signProjectName:"",
@@ -174,6 +192,7 @@ export default {
         eTime:null,
         scheduleStartTime: null,
         scheduleEndTime: null,
+        userIds:[],
       },
       // 表单参数
       form: {},
@@ -181,8 +200,18 @@ export default {
       rules: {
       },
       scheduleTime: null,
+             // 选中的公司列表
+    selectedCompanyList: null,
+    // 部门/公司树形数据
+    deptList: [],
     };
   },
+  computed: {
+    // 计算属性判断是否显示
+    showCompanyField() {
+      return process.env.VUE_APP_TITLE_INDEX === '挑宝网';
+    },
+  },
   created() {
     getSignProjectName().then(res=>{
       this.signProjectName = res.signProjectName;
@@ -203,10 +232,16 @@ export default {
     this.getDicts("sys_course_watch_log_type").then(response => {
       this.logTypeOptions = response.data;
     });
+    this.initCompanyData();
   },
   methods: {
 
     handleStatisExport(){
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+    this.queryParams.userIds = this.selectedCompanyList;
+  } else {
+    this.queryParams.userIds = [];
+  }
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有会员看课统计数据项?', "警告", {
         confirmButtonText: "确定",
@@ -281,6 +316,11 @@ export default {
     },
     /** 查询短链课程看课记录列表 */
     getList() {
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = JSON.stringify(this.selectedCompanyList);
+    } else {
+        this.queryParams.userIds = [];
+    }
       this.loading = true;
       statisticsList(this.queryParams).then(response => {
         this.courseWatchLogList = response.rows;
@@ -313,7 +353,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      if(this.queryParams.companyId == null) {
+      if(this.queryParams.companyId == null && (this.selectedCompanyList == null ||this.selectedCompanyList.length == 0)) {
         this.$message.warning("公司不能为空!")
         return;
       }
@@ -322,6 +362,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.selectedCompanyList = [];
       this.resetForm("queryForm");
       this.createTime = null;
       this.scheduleTime = null;
@@ -411,6 +452,17 @@ export default {
         this.queryParams.scheduleEndTime = null;
       }
     },
+        // 公司选择框变化处理
+  handleMultiChange(e) {
+    // 处理公司选择变化
+    // console.log(this.selectedCompanyList)
+  },
+  // 初始化获取公司数据
+  initCompanyData() {
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    });
+  },
   }
 };
 </script>