lex-xin 11 månader sedan
förälder
incheckning
27fda56d3b

+ 41 - 40
src/views/music-library/music-sheet/modal/music-platform.tsx

@@ -115,7 +115,8 @@ export default defineComponent({
                     message.error('请选择收费方式')
                     return true
                 }
-                if(!gym.isConvertibleScore == null) {
+                console.log(gym.isConvertibleScore, 'gym.isConvertibleScore')
+                if(gym.isConvertibleScore == null) {
                     message.error('请选择是否支持转谱')
                     return true
                 }
@@ -135,7 +136,7 @@ export default defineComponent({
                     message.error('请选择可用途径')
                     return true
                 }
-                if(!gyt.isConvertibleScore == null) {
+                if(gyt.isConvertibleScore == null) {
                     message.error('请选择是否支持转谱')
                     return true
                 }
@@ -151,7 +152,7 @@ export default defineComponent({
 
             const klxt = forms.klxt
             if(klxt.checked) {
-                if(!klxt.isConvertibleScore == null) {
+                if(klxt.isConvertibleScore == null) {
                     message.error('请选择是否支持转谱')
                     return true
                 }
@@ -171,7 +172,7 @@ export default defineComponent({
                     message.error('请选择曲目标签')
                     return true
                 }
-                if(!klx.paymentType) {
+                if(!klx.paymentType || klx.paymentType.length <= 0) {
                     message.error('请选择收费方式')
                     return true
                 }
@@ -185,10 +186,10 @@ export default defineComponent({
                     }
                   }
                 
-                if(!klx.availableType == null) {
-                    message.error('请选择可用途径')
-                    return true
-                }
+                // if(klx.availableType == null) {
+                //     message.error('请选择可用途径')
+                //     return true
+                // }
 
                 if (typeof klx.topFlag !== 'boolean') {
                     message.error('请选择是否置顶')
@@ -223,7 +224,7 @@ export default defineComponent({
                     message.error('请选择收费方式')
                     return true
                 }
-                if(!kt.isConvertibleScore == null) {
+                if(kt.isConvertibleScore == null) {
                     message.error('请选择是否支持转谱')
                     return true
                 }
@@ -434,14 +435,14 @@ export default defineComponent({
                 <NGi span={7} style={{ background: '#f9f9f9', padding: '20px 16px 0', borderRadius: '8px' }}>
                     <NGrid cols={6} xGap={12}>
                         <NGi>
-                        <NFormItem label='收费方式' path="paymentType">
+                        <NFormItem label='收费方式' path="paymentType" required>
                             <NSelect v-model:value={forms.gym.paymentType} clearable options={[
                                 { label: '免费', value: 'FREE' },
                                 { label: '收费', value: 'VIP' }]} />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否支持转谱' path="isConvertibleScore">
+                        <NFormItem label='是否支持转谱' path="isConvertibleScore" required>
                             <NSelect v-model:value={forms.gym.isConvertibleScore} clearable options={[
                                 { label: '是', value: true },
                                 { label: '否', value: false }
@@ -449,12 +450,12 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='默认谱面' path="scoreType">
+                        <NFormItem label='默认谱面' path="scoreType" required>
                             <NSelect v-model:value={forms.gym.scoreType} options={getSelectDataFromObj(scoreType)} />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否启用' path="status">
+                        <NFormItem label='是否启用' path="status" required>
                             <NSelect v-model:value={forms.gym.status} options={[
                                 {  label: '是',  value: true },
                                 { label: '否',  value: false }
@@ -463,7 +464,7 @@ export default defineComponent({
                         </NGi>
                         <NGi>
                         <NFormItem label='排序' path="sortNo">
-                            <NInputNumber min={0} max={9999} v-model:value={forms.gym.sortNo} showButton={false} />
+                            <NInputNumber precision={0} min={0} max={9999} v-model:value={forms.gym.sortNo} showButton={false} />
                         </NFormItem>
                         </NGi>
                     </NGrid>
@@ -477,7 +478,7 @@ export default defineComponent({
                 <NGi span={7} style={{ background: '#f9f9f9', padding: '20px 16px 0', borderRadius: '8px' }}>
                     <NGrid cols={6} xGap={12}>
                         <NGi>
-                        <NFormItem label='可以途径' path="availableType">
+                        <NFormItem label='可以途径' path="availableType" required>
                             <NSelect v-model:value={forms.gyt.availableType} clearable options={[
                                 {
                                     label: '学校',
@@ -491,7 +492,7 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否支持转谱' path="isConvertibleScore">
+                        <NFormItem label='是否支持转谱' path="isConvertibleScore" required>
                             <NSelect v-model:value={forms.gyt.isConvertibleScore} clearable options={[
                                 { label: '是', value: true },
                                 { label: '否', value: false }
@@ -499,12 +500,12 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='默认谱面' path="scoreType">
+                        <NFormItem label='默认谱面' path="scoreType" required>
                             <NSelect v-model:value={forms.gyt.scoreType} options={getSelectDataFromObj(scoreType)} />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否启用' path="status">
+                        <NFormItem label='是否启用' path="status" required>
                             <NSelect v-model:value={forms.gyt.status} options={[
                                 {  label: '是',  value: true },
                                 { label: '否',  value: false }
@@ -513,7 +514,7 @@ export default defineComponent({
                         </NGi>
                         <NGi>
                         <NFormItem label='排序' path="sortNo">
-                            <NInputNumber min={0} max={9999} v-model:value={forms.gyt.sortNo} showButton={false} />
+                            <NInputNumber precision={0} min={0} max={9999} v-model:value={forms.gyt.sortNo} showButton={false} />
                         </NFormItem>
                         </NGi>
                     </NGrid>
@@ -527,7 +528,7 @@ export default defineComponent({
                 <NGi span={7} style={{ background: '#f9f9f9', padding: '20px 16px 0', borderRadius: '8px' }}>
                     <NGrid cols={6} xGap={12}>
                         <NGi>
-                        <NFormItem label='是否支持转谱' path="isConvertibleScore">
+                        <NFormItem label='是否支持转谱' path="isConvertibleScore" required>
                             <NSelect v-model:value={forms.klxt.isConvertibleScore} clearable options={[
                                 { label: '是', value: true },
                                 { label: '否', value: false }
@@ -535,12 +536,12 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='默认谱面' path="scoreType">
+                        <NFormItem label='默认谱面' path="scoreType" required>
                             <NSelect v-model:value={forms.klxt.scoreType} options={getSelectDataFromObj(scoreType)} />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否启用' path="status">
+                        <NFormItem label='是否启用' path="status" required>
                             <NSelect v-model:value={forms.klxt.status} options={[
                                 {  label: '是',  value: true },
                                 { label: '否',  value: false }
@@ -549,7 +550,7 @@ export default defineComponent({
                         </NGi>
                         <NGi>
                         <NFormItem label='排序' path="sortNo">
-                            <NInputNumber min={0} max={9999} v-model:value={forms.klxt.sortNo} showButton={false} />
+                            <NInputNumber precision={0} min={0} max={9999} v-model:value={forms.klxt.sortNo} showButton={false} />
                         </NFormItem>
                         </NGi>
                     </NGrid>
@@ -563,12 +564,12 @@ export default defineComponent({
                 <NGi span={7} style={{ background: '#f9f9f9', padding: '20px 16px 0', borderRadius: '8px' }}>
                     <NGrid cols={6} xGap={12}>
                         <NGi>
-                        <NFormItem label='曲目标签'>
+                        <NFormItem label='曲目标签' required>
                             <NSelect v-model:value={forms.klx.musicTagIds} multiple maxTagCount={1} clearable options={musicSheetTagList.value} />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='收费方式' path="paymentType">
+                        <NFormItem label='收费方式' path="paymentType" required>
                             <NSelect v-model:value={forms.klx.paymentType} multiple maxTagCount={1} clearable options={getSelectDataFromObj(musicSheetPaymentType)}
                                 onUpdate:value={(v: any) => {
                                     forms.klx.paymentType = v
@@ -585,17 +586,17 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='曲目价格' path="musicPrice">
+                        <NFormItem label='曲目价格' path="musicPrice" required>
                             <NInputNumber disabled={!forms.klx.paymentType?.includes('CHARGE')} precision={2    } min={0} max={9999} v-model:value={forms.klx.musicPrice} showButton={false} />
                         </NFormItem>
                         </NGi>
-                        <NGi>
+                        {/* <NGi>
                         <NFormItem label='可用途径' path="availableType">
                             <NSelect v-model:value={forms.klx.availableType} clearable options={getSelectDataFromObj(musicSheetAvailableType)} />
                         </NFormItem>
-                        </NGi>
+                        </NGi> */}
                         <NGi>
-                        <NFormItem label='是否置顶' path="topFlag">
+                        <NFormItem label='是否置顶' path="topFlag" required>
                             <NSelect v-model:value={forms.klx.topFlag} clearable options={[
                                 { label: '是', value: true },
                                 { label: '否', value: false }
@@ -603,7 +604,7 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否精品' path="exquisiteFlag">
+                        <NFormItem label='是否精品' path="exquisiteFlag" required>
                             <NSelect v-model:value={forms.klx.exquisiteFlag} clearable options={[
                                 { label: '是', value: true },
                                 { label: '否', value: false }
@@ -611,7 +612,7 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否支持转谱' path="isConvertibleScore">
+                        <NFormItem label='是否支持转谱' path="isConvertibleScore" required>
                             <NSelect v-model:value={forms.klx.isConvertibleScore} clearable options={[
                                 { label: '是', value: true },
                                 { label: '否', value: false }
@@ -619,12 +620,12 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='默认谱面' path="scoreType">
+                        <NFormItem label='默认谱面' path="scoreType" required>
                             <NSelect v-model:value={forms.klx.scoreType} options={getSelectDataFromObj(scoreType)} />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否启用' path="status">
+                        <NFormItem label='是否启用' path="status" required>
                             <NSelect v-model:value={forms.klx.status} options={[
                                 {  label: '是',  value: true },
                                 { label: '否',  value: false }
@@ -633,7 +634,7 @@ export default defineComponent({
                         </NGi>
                         <NGi>
                         <NFormItem label='排序' path="sortNo">
-                            <NInputNumber min={0} max={9999} v-model:value={forms.klx.sortNo} showButton={false} />
+                            <NInputNumber precision={0} min={0} max={9999} v-model:value={forms.klx.sortNo} showButton={false} />
                         </NFormItem>
                         </NGi>
                     </NGrid>
@@ -647,19 +648,19 @@ export default defineComponent({
                 <NGi span={7} style={{ background: '#f9f9f9', padding: '20px 16px 0', borderRadius: '8px' }}>
                     <NGrid cols={6} xGap={12}>
                         <NGi>
-                        <NFormItem label='乐谱教材' path="musicSheetCategoryId">
+                        <NFormItem label='乐谱教材' path="musicSheetCategoryId" required>
                             <NSelect v-model:value={forms.kt.musicSheetCategoryId} clearable options={musicSheetCategories.value} labelField='name' valueField='id' />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='收费方式' path="paymentType">
+                        <NFormItem label='收费方式' path="paymentType" required>
                             <NSelect v-model:value={forms.kt.paymentType} clearable options={[
                                 { label: '免费', value: 'FREE' },
                                 { label: '会员', value: 'VIP' }]} />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否支持转谱' path="isConvertibleScore">
+                        <NFormItem label='是否支持转谱' path="isConvertibleScore" required>
                             <NSelect v-model:value={forms.kt.isConvertibleScore} clearable options={[
                                 { label: '是', value: true },
                                 { label: '否', value: false }
@@ -667,12 +668,12 @@ export default defineComponent({
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='默认谱面' path="scoreType">
+                        <NFormItem label='默认谱面' path="scoreType" required>
                             <NSelect v-model:value={forms.kt.scoreType} options={getSelectDataFromObj(scoreType)} />
                         </NFormItem>
                         </NGi>
                         <NGi>
-                        <NFormItem label='是否启用' path="status">
+                        <NFormItem label='是否启用' path="status" required>
                             <NSelect v-model:value={forms.kt.status} options={[
                                 {  label: '是',  value: true },
                                 { label: '否',  value: false }
@@ -681,7 +682,7 @@ export default defineComponent({
                         </NGi>
                         <NGi>
                         <NFormItem label='排序' path="sortNo">
-                            <NInputNumber min={0} max={9999} v-model:value={forms.kt.sortNo} showButton={false} />
+                            <NInputNumber precision={0} min={0} max={9999} v-model:value={forms.kt.sortNo} showButton={false} />
                         </NFormItem>
                         </NGi>
                     </NGrid>

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

@@ -410,7 +410,7 @@ export default defineComponent({
           }
         },
         {
-          title: '目状态',
+          title: '平台曲目状态',
           key: 'status',
           render(row: any) {
             return (

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

@@ -402,7 +402,7 @@ export default defineComponent({
           }
         },
         {
-          title: '目状态',
+          title: '平台曲目状态',
           key: 'status',
           render(row: any) {
             return (

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

@@ -456,7 +456,7 @@ export default defineComponent({
           }
         },
         {
-          title: '目状态',
+          title: '平台曲目状态',
           key: 'status',
           render(row: any) {
             return (

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

@@ -438,7 +438,7 @@ export default defineComponent({
           }
         },
         {
-          title: '目状态',
+          title: '平台曲目状态',
           key: 'status',
           render(row: any) {
             return (
@@ -480,7 +480,7 @@ export default defineComponent({
                   v-auth="musicSheetApplicationExtend/status1828741083419410433"
                   onClick={() => onChangeStatus(row)}
                 >
-                  {row.status ? '停用' : '启用'}
+                  {row.clientStatus ? '停用' : '启用'}
                 </NButton>
                 <NButton
                   type="primary"
@@ -518,7 +518,7 @@ export default defineComponent({
             ref={saveForm}
             model={state.searchForm}
             onSubmit={onSubmit}
-            saveKey="music-sheet-klx"
+            saveKey="music-sheet-klx_jg"
             onSetModel={(val: any) => (state.searchForm = val)}
           >
             <NFormItem label="关键词" path="keyword">
@@ -700,7 +700,7 @@ export default defineComponent({
               v-model:pageTotal={state.pagination.pageTotal}
               onList={getList}
               sync
-              saveKey="music-sheet-klx"
+              saveKey="music-sheet-klx_jg"
             ></Pagination>
           </div>
 

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

@@ -388,7 +388,7 @@ export default defineComponent({
           }
         },
         {
-          title: '目状态',
+          title: '平台曲目状态',
           key: 'status',
           render(row: any) {
             return (
@@ -430,7 +430,7 @@ export default defineComponent({
                   v-auth="musicSheetApplicationExtend/status1751235210464198657"
                   onClick={() => onChangeStatus(row)}
                 >
-                  {row.status ? '停用' : '启用'}
+                  {row.clientStatus ? '停用' : '启用'}
                 </NButton>
                 <NButton
                   type="primary"