我的看课记录 和看课记录添加 营期查询条件

src/api/course/userCoursePeriod.js

@@ -8,6 +8,14 @@ export function listPeriod(query) {
     params: query
   })
 }
+// 获取营期名称列表
+export function listPeriodLabel(query) {
+  return request({
+    url: '/course/period/listLabel',
+    method: 'get',
+    params: query
+  })
+}
 // 查询会员营期列表
 export function getDays(query) {
   return request({

src/views/course/courseWatchLog/index.vue

@@ -48,6 +48,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <!-- 营期名称  periodIds-->
+      <el-form-item label="营期名称" prop="periodId">
+        <el-select filterable  v-model="queryParams.periodId" placeholder="请选择营期名称"  clearable size="small">
+          <el-option
+            v-for="dict in scheduleLists"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </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
@@ -603,6 +614,7 @@
 
 <script>
 import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog } from "@/api/course/courseWatchLog";
+import {listPeriodLabel} from "@/api/course/userCoursePeriod";
 import {courseList, listCourseRedPacketLog, videoList} from '@/api/course/courseRedPacketLog'
 import {listLogs} from "@/api/course/courseAnswerlogs";
 import {allListTagGroup} from "../../../api/qw/tagGroup";
@@ -670,6 +682,7 @@ export default {
         }
       },
       courseLists:[],
+      scheduleLists:[], // 营期名称
       videoList:[],
       logTypeOptions:[],
       projectOptions:[],
@@ -770,6 +783,7 @@ export default {
         companyUserId: null,
         companyId: null,
         courseId: null,
+        periodId:null,
         sTime:null,
         eTime:null,
         upSTime:null,
@@ -822,6 +836,10 @@ export default {
     this.getDicts("sys_course_project").then(response => {
       this.projectOptions = response.data;
     });
+    // 查询营期名称
+    listPeriodLabel().then(response => {
+      this.scheduleLists = response.rows;
+    });
 
     // 设置默认当天时间 xgb 防止频繁查询大量数据
     this.setToday();
@@ -1258,6 +1276,7 @@ export default {
         companyUserId: null,
         companyId: null,
         courseId: null,
+        periodId:null,
         sTime:null,
         eTime:null,
         upSTime:null,

src/views/course/courseWatchLog/watchLog.vue

@@ -68,6 +68,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <!-- 营期名称  periodIds-->
+      <el-form-item label="营期名称" prop="periodId">
+        <el-select filterable  v-model="queryParams.periodId" placeholder="请选择营期名称"  clearable size="small">
+          <el-option
+            v-for="dict in scheduleLists"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="课程" prop="courseId">
         <el-select filterable v-model="queryParams.courseId" placeholder="请选择课程" clearable size="small"
                    @change="courseChange(queryParams.courseId)">
@@ -370,6 +381,7 @@
           <img v-else :src="scope.row.externalUserAvatar" style="width:50px;height:50px" />
         </template>
       </el-table-column>
+      <el-table-column label="营期名称" align="center" prop="periodIdName" v-if="this.queryParams.sendType==1" />
       <el-table-column label="课程名称" align="center" prop="courseName"/>
       <el-table-column label="小节名称" align="center" prop="videoName"/>
       <el-table-column label="记录类型" align="center" prop="logType">
@@ -671,6 +683,7 @@ import {
   updateCourseWatchLog
 } from "@/api/course/courseWatchLog";
 import {courseList, myListCourseRedPacketLog, videoList} from '@/api/course/courseRedPacketLog'
+import {listPeriodLabel} from "@/api/course/userCoursePeriod";
 import {myListLogs} from "@/api/course/courseAnswerlogs";
 import {getMyQwUserList} from "@/api/qw/user";
 import {searchTags} from "../../../api/qw/tag";
@@ -732,6 +745,7 @@ export default {
         }
       },
       courseLists: [],
+      scheduleLists:[], // 营期名称
       videoList: [],
       myQwUserList: [],
       logTypeOptions: [],
@@ -833,6 +847,7 @@ export default {
         companyUserId: null,
         companyId: null,
         courseId: null,
+        periodId:null,
         sTime: null,
         eTime: null,
         upSTime:null,
@@ -875,6 +890,10 @@ export default {
     });
     this.getDicts("sys_course_project").then(response => {
       this.projectOptions = response.data;
+    });
+       // 查询营期名称
+    listPeriodLabel().then(response => {
+      this.scheduleLists = response.rows;
     });
     // 设置默认当天时间 xgb 防止频繁查询大量数据
     this.setToday();
@@ -1200,6 +1219,7 @@ export default {
         companyUserId: null,
         companyId: null,
         courseId: null,
+        periodId:null,
         sTime:null,
         eTime:null,
         upSTime:null,