Merge branch 'develop'

src/views/music-library/music-sheet/component/music-list.tsx

@@ -39,7 +39,7 @@ import MusicCreateImg from '../modal/music-create-img'
 
 export default defineComponent({
   name: 'music-list',
-  props: ['searchId'],
+  props: ['searchId','musicCategoryId'],
   setup(props, { emit }) {
     const dialog = useDialog()
     const message = useMessage()
@@ -478,6 +478,10 @@ export default defineComponent({
       if (props.searchId) {
         state.searchForm.categoriesId = props.searchId || null
       }
+      if (props.musicCategoryId) {
+        state.searchForm.musicCategoryId = props.musicCategoryId || null
+      }
+
 
       initSubjectList()
       initUseAppList()
@@ -677,7 +681,7 @@ export default defineComponent({
             data={state.dataList}
             rowKey={(row: any) => row.id}
             onUpdateCheckedRowKeys={handleCheck}
-            scrollX={'2000'}
+            scrollX={'2800'}
           ></NDataTable>
           <Pagination
             v-model:page={state.pagination.page}

src/views/music-library/music-sheet/component/music-sheet-categories-list.tsx

@@ -10,6 +10,7 @@ import {
 import { defineComponent, onMounted, reactive } from 'vue'
 import { musicSheetCategoriesQueryTree, musicSheetCategoriesRemove } from '@views/music-library/api'
 import SaveCategroyDialog from '@views/music-library/music-sheet/modal/save-categroy-dialog'
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 type RowData = {
   id: string
@@ -21,9 +22,9 @@ type RowData = {
   musicSheetCategoriesList?: RowData[]
 }
 export default defineComponent({
-  emits: ['setTabName'],
+  emits: ['setTabName','jump'],
   name: 'music-category',
-  setup() {
+  setup(props, { slots, attrs, emit }) {
     const state = reactive({
       loading: false,
       pagination: {
@@ -56,6 +57,9 @@ export default defineComponent({
       getList()
     })
 
+    const jump = (param:any) => {
+      emit('jump' as any, param)
+    }
     const columns = (): DataTableColumn[] => {
       return [
         {
@@ -68,7 +72,21 @@ export default defineComponent({
         },
         {
           title: '曲目数量',
-          key: 'musicSheetNum'
+          key: 'musicSheetNum',
+          render(row: any) {
+            return <div>
+              <NButton
+                  onClick={() => {
+                    jump({
+                      tabName:'MusicList',
+                      musicCategoryId:row.id
+                    })
+                  }}
+              >
+                {row.musicSheetNum}
+              </NButton>
+              </div>
+          }
         },
         {
           title: '最后更新时间',

src/views/music-library/music-sheet/index.tsx

@@ -10,7 +10,8 @@ export default defineComponent({
   setup() {
     const state = reactive({
       tabName: 'MusicList' as 'MusicList' | 'TagList' | 'CategroryList',
-      searchId: null
+      searchId: null,
+      musicCategoryId: null,
     })
     const route = useRoute()
     getTabsCache((val: any) => {
@@ -39,14 +40,20 @@ export default defineComponent({
                 <NTabPane name="MusicList" tab="曲目列表"
                     //v-auth="musicSheet/page1602301588206350338"
                 >
-                  <MusicList searchId={state.searchId}/>
+                  <MusicList searchId={state.searchId} musicCategoryId ={state.musicCategoryId}/>
                 </NTabPane>
                 <NTabPane
                     name="CategroryList"
                     tab="曲目分类管理"
                     //v-auth="/musicCategrory1607664813521346561"
                 >
-                  <MusicSheetCategoriesList onSetTabName={setTabName}/>
+                  <MusicSheetCategoriesList
+                      onSetTabName={setTabName}
+                      onJump={(param: any) => {
+                        state.tabName = param.tabName
+                        state.musicCategoryId = param.musicCategoryId
+                      }}
+                  />
                   {/*<TagList />*/}
                 </NTabPane>
               </NTabs>

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') {
@@ -324,7 +324,7 @@ export default defineComponent({
             path="useApplicationIds"
             rule={[
               {
-                required: true,
+                required: false,
                 message: '请选择适用应用'
               }
             ]}

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 () => {

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

@@ -29,7 +29,7 @@ import {
   musicSheetType
 } from '@/utils/constant'
 import {
-  musicSheetApplicationExtendCategoryList,
+  musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendStatus,
   musicSheetApplicationOwnerList,
   musicSheetPageByApplication,
   musicSheetStatusList
@@ -186,7 +186,7 @@ export default defineComponent({
         negativeText: '取消',
         onPositiveClick: async () => {
           try {
-            await musicSheetStatusList({
+            await musicSheetApplicationExtendStatus({
               ids: row.applicationExtendId,
               status: !row.status
             })
@@ -210,7 +210,7 @@ export default defineComponent({
         negativeText: '取消',
         onPositiveClick: async () => {
           try {
-            await musicSheetStatusList({
+            await musicSheetApplicationExtendStatus({
               ids: checkedRowKeysRef.value.join(','),
               status: status
             })
@@ -553,7 +553,7 @@ export default defineComponent({
               data={state.dataList}
               rowKey={(row: any) => row.applicationExtendId}
               onUpdateCheckedRowKeys={handleCheck}
-              scrollX={'1600'}
+              scrollX={'2100'}
             ></NDataTable>
 
             <Pagination

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 () => {

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

@@ -29,7 +29,7 @@ import {
   musicSheetType
 } from '@/utils/constant'
 import {
-  musicSheetApplicationExtendCategoryList,
+  musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendStatus,
   musicSheetApplicationOwnerList,
   musicSheetPageByApplication,
   musicSheetStatusList
@@ -184,7 +184,7 @@ export default defineComponent({
         negativeText: '取消',
         onPositiveClick: async () => {
           try {
-            await musicSheetStatusList({
+            await musicSheetApplicationExtendStatus({
               ids: row.applicationExtendId,
               status: !row.status
             })
@@ -208,7 +208,7 @@ export default defineComponent({
         negativeText: '取消',
         onPositiveClick: async () => {
           try {
-            await musicSheetStatusList({
+            await musicSheetApplicationExtendStatus({
               ids: checkedRowKeysRef.value.join(','),
               status: status
             })
@@ -551,7 +551,7 @@ export default defineComponent({
               data={state.dataList}
               rowKey={(row: any) => row.applicationExtendId}
               onUpdateCheckedRowKeys={handleCheck}
-              scrollX={'1600'}
+              scrollX={'2100'}
             ></NDataTable>
 
             <Pagination

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 () => {

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

@@ -582,7 +582,7 @@ export default defineComponent({
               data={state.dataList}
               rowKey={(row: any) => row.applicationExtendId}
               onUpdateCheckedRowKeys={handleCheck}
-              scrollX={'1600'}
+              scrollX={'2100'}
             ></NDataTable>
 
             <Pagination

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

@@ -123,6 +123,17 @@ export default defineComponent({
                     placeholder="请选择收费方式"
                     options={getSelectDataFromObj(musicSheetPaymentType)}
                     v-model:value={forms.paymentType}
+                    multiple
+                    // onChange={() => {
+                    //   console.log(' forms.paymentType', forms.paymentType)
+                    //   console.log(' forms.paymentType include', forms.paymentType?.includes('FREE'))
+                    //   if (forms.paymentType?.includes('FREE')) {
+                    //     forms.paymentType = ['FREE']
+                    //   }
+                    //   console.log(' forms.paymentType', forms.paymentType)
+                    //   return
+                    //
+                    // }}
                     clearable
                 />
               </NFormItem>

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 () => {

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

@@ -535,7 +535,7 @@ export default defineComponent({
               data={state.dataList}
               rowKey={(row: any) => row.applicationExtendId}
               onUpdateCheckedRowKeys={handleCheck}
-              scrollX={'1600'}
+              scrollX={'2100'}
             ></NDataTable>
 
             <Pagination