Merge branch 'feature/0429-music' of http://git.dayaedu.com/lex/resource-admin into hqyNewVersion

src/views/music-library/music-sheet/modal/music-operationV2.tsx

@@ -404,7 +404,7 @@ export default defineComponent({
             if (musicSheetType == 'CONCERT' && forms.musicSheetSoundList_YY.length > 0) {
               audioPlayTypes.push("PLAY")
               forms.musicSheetSoundList_YY.forEach((musicSheetSound: any) => {
-                if (forms.multiTracksSelection.includes(musicSheetSound.musicalInstrumentId)) {
+                if (musicSheetSound.track) {
                   musicSheetSoundList.push({
                     ...musicSheetSound,
                     musicSheetId: props.data.id,
@@ -428,7 +428,7 @@ export default defineComponent({
             if (musicSheetType == 'CONCERT' && forms.musicSheetSoundList_YY.length > 0) {
               audioPlayTypes.push("PLAY")
               forms.musicSheetSoundList_YY.forEach((musicSheetSound: any) => {
-                if (forms.multiTracksSelection.includes(musicSheetSound.musicalInstrumentId)) {
+                if (musicSheetSound.track) {
                   musicSheetSoundList.push({
                     ...musicSheetSound,
                     musicSheetId: props.data.id,
@@ -977,17 +977,17 @@ export default defineComponent({
                 })
 
                 // 处理没有声轨，但有原音
-                state.musicSheetSoundList
-                    .filter((next: any) => {
-                      return !tracks.includes(next.track)
-                    })
-                    .forEach((next: any) => {
+                if (data.musicSheetType == 'CONCERT') {
+                  state.musicSheetSoundList.forEach((next: any) => {
+                    if (!tracks.includes(next.track) && next.audioPlayType == 'PLAY') {
                       forms.musicSheetSoundList_YY.push({
                         audioFileUrl: next.audioFileUrl, // 原音
                         track: next.track ? next.track : null, // 轨道
                         audioPlayType: 'PLAY'
                       })
-                    })
+                    }
+                  })
+                }
               }
             }
           })