Merge branch 'feature/0729-instrument' into test-online

src/views/music-library/musicUtil.ts

@@ -65,4 +65,17 @@ export const copyText = (message: any, text: string) => {
       textbox.focus()
     }
   }
+}
+
+// 格式化树
+export const formatTree = (treeData: any) => {
+  treeData.map((item: any) => {
+    if (item) {
+      item.disabled = !item.enable
+    }
+    if (item.children && item.children.length > 0) {
+      formatTree(item.children)
+    }
+    return treeData;
+  })
 }

src/views/music-library/project-music-sheet/module/gym/addMusic.tsx

@@ -21,10 +21,6 @@ export default defineComponent({
       type: Array,
       default: () => []
     },
-    musicSheetCategories: {
-      type: Array,
-      default: () => []
-    }
   },
   emits: ['close', 'getList'],
   setup(props, { slots, attrs, emit }) {
@@ -85,7 +81,8 @@ export default defineComponent({
       //加载曲目分类列表
       try {
         const {data} = await musicSheetApplicationExtendCategoryList({
-          applicationIds: props.appId
+          applicationIds: props.appId,
+          enable: true
         })
         if (data && data.length > 0) {
           state.musicSheetCategories = data[0].musicSheetCategories

src/views/music-library/project-music-sheet/module/gym/music-sheet-gym.tsx

@@ -713,7 +713,6 @@ export default defineComponent({
               }}
               subjectList={state.subjectList}
               appId={state.appId}
-              musicSheetCategories={state.musicSheetCategories}
             />
           </NModal>
           <NModal

src/views/music-library/project-music-sheet/module/gym/updateMusic.tsx

@@ -3,6 +3,7 @@ import {NButton, NCascader, NForm, NFormItem, NInputNumber, NSelect, NSpace, use
 import {musicSheetApplicationExtendCategoryApplicationExtendInfo, musicSheetApplicationExtendUpdate} from "@views/music-library/api";
 import {getSelectDataFromObj} from "@/utils/objectUtil";
 import {scoreType} from "@/utils/constant";
+import {formatTree} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'project-music-cooleshow-edu-updateMusic',
@@ -40,6 +41,7 @@ export default defineComponent({
 
     onMounted(async () => {
       state.rowData = props.rowData
+      formatTree(props.musicSheetCategories)
       state.musicSheetCategories = props.musicSheetCategories
       const {data} = await musicSheetApplicationExtendCategoryApplicationExtendInfo({musicSheetId: state.rowData.id, applicationId: props.appId}) as any
       if (!data) {
@@ -101,6 +103,7 @@ export default defineComponent({
                     labelField="name"
                     children-field="children"
                     placeholder="请选择曲目分类"
+                    disabledField={'disabled'}
                     value={forms.musicSheetCategoryId}
                     options={state.musicSheetCategories}
                     onUpdateValue={(value: any) => {

src/views/music-library/project-music-sheet/module/gyt/addMusic.tsx

@@ -99,7 +99,8 @@ export default defineComponent({
       //加载曲目分类列表
       try {
         const {data} = await musicSheetApplicationExtendCategoryList({
-          applicationIds: props.appId
+          applicationIds: props.appId,
+          enable: true
         })
         if (data && data.length > 0) {
           state.musicSheetCategories = data[0].musicSheetCategories

src/views/music-library/project-music-sheet/module/gyt/updateMusic.tsx

@@ -3,6 +3,7 @@ import {NButton, NCascader, NForm, NFormItem, NInputNumber, NSelect, NSpace, use
 import {musicSheetApplicationExtendCategoryApplicationExtendInfo, musicSheetApplicationExtendUpdate} from "@views/music-library/api";
 import {getSelectDataFromObj} from "@/utils/objectUtil";
 import {scoreType} from "@/utils/constant";
+import {formatTree} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'project-music-cooleshow-edu-updateMusic',
@@ -40,6 +41,7 @@ export default defineComponent({
 
     onMounted(async () => {
       state.rowData = props.rowData
+      formatTree(props.musicSheetCategories)
       state.musicSheetCategories = props.musicSheetCategories
       const {data} = await musicSheetApplicationExtendCategoryApplicationExtendInfo({musicSheetId: state.rowData.id, applicationId: props.appId}) as any
       if (!data) {
@@ -100,6 +102,7 @@ export default defineComponent({
                     labelField="name"
                     children-field="children"
                     placeholder="请选择曲目分类"
+                    disabledField={'disabled'}
                     value={forms.musicSheetCategoryId}
                     options={state.musicSheetCategories}
                     onUpdateValue={(value: any) => {

src/views/music-library/project-music-sheet/module/klx/addMusic.tsx

@@ -111,7 +111,7 @@ export default defineComponent({
       // 加载曲目标签
 
       try {
-        const {data} = await musicSheetApplicationExtendTagList({applicationId: props.appId})
+        const {data} = await musicSheetApplicationExtendTagList({applicationId: props.appId, enable: true})
         if (data && data.length > 0) {
           data.forEach((item: any) => {
             state.musicSheetTagList.push({

src/views/music-library/project-music-sheet/module/klx/updateMusic.tsx

@@ -3,6 +3,7 @@ import {NButton, NForm, NFormItem, NInputNumber, NSelect, NSpace, useMessage} fr
 import {musicSheetApplicationExtendCategoryApplicationExtendInfo, musicSheetApplicationExtendUpdate} from "@views/music-library/api";
 import {getSelectDataFromObj} from "@/utils/objectUtil";
 import {musicSheetAvailableType, musicSheetPaymentType, scoreType} from "@/utils/constant";
+import {formatTree} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'project-music-cooleshow-edu-updateMusic',
@@ -45,6 +46,9 @@ export default defineComponent({
     onMounted(async () => {
       state.rowData = props.rowData
       state.musicSheetTagList = props.musicSheetTagList
+      state.musicSheetTagList.map((item: any) => {
+        item.disabled = !item.enable
+      })
       const {data} = await musicSheetApplicationExtendCategoryApplicationExtendInfo({musicSheetId: state.rowData.id, applicationId: props.appId}) as any
       if (!data) {
         message.error("加载应用失败")

src/views/music-library/project-music-sheet/module/kt/addMusic.tsx

@@ -100,7 +100,8 @@ export default defineComponent({
       //加载曲目分类列表
       try {
         const {data} = await musicSheetApplicationExtendCategoryList({
-          applicationIds: props.appId
+          applicationIds: props.appId,
+          enable: true
         })
         if (data && data.length > 0) {
           state.musicSheetCategories = data[0].musicSheetCategories

src/views/music-library/project-music-sheet/module/kt/updateMusic.tsx

@@ -3,6 +3,7 @@ import {NButton, NCascader, NForm, NFormItem, NInputNumber, NSelect, NSpace, use
 import {musicSheetApplicationExtendCategoryApplicationExtendInfo, musicSheetApplicationExtendUpdate} from "@views/music-library/api";
 import {getSelectDataFromObj} from "@/utils/objectUtil";
 import {scoreType} from "@/utils/constant";
+import {formatTree} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'project-music-cooleshow-edu-updateMusic',
@@ -40,6 +41,7 @@ export default defineComponent({
 
     onMounted(async () => {
       state.rowData = props.rowData
+      formatTree(props.musicSheetCategories)
       state.musicSheetCategories = props.musicSheetCategories
       const {data} = await musicSheetApplicationExtendCategoryApplicationExtendInfo({musicSheetId: state.rowData.id, applicationId: props.appId}) as any
       if (!data) {