|
@@ -417,7 +417,10 @@ export default defineComponent({
|
|
|
() => forms.multiTracksSelection,
|
|
|
(value) => {
|
|
|
// 在修改的时候不用自动更新
|
|
|
- if(state.musicUpdateLoading) return
|
|
|
+ if(state.musicUpdateLoading) {
|
|
|
+ state.musicUpdateLoading = false
|
|
|
+ return
|
|
|
+ }
|
|
|
initInstrumentAndSubjectByTrack(value)
|
|
|
initFSongList()
|
|
|
}
|
|
@@ -883,6 +886,7 @@ export default defineComponent({
|
|
|
// 通过乐器编码反显乐器和声部
|
|
|
const initInstrumentAndSubjectByCode = async (codes: string[]) => {
|
|
|
// forms.musicalInstrumentIdList = []
|
|
|
+ console.log('1111')
|
|
|
forms.subjectIds = []
|
|
|
const codeIdMap = new Map<string, []>() as any
|
|
|
const codeMapKeys: string[] = []
|
|
@@ -1059,8 +1063,10 @@ export default defineComponent({
|
|
|
const tempList = data.rows || []
|
|
|
const tempSubject: any[] = []
|
|
|
tempList.forEach((item: any) => {
|
|
|
- tempSubject.push(item.id + '')
|
|
|
- })
|
|
|
+ if(item.enableFlag) {
|
|
|
+ tempSubject.push(item.id + '')
|
|
|
+ }
|
|
|
+ })
|
|
|
forms.subjectIds = tempSubject
|
|
|
} catch {}
|
|
|
}
|
|
@@ -1291,14 +1297,18 @@ export default defineComponent({
|
|
|
forms.subjectIds = []
|
|
|
if (data.subjectIds) {
|
|
|
const subjectIds = data.subjectIds.split(',') || []
|
|
|
+ console.log(subjectIds, 'subjectIds', forms.subjectIds)
|
|
|
subjectIds.forEach((subjectId: any) => {
|
|
|
if (!forms.subjectIds.includes(subjectId)) {
|
|
|
forms.subjectIds.push(subjectId)
|
|
|
}
|
|
|
})
|
|
|
+
|
|
|
state.subjectList = state.subjectList.filter((subject: any) => {
|
|
|
return !subject.disabled || subjectIds.includes(subject.value)
|
|
|
})
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
forms.musicCategoryId = data.musicCategoryId
|
|
|
forms.audioType = data.audioType
|
|
@@ -1466,7 +1476,7 @@ export default defineComponent({
|
|
|
})
|
|
|
// }
|
|
|
}
|
|
|
- state.musicUpdateLoading = false
|
|
|
+ // state.musicUpdateLoading = false
|
|
|
}
|
|
|
})
|
|
|
} catch (error) {}
|