Merge branch 'iteration-20240827' into test-online

src/views/music-library/music-sheet/modal/music-platform.tsx

@@ -193,11 +193,11 @@ export default defineComponent({
 
                 if (typeof klx.topFlag !== 'boolean') {
                     message.error('请选择是否置顶')
-                    return
+                    return true
                   }
                   if (typeof klx.exquisiteFlag !== 'boolean') {
                     message.error('请选择是否精品')
-                    return
+                    return true
                   }
 
                 if(klx.isConvertibleScore == null) {

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

@@ -77,6 +77,7 @@ export default defineComponent({
         musicalInstrumentId: null, // 乐器ID
         musicCategoryIds: null, //曲目分类ID
         clientStatus: null, //曲目状态（0：停用，1：启用）
+        status: null,
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -455,7 +456,7 @@ export default defineComponent({
                   v-auth="musicSheetApplicationExtend/status1751235150422736897"
                   onClick={() => onChangeStatus(row)}
                 >
-                  {row.status ? '停用' : '启用'}
+                  {row.clientStatus ? '停用' : '启用'}
                 </NButton>
                 <NButton
                   type="primary"
@@ -473,7 +474,7 @@ export default defineComponent({
                   type="primary"
                   size="small"
                   text
-                  disabled={!!row.status}
+                  disabled={!!row.clientStatus}
                   onClick={() => onRmove(row)}
                   v-auth="musicSheetApplicationExtend/del1770708555010191362"
                 >
@@ -637,6 +638,25 @@ export default defineComponent({
                 clearable
               />
             </NFormItem>
+            <NFormItem label="平台曲目状态" path="status">
+              <NSelect
+                v-model:value={state.searchForm.status}
+                placeholder="请选择平台曲目状态"
+                options={
+                  [
+                    {
+                      label: '启用',
+                      value: true
+                    },
+                    {
+                      label: '停用',
+                      value: false
+                    }
+                  ] as any
+                }
+                clearable
+              />
+            </NFormItem>
             <NFormItem label="上传时间" path="authorFrom">
               <NDatePicker
                 v-model:value={state.searchForm.times}

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

@@ -66,6 +66,7 @@ export default defineComponent({
         subjectIds: null, //曲目声部ID集合
         musicCategoryIds: null, //曲目分类ID
         clientStatus: null, //曲目状态（0：停用，1：启用）
+        status: null,
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -444,7 +445,7 @@ export default defineComponent({
                   v-auth="musicSheetApplicationExtend/status1751235279221424130"
                   onClick={() => onChangeStatus(row)}
                 >
-                  {row.status ? '停用' : '启用'}
+                  {row.clientStatus ? '停用' : '启用'}
                 </NButton>
                 <NButton
                   type="primary"
@@ -462,7 +463,7 @@ export default defineComponent({
                   type="primary"
                   size="small"
                   text
-                  disabled={!!row.status}
+                  disabled={!!row.clientStatus}
                   onClick={() => onRmove(row)}
                   v-auth="musicSheetApplicationExtend/del1770708605081792513"
                 >
@@ -617,6 +618,25 @@ export default defineComponent({
                 clearable
               />
             </NFormItem>
+            <NFormItem label="平台曲目状态" path="status">
+              <NSelect
+                v-model:value={state.searchForm.status}
+                placeholder="请选择平台曲目状态"
+                options={
+                  [
+                    {
+                      label: '启用',
+                      value: true
+                    },
+                    {
+                      label: '停用',
+                      value: false
+                    }
+                  ] as any
+                }
+                clearable
+              />
+            </NFormItem>
             <NFormItem label="上传时间" path="authorFrom">
               <NDatePicker
                 v-model:value={state.searchForm.times}

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

@@ -72,6 +72,7 @@ export default defineComponent({
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
         clientStatus: null, //曲目状态（0：停用，1：启用）
+        status: null,
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -498,7 +499,7 @@ export default defineComponent({
                   v-auth="musicSheetApplicationExtend/status1751229794627878914"
                   onClick={() => onChangeStatus(row)}
                 >
-                  {row.status ? '停用' : '启用'}
+                  {row.clientStatus ? '停用' : '启用'}
                 </NButton>
                 <NButton
                   type="primary"
@@ -516,7 +517,7 @@ export default defineComponent({
                   type="primary"
                   size="small"
                   text
-                  disabled={!!row.status}
+                  disabled={!!row.clientStatus}
                   onClick={() => onRmove(row)}
                   v-auth="musicSheetApplicationExtend/del1770708473623916546"
                 >
@@ -670,6 +671,25 @@ export default defineComponent({
                 clearable
               />
             </NFormItem>
+            <NFormItem label="平台曲目状态" path="status">
+              <NSelect
+                v-model:value={state.searchForm.status}
+                placeholder="请选择平台曲目状态"
+                options={
+                  [
+                    {
+                      label: '启用',
+                      value: true
+                    },
+                    {
+                      label: '停用',
+                      value: false
+                    }
+                  ] as any
+                }
+                clearable
+              />
+            </NFormItem>
             <NFormItem label="上传时间" path="authorFrom">
               <NDatePicker
                 v-model:value={state.searchForm.times}

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

@@ -73,6 +73,7 @@ export default defineComponent({
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
         clientStatus: null, //曲目状态（0：停用，1：启用）
+        status: null,
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -498,7 +499,7 @@ export default defineComponent({
                   type="primary"
                   size="small"
                   text
-                  disabled={!!row.status}
+                  disabled={!!row.clientStatus}
                   onClick={() => onRemove(row)}
                   v-auth="musicSheetApplicationExtend/del1828741276168650753"
                 >
@@ -632,6 +633,25 @@ export default defineComponent({
                 clearable
               />
             </NFormItem>
+            <NFormItem label="平台曲目状态" path="status">
+              <NSelect
+                v-model:value={state.searchForm.status}
+                placeholder="请选择平台曲目状态"
+                options={
+                  [
+                    {
+                      label: '启用',
+                      value: true
+                    },
+                    {
+                      label: '停用',
+                      value: false
+                    }
+                  ] as any
+                }
+                clearable
+              />
+            </NFormItem>
             <NFormItem label="上传时间" path="times">
               <NDatePicker
                 v-model:value={state.searchForm.times}

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

@@ -66,6 +66,7 @@ export default defineComponent({
         subjectIds: null, //曲目声部ID集合
         musicCategoryIds: null, //曲目分类ID
         clientStatus: null, //曲目状态（0：停用，1：启用）
+        status: null,
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人)
         paymentType: null, //收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
         userId: null, //所属人
@@ -448,7 +449,7 @@ export default defineComponent({
                   type="primary"
                   size="small"
                   text
-                  disabled={!!row.status}
+                  disabled={!!row.clientStatus}
                   onClick={() => onRmove(row)}
                   v-auth="musicSheetApplicationExtend/del1770696070576254977"
                 >
@@ -613,6 +614,25 @@ export default defineComponent({
                 clearable
               />
             </NFormItem>
+            <NFormItem label="平台曲目状态" path="status">
+              <NSelect
+                v-model:value={state.searchForm.status}
+                placeholder="请选择平台曲目状态"
+                options={
+                  [
+                    {
+                      label: '启用',
+                      value: true
+                    },
+                    {
+                      label: '停用',
+                      value: false
+                    }
+                  ] as any
+                }
+                clearable
+              />
+            </NFormItem>
             <NFormItem label="上传时间" path="authorFrom">
               <NDatePicker
                 v-model:value={state.searchForm.times}