| 
					
				 | 
			
			
				@@ -26,7 +26,7 @@ import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendStat 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import {getMapValueByKey, getSelectDataFromObj} from "@/utils/objectUtil"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import {musicSheetAudioType, musicSheetSourceType, musicSheetType} from "@/utils/constant"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import {sysApplicationPage} from "@views/menu-manage/api"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import {subjectPage} from "@views/system-manage/api"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import {musicSheetApplicationExtendSubjectList, subjectPage} from "@views/system-manage/api"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import {filterTimes} from "@/utils/dateUtil"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default defineComponent({ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -99,11 +99,11 @@ export default defineComponent({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // 加载声部 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          const {data} = await subjectPage({page: 1, rows: 999}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          const tempList = data.rows || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          const {data} = await musicSheetApplicationExtendSubjectList({applicationId: state.applicationId}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          const tempList = data || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           tempList.forEach((item: any) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            item.label = item.name 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            item.value = item.id + '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.label = item.subjectName 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            item.value = item.subjectId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           state.subjectList = tempList 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } catch { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -151,7 +151,7 @@ export default defineComponent({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           ...state.pagination, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           ...state.searchForm, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          applicationId:state.applicationId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          applicationId: state.applicationId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         state.pagination.pageTotal = Number(data.total) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         state.dataList = data.rows || [] 
			 |