Merge branch 'iteration-20240827' into develop

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

@@ -76,7 +76,7 @@ export default defineComponent({
         // musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
         musicalInstrumentId: null, // 乐器ID
         musicCategoryIds: null, //曲目分类ID
-        status: null, //曲目状态（0：停用，1：启用）
+        clientStatus: null, //曲目状态（0：停用，1：启用）
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -220,7 +220,7 @@ export default defineComponent({
     }
 
     const onChangeStatus = (row: any) => {
-      const statusStr = row.status ? '停用' : '启用'
+      const statusStr = row.clientStatus ? '停用' : '启用'
       dialog.warning({
         title: '提示',
         content: `是否${statusStr}？`,
@@ -230,7 +230,7 @@ export default defineComponent({
           try {
             await musicSheetApplicationExtendStatus({
               ids: row.applicationExtendId,
-              status: !row.status
+              status: !row.clientStatus
             })
             getList()
             message.success(`${statusStr}成功`)
@@ -618,10 +618,10 @@ export default defineComponent({
                 clearable
               ></NSelect>
             </NFormItem>
-            <NFormItem label="状态" path="status">
+            <NFormItem label="曲目状态" path="clientStatus">
               <NSelect
-                v-model:value={state.searchForm.status}
-                placeholder="请选择状态"
+                v-model:value={state.searchForm.clientStatus}
+                placeholder="请选择曲目状态"
                 options={
                   [
                     {

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

@@ -54,7 +54,7 @@ export default defineComponent({
       forms.paymentType = data[0].paymentType
       forms.isConvertibleScore = data[0].isConvertibleScore
       forms.scoreType = data[0].scoreType
-      forms.status = data[0].status
+      forms.status = data[0].clientStatus
 
     })
 

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

@@ -65,7 +65,7 @@ export default defineComponent({
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
         musicCategoryIds: null, //曲目分类ID
-        status: null, //曲目状态（0：停用，1：启用）
+        clientStatus: null, //曲目状态（0：停用，1：启用）
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -229,7 +229,7 @@ export default defineComponent({
     }
 
     const onChangeStatus = (row: any) => {
-      const statusStr = row.status ? '停用' : '启用'
+      const statusStr = row.clientStatus ? '停用' : '启用'
       dialog.warning({
         title: '提示',
         content: `是否${statusStr}？`,
@@ -239,7 +239,7 @@ export default defineComponent({
           try {
             await musicSheetApplicationExtendStatus({
               ids: row.applicationExtendId,
-              status: !row.status
+              status: !row.clientStatus
             })
             getList()
             message.success(`${statusStr}成功`)
@@ -598,10 +598,10 @@ export default defineComponent({
             {/*    clearable*/}
             {/*  ></NSelect>*/}
             {/*</NFormItem>*/}
-            <NFormItem label="状态" path="status">
+            <NFormItem label="曲目状态" path="clientStatus">
               <NSelect
-                v-model:value={state.searchForm.status}
-                placeholder="请选择状态"
+                v-model:value={state.searchForm.clientStatus}
+                placeholder="请选择曲目状态"
                 options={
                   [
                     {

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

@@ -54,7 +54,7 @@ export default defineComponent({
       forms.availableType = data[0].availableType
       forms.isConvertibleScore = data[0].isConvertibleScore
       forms.scoreType = data[0].scoreType
-      forms.status = data[0].status
+      forms.status = data[0].clientStatus
     })
 
     const onSubmit = async () => {

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

@@ -71,7 +71,7 @@ export default defineComponent({
         // musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
-        status: null, //曲目状态（0：停用，1：启用）
+        clientStatus: null, //曲目状态（0：停用，1：启用）
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -224,7 +224,7 @@ export default defineComponent({
     }
 
     const onChangeStatus = (row: any) => {
-      const statusStr = row.status ? '停用' : '启用'
+      const statusStr = row.clientStatus ? '停用' : '启用'
       dialog.warning({
         title: '提示',
         content: `是否${statusStr}？`,
@@ -234,7 +234,7 @@ export default defineComponent({
           try {
             await musicSheetApplicationExtendStatus({
               ids: row.applicationExtendId,
-              status: !row.status
+              status: !row.clientStatus
             })
             getList()
             message.success(`${statusStr}成功`)
@@ -651,10 +651,10 @@ export default defineComponent({
                 clearable
               ></NSelect>
             </NFormItem>
-            <NFormItem label="状态" path="status">
+            <NFormItem label="曲目状态" path="clientStatus">
               <NSelect
-                v-model:value={state.searchForm.status}
-                placeholder="请选择状态"
+                v-model:value={state.searchForm.clientStatus}
+                placeholder="请选择曲目状态"
                 options={
                   [
                     {

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

@@ -64,7 +64,7 @@ export default defineComponent({
       forms.exquisiteFlag = data[0].exquisiteFlag
       forms.isConvertibleScore = data[0].isConvertibleScore
       forms.scoreType = data[0].scoreType
-      forms.status = data[0].status
+      forms.status = data[0].clientStatus
     })
 
     const onSubmit = async () => {

src/views/music-library/project-music-sheet/module/klx_jg/addMusic.tsx

@@ -233,8 +233,6 @@ export default defineComponent({
           ...item,
           musicSheetId: item.id,
           applicationId: props.appId,
-          paymentType: item.paymentType.join(','),
-          musicTagIds: item.musicTagIds.join(','),
           id: null
         })
       }

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

@@ -20,7 +20,7 @@ import {
 } from 'naive-ui'
 import Pagination from '@components/pagination'
 import TheTooltip from '@components/TheTooltip'
-import AddMusic from '@views/music-library/project-music-sheet/module/klx/addMusic'
+import AddMusic from './addMusic'
 import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
 import {
   appKey,
@@ -44,7 +44,7 @@ import {
 import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
 import { copyText, getOwnerName } from '@views/music-library/musicUtil'
-import UpdateMusic from '@views/music-library/project-music-sheet/module/klx/updateMusic'
+import UpdateMusic from './updateMusic'
 import MusicPreView from '@views/music-library/music-sheet/modal/musicPreView'
 
 export default defineComponent({
@@ -72,7 +72,7 @@ export default defineComponent({
         // musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
-        status: null, //曲目状态（0：停用，1：启用）
+        clientStatus: null, //曲目状态（0：停用，1：启用）
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -253,7 +253,7 @@ export default defineComponent({
     }
 
     const onChangeStatus = (row: any) => {
-      const statusStr = row.status ? '停用' : '启用'
+      const statusStr = row.clientStatus ? '停用' : '启用'
       dialog.warning({
         title: '提示',
         content: `是否${statusStr}？`,
@@ -263,7 +263,7 @@ export default defineComponent({
           try {
             await musicSheetApplicationExtendStatus({
               ids: row.applicationExtendId,
-              status: !row.status
+              status: !row.clientStatus
             })
             getList()
             message.success(`${statusStr}成功`)
@@ -421,7 +421,7 @@ export default defineComponent({
         {
           title: '上传时间',
           minWidth: '150px',
-          key: 'composer',
+          key: 'createTime',
           render(row: any) {
             return (
               row.createTime
@@ -613,9 +613,9 @@ export default defineComponent({
                 clearable
               />
             </NFormItem>
-            <NFormItem label="状态" path="status">
+            <NFormItem label="曲目状态" path="clientStatus">
               <NSelect
-                v-model:value={state.searchForm.status}
+                v-model:value={state.searchForm.clientStatus}
                 placeholder="请选择状态"
                 options={
                   [
@@ -632,7 +632,7 @@ export default defineComponent({
                 clearable
               />
             </NFormItem>
-            <NFormItem label="上传时间" path="authorFrom">
+            <NFormItem label="上传时间" path="times">
               <NDatePicker
                 v-model:value={state.searchForm.times}
                 type="daterange"

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

@@ -52,7 +52,7 @@ export default defineComponent({
       forms.sortNo = data[0].sortNo
       forms.isConvertibleScore = data[0].isConvertibleScore
       forms.scoreType = data[0].scoreType
-      forms.status = data[0].status
+      forms.status = data[0].clientStatus
     })
 
     const onSubmit = async () => {

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

@@ -65,7 +65,7 @@ export default defineComponent({
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
         musicCategoryIds: null, //曲目分类ID
-        status: null, //曲目状态（0：停用，1：启用）
+        clientStatus: null, //曲目状态（0：停用，1：启用）
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -195,7 +195,7 @@ export default defineComponent({
     }
 
     const onChangeStatus = (row: any) => {
-      const statusStr = row.status ? '停用' : '启用'
+      const statusStr = row.clientStatus ? '停用' : '启用'
       dialog.warning({
         title: '提示',
         content: `是否${statusStr}？`,
@@ -205,7 +205,7 @@ export default defineComponent({
           try {
             await musicSheetApplicationExtendStatus({
               ids: row.applicationExtendId,
-              status: !row.status
+              status: !row.clientStatus
             })
             getList()
             message.success(`${statusStr}成功`)
@@ -594,10 +594,10 @@ export default defineComponent({
                   clearable
               />
             </NFormItem>
-            <NFormItem label="状态" path="status">
+            <NFormItem label="曲目状态" path="clientStatus">
               <NSelect
-                v-model:value={state.searchForm.status}
-                placeholder="请选择状态"
+                v-model:value={state.searchForm.clientStatus}
+                placeholder="请选择曲目状态"
                 options={
                   [
                     {

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

@@ -54,7 +54,7 @@ export default defineComponent({
       forms.paymentType = data[0].paymentType
       forms.isConvertibleScore = data[0].isConvertibleScore
       forms.scoreType = data[0].scoreType
-      forms.status = data[0].status
+      forms.status = data[0].clientStatus
     })
 
     const onSubmit = async () => {