zouxuan 1 anno fa
parent
commit
27b6538bcd

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

@@ -414,7 +414,7 @@ export default defineComponent({
       saveForm.value?.reset()
     }
 
-    onMounted(() => {
+    onMounted(async () => {
       state.loading = true
       // getTagList()
       if (props.searchId) {

+ 13 - 6
src/views/music-library/music-sheet/modal/musicSheetOwnerDialog.tsx

@@ -178,7 +178,7 @@ export default defineComponent({
       return [
         {
           title: '机构名称',
-          key: 'userName'
+          key: 'organizationRole'
         },
         {
           title: '操作',
@@ -256,11 +256,18 @@ export default defineComponent({
             </NFormItem>
           </SaveForm>
           <div class={['section-container']}>
-            <NDataTable
-                loading={state.loading}
-                columns={columns()}
-                data={state.dataList}
-            ></NDataTable>
+            {props.sourceType === 'PERSON' &&
+                (<NDataTable
+                    loading={state.loading}
+                    columns={columns()}
+                    data={state.dataList}
+                ></NDataTable>)}
+            {props.sourceType === 'ORG' &&
+                (<NDataTable
+                    loading={state.loading}
+                    columns={orgColumns()}
+                    data={state.dataList}
+                ></NDataTable>)}
             <Pagination
                 v-model:page={state.pagination.page}
                 v-model:pageSize={state.pagination.rows}

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

@@ -79,11 +79,13 @@ export default defineComponent({
     })
 
     onMounted(async () => {
+      state.loading = true
       // 获取应用APP信息
       {
         const {data} = await sysApplicationPage({page: 1, rows: 1, appKey: props.appKey})
         const tempList = data.rows || []
         if (!tempList || tempList.length == 0) {
+          state.loading = false
           message.error("加载项目信息失败");
           return
         }
@@ -116,7 +118,7 @@ export default defineComponent({
           getList()
         }
       }
-
+      state.loading = false
     })
 
     const saveForm = ref()

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

@@ -79,11 +79,13 @@ export default defineComponent({
     })
 
     onMounted(async () => {
+      state.loading = true
       // 获取应用APP信息
       {
         const {data} = await sysApplicationPage({page: 1, rows: 1, appKey: props.appKey})
         const tempList = data.rows || []
         if (!tempList || tempList.length == 0) {
+          state.loading = false
           message.error("加载项目信息失败");
           return
         }
@@ -116,7 +118,7 @@ export default defineComponent({
           getList()
         }
       }
-
+      state.loading = false
     })
 
     const saveForm = ref()

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

@@ -82,11 +82,13 @@ export default defineComponent({
     })
 
     onMounted(async () => {
+      state.loading = true
       // 获取应用APP信息
       {
         const {data} = await sysApplicationPage({page: 1, rows: 1, appKey: props.appKey})
         const tempList = data.rows || []
         if (!tempList || tempList.length == 0) {
+          state.loading = false
           message.error("加载项目信息失败");
           return
         }
@@ -120,6 +122,7 @@ export default defineComponent({
       {
         getList()
       }
+      state.loading = false
     })
 
     const saveForm = ref()