Browse Source

问题修改

yuanliang 1 năm trước cách đây
mục cha
commit
31a89596fc

+ 1 - 1
src/views/music-library/music-sheet/modal/use-project.tsx

@@ -219,7 +219,7 @@ export default defineComponent({
         data.forEach((next: any) => {
           const key = next.appKey
           if (key === 'GYM') {
-            forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategories
+            forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategoryId
             forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
             forms.useProjectParamConfig[key]['paymentType'] = next.paymentType
           } else if (key === 'GYT') {

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

@@ -21,7 +21,7 @@ import {
 import Pagination from '@components/pagination'
 import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
 import { musicSheetPaymentType, musicSheetSourceType, musicSheetType } from '@/utils/constant'
-import { musicSheetApplicationExtendSaveBatch, musicSheetPage } from '@views/music-library/api'
+import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendSaveBatch, musicSheetPage} from '@views/music-library/api'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
 import TheTooltip from '@/components/TheTooltip'
@@ -75,10 +75,23 @@ export default defineComponent({
       globalPaymentType: null as any //收费方式
     })
 
-    onMounted(() => {
+    onMounted(async () => {
+      state.loading = true
       state.subjectList = props.subjectList
-      state.musicSheetCategories = props.musicSheetCategories
-      getList()
+      // state.musicSheetCategories = props.musicSheetCategories
+
+      //加载曲目分类列表
+      try {
+        const {data} = await musicSheetApplicationExtendCategoryList({
+          applicationIds: props.appId
+        })
+        if (data && data.length > 0) {
+          state.musicSheetCategories = data[0].musicSheetCategories
+        }
+      } catch {
+      }
+
+      await getList()
     })
 
     const getList = async () => {

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

@@ -21,7 +21,7 @@ import {
 import Pagination from '@components/pagination'
 import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
 import { musicSheetSourceType, musicSheetType } from '@/utils/constant'
-import { musicSheetApplicationExtendSaveBatch, musicSheetPage } from '@views/music-library/api'
+import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendSaveBatch, musicSheetPage} from '@views/music-library/api'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
 import TheTooltip from "@components/TheTooltip";
@@ -74,10 +74,21 @@ export default defineComponent({
       projectMusicCategoryId: null as any // 曲目分类ID
     })
 
-    onMounted(() => {
+    onMounted(async () => {
+      state.loading = true
       state.subjectList = props.subjectList
-      state.musicSheetCategories = props.musicSheetCategories
-      getList()
+      // state.musicSheetCategories = props.musicSheetCategories
+      //加载曲目分类列表
+      try {
+        const {data} = await musicSheetApplicationExtendCategoryList({
+          applicationIds: props.appId
+        })
+        if (data && data.length > 0) {
+          state.musicSheetCategories = data[0].musicSheetCategories
+        }
+      } catch {
+      }
+      await getList()
     })
 
     const getList = async () => {

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

@@ -25,7 +25,7 @@ import {
   musicSheetSourceType,
   musicSheetType
 } from '@/utils/constant'
-import { musicSheetApplicationExtendSaveBatch, musicSheetPage } from '@views/music-library/api'
+import {musicSheetApplicationExtendSaveBatch, musicSheetApplicationExtendTagList, musicSheetPage} from '@views/music-library/api'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
 import TheTooltip from "@components/TheTooltip";
@@ -85,10 +85,26 @@ export default defineComponent({
       globalStartSortNum: null as any // 排序起始值
     })
 
-    onMounted(() => {
+    onMounted(async () => {
+      state.loading = true
       state.subjectList = props.subjectList
-      state.musicSheetTagList = props.musicSheetTagList
-      getList()
+      // state.musicSheetTagList = props.musicSheetTagList
+      // 加载曲目标签
+
+      try {
+        const {data} = await musicSheetApplicationExtendTagList({applicationId: props.appId})
+        if (data && data.length > 0) {
+          data.forEach((item: any) => {
+            state.musicSheetTagList.push({
+              ...item,
+              label: item.name,
+              value: item.id
+            })
+          })
+        }
+      } catch (err) {
+      }
+      await getList()
     })
 
     const getList = async () => {

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

@@ -21,7 +21,7 @@ import {
 import Pagination from '@components/pagination'
 import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
 import { musicSheetSourceType, musicSheetType } from '@/utils/constant'
-import { musicSheetApplicationExtendSaveBatch, musicSheetPage } from '@views/music-library/api'
+import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendSaveBatch, musicSheetPage} from '@views/music-library/api'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
 import TheTooltip from '@/components/TheTooltip'
@@ -75,10 +75,21 @@ export default defineComponent({
       projectMusicCategoryId: null as any // 曲目分类ID
     })
 
-    onMounted(() => {
+    onMounted(async () => {
+      state.loading = true
       state.subjectList = props.subjectList
-      state.musicSheetCategories = props.musicSheetCategories
-      getList()
+      // state.musicSheetCategories = props.musicSheetCategories
+      //加载曲目分类列表
+      try {
+        const {data} = await musicSheetApplicationExtendCategoryList({
+          applicationIds: props.appId
+        })
+        if (data && data.length > 0) {
+          state.musicSheetCategories = data[0].musicSheetCategories
+        }
+      } catch {
+      }
+      await getList()
     })
 
     const getList = async () => {