Merge branch 'develop' into test

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

@@ -83,6 +83,7 @@ export default defineComponent({
         appAuditFlag: null, //是否审核版本
         detailFlag: null, //是否查询详情
         applicationId: null, //所属人项目ID
+        extendApplicationId: null, //所属人项目ID
       },
       subjectList: [],
       dataList: [] as any[],
@@ -190,6 +191,7 @@ export default defineComponent({
           userId: (sourceType && sourceType === 'PERSON') ? state.searchForm.userId : null,
           organizationRoleId: (sourceType && sourceType === 'ORG') ? state.searchForm.userId : null,
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
+          applicationId: state.applicationId
         })
         state.pagination.pageTotal = Number(data.total)
         state.dataList = data.rows || []
@@ -242,7 +244,7 @@ export default defineComponent({
     }
 
     const updateUserIdData = async (sourceType: any) => {
-      if (!state.searchForm.applicationId) {
+      if (!state.searchForm.extendApplicationId) {
         return
       }
       state.userIdData = []
@@ -252,7 +254,7 @@ export default defineComponent({
           page: 1,
           rows: 9999,
           sourceType: sourceType,
-          applicationId: state.searchForm.applicationId
+          applicationId: state.searchForm.extendApplicationId
         })
         const temp = data.rows || []
         temp.forEach((next: any) => {
@@ -439,7 +441,7 @@ export default defineComponent({
                   state.searchForm.userId = null
                   if (value && value !== 'PLATFORM') {
                     await updateUserIdData(value)
-                    state.userIdDisable = !state.searchForm.applicationId
+                    state.userIdDisable = !state.searchForm.extendApplicationId
                   } else {
                     state.userIdDisable = true
                   }
@@ -447,14 +449,14 @@ export default defineComponent({
                 clearable
               />
             </NFormItem>
-            <NFormItem label="项目" path="applicationId">
+            <NFormItem label="项目" path="extendApplicationId">
               <NSelect
                   placeholder="请选择项目"
-                  v-model:value={state.searchForm.applicationId}
+                  v-model:value={state.searchForm.extendApplicationId}
                   options={state.useProjectData}
                   clearable
                   onUpdateValue={async (value: any) => {
-                    state.searchForm.applicationId = value
+                    state.searchForm.extendApplicationId = value
                     if (value) {
                       await updateUserIdData(state.searchForm.sourceType)
                       state.userIdDisable = !(

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

@@ -81,6 +81,7 @@ export default defineComponent({
         appAuditFlag: null, //是否审核版本
         detailFlag: null, //是否查询详情
         applicationId: null, //所属人项目ID
+        extendApplicationId: null, //所属人项目ID
       },
       subjectList: [],
       dataList: [] as any[],
@@ -174,7 +175,7 @@ export default defineComponent({
     }
 
     const updateUserIdData = async (sourceType: any) => {
-      if (!state.searchForm.applicationId) {
+      if (!state.searchForm.extendApplicationId) {
         return
       }
       state.userIdData = []
@@ -184,7 +185,7 @@ export default defineComponent({
           page: 1,
           rows: 9999,
           sourceType: sourceType,
-          applicationId: state.searchForm.applicationId
+          applicationId: state.searchForm.extendApplicationId
         })
         const temp = data.rows || []
         temp.forEach((next: any) => {
@@ -213,6 +214,7 @@ export default defineComponent({
           userId: (sourceType && sourceType === 'PERSON') ? state.searchForm.userId : null,
           organizationRoleId: (sourceType && sourceType === 'ORG') ? state.searchForm.userId : null,
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
+          applicationId: state.applicationId
         })
         state.pagination.pageTotal = Number(data.total)
         state.dataList = data.rows || []
@@ -445,7 +447,7 @@ export default defineComponent({
                   state.searchForm.userId = null
                   if (value && value !== 'PLATFORM') {
                     await updateUserIdData(value)
-                    state.userIdDisable = !state.searchForm.applicationId
+                    state.userIdDisable = !state.searchForm.extendApplicationId
                   } else {
                     state.userIdDisable = true
                   }
@@ -456,11 +458,11 @@ export default defineComponent({
             <NFormItem label="项目" path="applicationId">
               <NSelect
                   placeholder="请选择项目"
-                  v-model:value={state.searchForm.applicationId}
+                  v-model:value={state.searchForm.extendApplicationId}
                   options={state.useProjectData}
                   clearable
                   onUpdateValue={async (value: any) => {
-                    state.searchForm.applicationId = value
+                    state.searchForm.extendApplicationId = value
                     if (value) {
                       await updateUserIdData(state.searchForm.sourceType)
                       state.userIdDisable = !(

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

@@ -81,6 +81,7 @@ export default defineComponent({
         detailFlag: null, //是否查询详情
         musicTagIds: [] as any,//曲目标签
         applicationId: null, //所属人项目ID
+        extendApplicationId: null, //所属人项目ID
       },
       subjectList: [],
       dataList: [] as any[],
@@ -199,6 +200,7 @@ export default defineComponent({
           organizationRoleId: (sourceType && sourceType === 'ORG') ? state.searchForm.userId : null,
           musicTagIds: state.searchForm.musicTagIds?.join(','),
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
+          applicationId: state.applicationId
         })
         state.pagination.pageTotal = Number(data.total)
         state.dataList = data.rows || []
@@ -265,7 +267,7 @@ export default defineComponent({
     }
 
     const updateUserIdData = async (sourceType: any) => {
-      if (!state.searchForm.applicationId) {
+      if (!state.searchForm.extendApplicationId) {
         return
       }
       state.userIdData = []
@@ -275,7 +277,7 @@ export default defineComponent({
           page: 1,
           rows: 9999,
           sourceType: sourceType,
-          applicationId: state.searchForm.applicationId
+          applicationId: state.searchForm.extendApplicationId
         })
         const temp = data.rows || []
         temp.forEach((next: any) => {
@@ -491,7 +493,7 @@ export default defineComponent({
                     state.searchForm.userId = null
                     if (value && value !== 'PLATFORM') {
                       await updateUserIdData(value)
-                      state.userIdDisable = !state.searchForm.applicationId
+                      state.userIdDisable = !state.searchForm.extendApplicationId
                     } else {
                       state.userIdDisable = true
                     }
@@ -502,11 +504,11 @@ export default defineComponent({
             <NFormItem label="项目" path="applicationId">
               <NSelect
                   placeholder="请选择项目"
-                  v-model:value={state.searchForm.applicationId}
+                  v-model:value={state.searchForm.extendApplicationId}
                   options={state.useProjectData}
                   clearable
                   onUpdateValue={async (value: any) => {
-                    state.searchForm.applicationId = value
+                    state.searchForm.extendApplicationId = value
                     if (value) {
                       await updateUserIdData(state.searchForm.sourceType)
                       state.userIdDisable = !(

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

@@ -78,6 +78,7 @@ export default defineComponent({
         appAuditFlag: null, //是否审核版本
         detailFlag: null, //是否查询详情
         applicationId: null, //所属人项目ID
+        extendApplicationId: null, //所属人项目ID
       },
       subjectList: [],
       dataList: [] as any[],
@@ -182,6 +183,7 @@ export default defineComponent({
           userId: (sourceType && sourceType === 'PERSON') ? state.searchForm.userId : null,
           organizationRoleId: (sourceType && sourceType === 'ORG') ? state.searchForm.userId : null,
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
+          applicationId: state.applicationId
         })
         state.pagination.pageTotal = Number(data.total)
         state.dataList = data.rows || []
@@ -234,7 +236,7 @@ export default defineComponent({
     }
 
     const updateUserIdData = async (sourceType: any) => {
-      if (!state.searchForm.applicationId) {
+      if (!state.searchForm.extendApplicationId) {
         return
       }
       state.userIdData = []
@@ -244,7 +246,7 @@ export default defineComponent({
           page: 1,
           rows: 9999,
           sourceType: sourceType,
-          applicationId: state.searchForm.applicationId
+          applicationId: state.searchForm.extendApplicationId
         })
         const temp = data.rows || []
         temp.forEach((next: any) => {
@@ -435,7 +437,7 @@ export default defineComponent({
                     state.searchForm.userId = null
                     if (value && value !== 'PLATFORM') {
                       await updateUserIdData(value)
-                      state.userIdDisable = !state.searchForm.applicationId
+                      state.userIdDisable = !state.searchForm.extendApplicationId
                     } else {
                       state.userIdDisable = true
                     }
@@ -446,11 +448,11 @@ export default defineComponent({
             <NFormItem label="项目" path="applicationId">
               <NSelect
                   placeholder="请选择项目"
-                  v-model:value={state.searchForm.applicationId}
+                  v-model:value={state.searchForm.extendApplicationId}
                   options={state.useProjectData}
                   clearable
                   onUpdateValue={async (value: any) => {
-                    state.searchForm.applicationId = value
+                    state.searchForm.extendApplicationId = value
                     if (value) {
                       await updateUserIdData(state.searchForm.sourceType)
                       state.userIdDisable = !(