yuanliang 1 年之前
父節點
當前提交
38ae52f2ba

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

@@ -393,7 +393,7 @@ export default defineComponent({
                                 value:'FREE'
                               },
                               {
-                                label:'会员',
+                                label:'收费',
                                 value:'VIP'
                               }
                             ]
@@ -439,7 +439,7 @@ export default defineComponent({
                 },
                 {
                   label:'收费',
-                  value:'CHARGE'
+                  value:'VIP'
                 }
               ]}
               clearable

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

@@ -378,9 +378,9 @@ export default defineComponent({
           key: 'paymentType',
           render: (row: any) => {
             return (
-              <div>
-                {getMapValueByKey(row.paymentType, new Map(Object.entries(musicSheetPaymentType)))}
-              </div>
+                <div>
+                  {row.paymentType == 'VIP' ? '收费' : '免费'}
+                </div>
             )
           }
         },
@@ -579,7 +579,16 @@ export default defineComponent({
               <NSelect
                 placeholder="请选择收费方式"
                 v-model:value={state.searchForm.paymentType}
-                options={getSelectDataFromObj(musicSheetPaymentType)}
+                options={[
+                  {
+                    label: '免费',
+                    value: 'FREE'
+                  },
+                  {
+                    label: '收费',
+                    value: 'VIP'
+                  }
+                ]}
                 clearable
               ></NSelect>
             </NFormItem>

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

@@ -123,7 +123,7 @@ export default defineComponent({
                         value:'FREE'
                       },
                       {
-                        label:'会员',
+                        label:'收费',
                         value:'VIP'
                       }
                     ]}

+ 1 - 0
src/views/system-manage/subject-manage/subject/modal/subject-save.tsx

@@ -219,6 +219,7 @@ export default defineComponent({
             <NSelect
               multiple
               clearable
+              filterable
               v-model:value={state.forms.musicalInstrumentIds}
               placeholder="请选择关联乐器"
               options={state.instrumentList as any}