|
@@ -149,8 +149,8 @@ export default defineComponent({
|
|
|
title: sub.bizInfo.name,
|
|
|
dataJson: sub.dataJson,
|
|
|
instrumentIds: sub.instrumentIds, // 素材编号
|
|
|
- hasCheck: sub.hasCheck,
|
|
|
- isError: checkCurrentIsInstrument(sub.instrumentIds, sub.type, sub.hasCheck), // 是否异常 当前素材是否在选中的乐器里面
|
|
|
+ hasNotCheck: sub.hasNotCheck,
|
|
|
+ isError: checkCurrentIsInstrument(sub.instrumentIds, sub.type, sub.hasNotCheck), // 是否异常 当前素材是否在选中的乐器里面
|
|
|
// isCollect: !!sub.favoriteFlag,
|
|
|
isSelected: sub.source === 'PLATFORM' ? true : false,
|
|
|
audioPlayTypeArray: sub.audioPlayTypes
|
|
@@ -193,7 +193,7 @@ export default defineComponent({
|
|
|
};
|
|
|
|
|
|
/** 检测当前素材是否包含所选声部 */
|
|
|
- const checkCurrentIsInstrument = (instruments: string, type: string, hasCheck = false) => {
|
|
|
+ const checkCurrentIsInstrument = (instruments: string, type: string, hasNotCheck = false) => {
|
|
|
// 当前素材是否在选中的乐器里面
|
|
|
let isError = false
|
|
|
if(forms.subjects.length <= 0) {
|
|
@@ -205,7 +205,7 @@ export default defineComponent({
|
|
|
return false
|
|
|
}
|
|
|
forms.subjects.forEach((item: any) => {
|
|
|
- if(!instruments?.includes(item) && hasCheck) {
|
|
|
+ if(!instruments?.includes(item) && !hasNotCheck) {
|
|
|
isError = true
|
|
|
}
|
|
|
})
|
|
@@ -631,7 +631,7 @@ export default defineComponent({
|
|
|
eventGlobal.emit('checkCoursewareForm', 'subject')
|
|
|
return
|
|
|
}
|
|
|
- item.isError = checkCurrentIsInstrument(item.instrumentIds, item.type, item.hasCheck) // 是否异常
|
|
|
+ item.isError = checkCurrentIsInstrument(item.instrumentIds, item.type, item.hasNotCheck) // 是否异常
|
|
|
if (forms.coursewareList.length <= 0) {
|
|
|
// 添加到临时对象
|
|
|
forms.addCoursewareItem = item;
|
|
@@ -748,7 +748,7 @@ export default defineComponent({
|
|
|
forms.coursewareList.forEach((item: any) => {
|
|
|
const childList = item.list || []
|
|
|
childList.forEach((child: any) => {
|
|
|
- child.isError = checkCurrentIsInstrument(child.instrumentIds, child.type, child.hasCheck)
|
|
|
+ child.isError = checkCurrentIsInstrument(child.instrumentIds, child.type, child.hasNotCheck)
|
|
|
if(child.isError) {
|
|
|
isTips = true
|
|
|
}
|
|
@@ -910,8 +910,8 @@ export default defineComponent({
|
|
|
refFlag: dropItem.refFlag,
|
|
|
isCollect: dropItem.isCollect,
|
|
|
isSelected: dropItem.isSelected,
|
|
|
- hasCheck: dropItem.hasCheck,
|
|
|
- isError: checkCurrentIsInstrument(dropItem.instrumentIds, dropItem.type, dropItem.hasCheck), // 是否异常
|
|
|
+ hasNotCheck: dropItem.hasNotCheck,
|
|
|
+ isError: checkCurrentIsInstrument(dropItem.instrumentIds, dropItem.type, dropItem.hasNotCheck), // 是否异常
|
|
|
content: dropItem.content,
|
|
|
audioPlayTypeArray: dropItem.audioPlayTypeArray,
|
|
|
removeFlag: false,
|