Pārlūkot izejas kodu

兼容无声部数据

lex-xin 3 gadi atpakaļ
vecāks
revīzija
4b6a36583b

+ 11 - 5
src/views/audition/ArrangeWork.vue

@@ -173,7 +173,6 @@ export default {
       const result = res.data
       if(result.code != 200) { return }
       const tempData = result.data || []
-      this.dataList = tempData
       let params = {
         studentCount: tempData.length, // 学员总数
         studentMemberCount: 0, // 学员会员数
@@ -185,11 +184,11 @@ export default {
         if(item.memberRankSettingId) {
           params.studentMemberCount++
         }
-        if(!params.subjectIdList.includes(item.subjectIdList)) {
-          params.subjectIdList.push(item.subjectIdList)
+        if(!params.subjectIdList.includes(item.subjectIdList || -1)) {
+          params.subjectIdList.push(item.subjectIdList || -1)
           params.subjectList.push({
-            id: item.subjectIdList,
-            subjectName: item.subjectName,
+            id: item.subjectIdList || -1,
+            subjectName: item.subjectName || '无声部',
             userIdList: [item.userId],
             musicScoreIdList: [{
               id: null,
@@ -201,9 +200,16 @@ export default {
             if(subject.id == item.subjectIdList) {
               subject.userIdList.push(item.userId)
             }
+            if(!item.subjectIdList && subject.id == -1) {
+              subject.userIdList.push(item.userId)
+            }
           })
         }
+        if(!item.subjectIdList) {
+          item.subjectIdList = -1
+        }
       });
+      this.dataList = tempData
       // 默认选中第1条数据
       this.tabActive = deepClone(params.subjectIdList[0])
       this.dataSubjectList = deepClone(params.subjectList)

+ 1 - 0
src/views/audition/modal/studentList.vue

@@ -122,6 +122,7 @@ export default {
                 student = this.value2 ? this.value2 : null
             let tempArray = []
             let allArray = this.allArray
+            console.log(allArray, search, subject, student)
             for(let i = 0; i < allArray.length; i++) {
                 if(search && allArray[i].name.indexOf(search) < 0) {
                     continue