Merge branch 'Nov16thResetMusic' into online

src/utils/searchArray.js

@@ -55,16 +55,20 @@ export const teacherStatus = [
   { label: '冻结', value: '1' },
   { label: '锁定', value: '9' }
 ]
-
-// 考勤状态
-export const attendanceStatus = [
+export const stuAttendance = [
   { value: "NORMAL", label: "正常" },
   { value: "TRUANT", label: "旷课" },
   { value: "LEAVE", label: "请假" },
+]
+
+// 考勤状态
+export const attendanceStatus = [
+  ...stuAttendance,
   { value: "QUIT_SCHOOL", label: "退学" },
   // { value: "DROP_OUT", label: "休学" }
 ]
 
+
 // 交易状态
 export const orderStatus = [
   { value: "APPLY", label: "报名" },

src/utils/vueFilter.js

@@ -411,7 +411,8 @@ Vue.filter('vipCourseStatus', value => {
     5: "报名结束",
     2: "进行中",
     4: "已结束",
-    3: "取消"
+    3: "取消",
+    6:'暂停'
   }
   return template[value]
 })

src/views/stuRecodeManager/index.vue

@@ -90,6 +90,7 @@
           <el-select
             v-model.trim="searchForm.status"
             placeholder="请选择考勤状态"
+            clearable
           >
             <el-option
               v-for="(item, index) in attendanceStatus"
@@ -143,7 +144,7 @@
           >
             <template slot-scope="scope">
               {{ scope.row.courseSchedule.teacherName }}
-              <p style="color: #f56c6c">
+              <p style="color: #f56c6c" v-if="scope.row.teacherId">
                 (<copy-text>{{ scope.row.teacherId }}</copy-text
                 >)
               </p>
@@ -279,7 +280,7 @@ import { findStudentAttendance } from "@/api/buildTeam";
 import {
   courseType,
   courseListType,
-  attendanceStatus,
+  stuAttendance,
 } from "@/utils/searchArray";
 export default {
   components: { pagination },
@@ -298,7 +299,7 @@ export default {
       dates:[],
       courseType,
       courseListType,
-      attendanceStatus,
+      attendanceStatus:stuAttendance,
       // teacherList: [],
       tableList: [],
       organList: [],