Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

src/views/course/courseRedPacketLog/index.vue

@@ -1,7 +1,19 @@
 <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">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
+      </el-form-item>
 		<el-form-item label="员工" prop="companyUserName">
 		  <el-input
 		    v-model="queryParams.companyUserName"
@@ -222,8 +234,11 @@
 import { courseList,videoList,listCourseRedPacketLog,retryCourseRedPacketLog, myListCourseRedPacketLogNew, getCourseRedPacketLog, delCourseRedPacketLog, addCourseRedPacketLog, updateCourseRedPacketLog, exportCourseRedPacketLog } from "@/api/course/courseRedPacketLog";
 import { getCompanyList } from "@/api/company/company";
 import { periodList } from "@/api/course/userCoursePeriod";
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
 export default {
   name: "CourseRedPacketLog",
+  components: {SelectTree},
   data() {
     return {
 	  companys:[],
@@ -253,6 +268,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      selectedCompanyList: [],
+      deptList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -292,6 +309,9 @@ export default {
 	  courseList().then(response => {
 	    this.courseLists = response.list;
 	  });
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
     periodList(this.queryPeriod).then(response => {
       this.periodLists = response.data;
     });
@@ -343,6 +363,11 @@ export default {
 	  },
     /** 查询短链课程看课记录列表 */
     getList() {
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.userIds = [];
+      }
       this.loading = true;
       listCourseRedPacketLog(this.queryParams).then(response => {
         this.courseRedPacketLogList = response.rows;
@@ -406,6 +431,8 @@ export default {
 	  this.queryParams.sTime=null;
 	  this.queryParams.eTime=null;
 	  this.queryParams.periodId=null;
+      this.selectedCompanyList = [];
+
       this.handleQuery();
     },
     // 多选框选中数据
@@ -478,6 +505,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: "确定",