1227 13:54

111

dist/static/css/chunk-a946f15a.be8f39cb.css → dist/static/css/chunk-c7045f8e.480033ef.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-cd042206]{display:inline-block;margin-right:10px}.right-code .title[data-v-cd042206]{font-size:18px;text-align:center;padding-bottom:8px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-b881817a]{display:inline-block;margin-right:10px}.right-code .title[data-v-b881817a]{font-size:18px;text-align:center;padding-bottom:8px}

src/views/studentManager/studentList.vue

@@ -58,11 +58,13 @@
                     v-model="searchForm.studentName"></el-input>
         </el-form-item> -->
         <el-form-item>
-        <el-button @click="onSearch"
-                   type="danger">搜索</el-button>
-        <el-button @click="onReSet"
-                   type="primary">重置</el-button>
-        <el-button type="primary" v-permission="'export/studentHasCourse'" @click="downLoadStudent">未激活学生导出</el-button>
+          <el-button @click="onSearch"
+                     type="danger">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
+          <el-button type="primary"
+                     v-permission="'export/studentHasCourse'"
+                     @click="downLoadStudent">未激活学生导出</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->
@@ -288,7 +290,7 @@ export default {
       this.pageInfo.page = 1;
       this.getList()
     },
-     onCreateQRCode () { // 生成报名二维码
+    onCreateQRCode () { // 生成报名二维码
       this.qrcodeStatus = true
       // let id = this.$route.query.id
       // let teamName = this.$route.query.name
@@ -330,7 +332,7 @@ export default {
         isActive: null
       }
     },
-    downLoadStudent() {
+    downLoadStudent () {
       let url = '/api-web/export/studentHasCourse'
       const options = {
         method: 'POST',
@@ -340,7 +342,7 @@ export default {
         url,
         responseType: 'blob'
       }
-      
+
       this.$confirm('您确定导出未激活学生列表?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -348,9 +350,9 @@ export default {
       }).then(() => {
         axios(options).then(res => {
           let blob = new Blob([res.data], {
-              // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
-              type: 'application/vnd.ms-excel;charset=utf-8'
-              // word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+            // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
+            type: 'application/vnd.ms-excel;charset=utf-8'
+            // word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
           })
           let objectUrl = URL.createObjectURL(blob)
           let link = document.createElement("a")
@@ -363,7 +365,7 @@ export default {
           link.click()
         })
       }).catch(() => { })
-      
+
     },
     checkPhone (val) {
       var regu = /^1[3456789]\d{9}$/;

src/views/teamDetail/components/studentList.vue

@@ -801,7 +801,8 @@ export default {
         query: {
           id: this.teamid,
           status: this.$route.query.status,
-          name: this.$route.query.name
+          name: this.$route.query.name,
+          rules: this.Frules, search: this.Fsearch
         }
       })
     },
@@ -853,7 +854,7 @@ export default {
 
           let maskForm = this.maskForm
           if (!maskForm.signClass && !maskForm.mixClass && !maskForm.highClass) {
-            if (!maskForm.snapClass || !(maskForm.snapClass && maskForm.snapClass.length > 1)) {
+            if (!maskForm.snapClass || !(maskForm.snapClass && maskForm.snapClass.length >= 1)) {
               this.$message.error('该学生必须加入一个班级')
               return;
             }
@@ -987,7 +988,7 @@ export default {
                 parentName: res.data.parentsName,
                 course: res.data.currentClass,
                 startClass: res.data.currentGrade,
-                // sound: parseInt(res.data.subjectId),
+                // sound: parseInt(res.data.subjectId), 
                 phone: val,
                 timer: res.data.birthdate
               }

src/views/teamDetail/components/studentSignin.vue

@@ -54,8 +54,8 @@
                            label="时间">
           </el-table-column>
           <el-table-column align='center'
-                           prop="courseScheduleName"
-                           label="课程名称">
+                           prop="classGroupName"
+                           label="班级名称">
           </el-table-column>
           <el-table-column align='center'
                            prop="name"
@@ -83,6 +83,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { getStudentRecord } from '@/api/studentManager'
+import { getMusicGroupAllClass } from '@/api/buildTeam'
 export default {
   name: 'studentSignin',
   components: {
@@ -110,9 +111,17 @@ export default {
   },
   created () {
     this.teamid = this.$route.query.id;
+    // 判断是否带缓存参数
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
   },
   mounted () {
-    this.getList()
+    this.getList();
+    // 获取乐团所有班级
   },
   methods: {
     search () {
@@ -138,7 +147,8 @@ export default {
           id: params.id,
           status: params.status,
           name: params.name,
-          checkIndex: "3"
+          checkIndex: "3",
+          rules: this.Frules, search: this.Fsearch
         }
       })
     },