Merge branch 'develop' into test

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

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

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

@@ -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/music-sheet-gyt.tsx

@@ -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/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/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