Преглед изворни кода

看课记录显示被删除的小节

三七 пре 11 часа
родитељ
комит
ca60e625e6

+ 7 - 0
src/api/course/courseRedPacketLog.js

@@ -43,6 +43,13 @@ export function videoList(id) {
     method: 'get'
   })
 }
+
+export function videoListByWatch(id) {
+    return request({
+        url: '/course/courseRedPacketLog/videoListByWatch/' + id,
+        method: 'get'
+    })
+}
 // 新增短链课程看课记录
 export function addCourseRedPacketLog(data) {
   return request({

+ 7 - 3
src/views/course/courseWatchLog/deptWatchLog.vue

@@ -92,7 +92,11 @@
             :key="dict.dictValue"
             :label="dict.dictLabel"
             :value="dict.dictValue"
-          />
+          >
+            <span style="float: left">{{ dict.dictLabel }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">ID: {{ dict.dictValue }}</span>
+            <span v-if="dict.isDel === 1" style="float: right; color: #f56c6c; font-size: 13px; margin-right: 10px">已删除</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <!-- sop名称 -->
@@ -522,7 +526,7 @@ import {
   getCourseWatchLog,
   updateCourseWatchLog
 } from "@/api/course/courseWatchLog";
-import {courseList, myListCourseRedPacketLog, videoList} from '@/api/course/courseRedPacketLog'
+import {courseList, myListCourseRedPacketLog, videoListByWatch} from '@/api/course/courseRedPacketLog'
 import {myListLogs} from "@/api/course/courseAnswerlogs";
 import {getCompanyUserListLikeName} from "@/api/company/companyUser";
 import {getTask} from "@/api/common";
@@ -772,7 +776,7 @@ export default {
         this.videoList=[];
         return
       }
-      videoList(row).then(response => {
+        videoListByWatch(row).then(response => {
         this.videoList=response.list
       });
     },

+ 7 - 3
src/views/course/courseWatchLog/index.vue

@@ -84,7 +84,11 @@
             :key="dict.dictValue"
             :label="dict.dictLabel"
             :value="dict.dictValue"
-          />
+          >
+              <span style="float: left">{{ dict.dictLabel }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">ID: {{ dict.dictValue }}</span>
+              <span v-if="dict.isDel === 1" style="float: right; color: #f56c6c; font-size: 13px; margin-right: 10px">已删除</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item v-if="companyName === undefined || companyName === 1" label="所属销售" prop="companyUserId">
@@ -691,7 +695,7 @@ import {
   updateCourseWatchLog
 } from "@/api/course/courseWatchLog";
 import {listPeriodLabel} from "@/api/course/userCoursePeriod";
-import {courseList, listCourseRedPacketLog, videoList} from '@/api/course/courseRedPacketLog'
+import {courseList, listCourseRedPacketLog, videoListByWatch} from '@/api/course/courseRedPacketLog'
 import {listLogs} from "@/api/course/courseAnswerlogs";
 import {allListTagGroup} from "../../../api/qw/tagGroup";
 import {searchTags} from "../../../api/qw/tag";
@@ -1149,7 +1153,7 @@ export default {
         this.videoList=[];
         return
       }
-      videoList(row).then(response => {
+        videoListByWatch(row).then(response => {
         this.videoList=response.list
       });
     },

+ 7 - 3
src/views/course/courseWatchLog/myCourseWatchLog.vue

@@ -64,7 +64,11 @@
             :key="dict.dictValue"
             :label="dict.dictLabel"
             :value="dict.dictValue"
-          />
+          >
+              <span style="float: left">{{ dict.dictLabel }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">ID: {{ dict.dictValue }}</span>
+              <span v-if="dict.isDel === 1" style="float: right; color: #f56c6c; font-size: 13px; margin-right: 10px">已删除</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -282,7 +286,7 @@
 
 <script>
 import { myListCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog } from "@/api/course/courseWatchLog";
-import { courseList,videoList } from '@/api/course/courseRedPacketLog'
+import { courseList,videoListByWatch } from '@/api/course/courseRedPacketLog'
 import {getMyQwUserList} from "@/api/qw/user";
 import {allListTagGroup} from "../../../api/qw/tagGroup";
 import {searchTags} from "../../../api/qw/tag";
@@ -397,7 +401,7 @@ export default {
         this.videoList=[];
         return
       }
-      videoList(row).then(response => {
+        videoListByWatch(row).then(response => {
         this.videoList=response.list
       });
     },

+ 7 - 3
src/views/course/courseWatchLog/statistics.vue

@@ -18,7 +18,11 @@
             :key="dict.dictValue"
             :label="dict.dictLabel"
             :value="dict.dictValue"
-          />
+          >
+              <span style="float: left">{{ dict.dictLabel }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">ID: {{ dict.dictValue }}</span>
+              <span v-if="dict.isDel === 1" style="float: right; color: #f56c6c; font-size: 13px; margin-right: 10px">已删除</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="销售昵称" prop="nickName">
@@ -66,7 +70,7 @@
 
 <script>
 import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog,statisticsList } from "@/api/course/courseWatchLog";
-import { courseList,videoList } from '@/api/course/courseRedPacketLog'
+import { courseList,videoListByWatch } from '@/api/course/courseRedPacketLog'
 import PaginationMore from "../../../components/PaginationMore/index.vue";
 import {getDateRange} from "@/utils/common";
 export default {
@@ -148,7 +152,7 @@ export default {
         this.videoList=[];
         return
       }
-      videoList(row).then(response => {
+        videoListByWatch(row).then(response => {
         this.videoList=response.list
       });
     },

+ 7 - 3
src/views/course/courseWatchLog/watchLog.vue

@@ -105,7 +105,11 @@
             :key="dict.dictValue"
             :label="dict.dictLabel"
             :value="dict.dictValue"
-          />
+          >
+              <span style="float: left">{{ dict.dictLabel }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">ID: {{ dict.dictValue }}</span>
+              <span v-if="dict.isDel === 1" style="float: right; color: #f56c6c; font-size: 13px; margin-right: 10px">已删除</span>
+          </el-option>
         </el-select>
       </el-form-item>
 
@@ -815,7 +819,7 @@ import {
   myListCourseWatchLog,
   updateCourseWatchLog
 } from "@/api/course/courseWatchLog";
-import {courseList, myListCourseRedPacketLog, videoList} from '@/api/course/courseRedPacketLog'
+import {courseList, myListCourseRedPacketLog, videoListByWatch} from '@/api/course/courseRedPacketLog'
 import {listPeriodLabel} from "@/api/course/userCoursePeriod";
 import {myListLogs} from "@/api/course/courseAnswerlogs";
 import {getMyQwUserList} from "@/api/qw/user";
@@ -1148,7 +1152,7 @@ export default {
         this.videoList = [];
         return
       }
-      videoList(row).then(response => {
+        videoListByWatch(row).then(response => {
         this.videoList = response.list
       });
     },

+ 2 - 2
src/views/course/courseWatchLog/watchLogStatistics.vue

@@ -71,7 +71,7 @@
 <script>
 import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog,watchLogStatistics,watchLogStatisticsExport } from "@/api/course/courseWatchLog";
 import {allList}from "@/api/company/company";
-import { courseList,videoList } from '@/api/course/courseRedPacketLog'
+import { courseList,videoListByWatch } from '@/api/course/courseRedPacketLog'
 import {getDateRange} from "@/utils/common";
 export default {
   name: "CourseWatchLog",
@@ -155,7 +155,7 @@ export default {
         this.videoList=[];
         return
       }
-      videoList(row).then(response => {
+        videoListByWatch(row).then(response => {
         this.videoList=response.list
       });
     },