Browse Source

修改选择

lex 10 tháng trước cách đây
mục cha
commit
811aecc087

+ 1 - 1
src/components/CCascader/index.module.less

@@ -154,7 +154,7 @@
 
   .tagActive {
     background: #D2ECFF;
-    font-weight: 600;
+    // font-weight: 600;
     color: #131415;
   }
 }

+ 9 - 1
src/components/CCascader/index.tsx

@@ -37,7 +37,7 @@ export default defineComponent({
       default: false
     }
   },
-  emits: ['update:value'],
+  emits: ['update:value', 'moreId'],
   setup(props, { emit }) {
     const state = reactive({
       popoverShow: false,
@@ -174,12 +174,20 @@ export default defineComponent({
       state.tagActiveId = '';
       state.selectParents = {};
       emit('update:value', '');
+      emit('moreId', {
+        childId: '',
+        parentId: ''
+      });
       state.popoverShow = false;
     };
 
     // 提交
     const onConfirm = () => {
       emit('update:value', state.childSelectId || state.tagActiveId);
+      emit('moreId', {
+        childId: state.childSelectId,
+        parentId: state.tagActiveId
+      });
       state.popoverShow = false;
     };
     return () => (

+ 6 - 2
src/views/prepare-lessons/components/resource-main/components/resource-item/resource-search-group/index.tsx

@@ -28,10 +28,12 @@ export default defineComponent({
   setup(props, { emit }) {
     const catchStore = useCatchStore();
     const musics = ref('');
+    const subjects = ref('');
     const forms = reactive({
       type: 'MUSIC', //
       name: '',
       bookVersionId: null as any,
+      subjectId: null as any,
       // musicSheetCategoriesId: null,
       musicalInstrumentId: ''
     });
@@ -131,9 +133,11 @@ export default defineComponent({
             )}
             <CCascader
               placeholder="全部声部"
-              v-model:value={forms.musicalInstrumentId}
+              v-model:value={subjects.value}
               options={tagSubjectList.value}
-              onUpdate:value={() => {
+              onMoreId={(val: any) => {
+                forms.musicalInstrumentId = val.childId;
+                forms.subjectId = val.parentId;
                 onSearch();
               }}
             />

+ 9 - 2
src/views/prepare-lessons/components/resource-main/components/select-music/resource-search-group/index.tsx

@@ -25,10 +25,12 @@ export default defineComponent({
   setup(props, { emit }) {
     const catchStore = useCatchStore();
     const musics = ref('');
+    const subjects = ref('');
     const forms = reactive({
       name: '',
       // grade: null as any,
       bookVersionId: '' as any,
+      subjectId: null as any,
       // musicSheetCategoriesId: null,
       musicalInstrumentId: ''
     });
@@ -122,11 +124,16 @@ export default defineComponent({
               />
             )}
             <CCascader
-              v-model:value={forms.musicalInstrumentId}
+              v-model:value={subjects.value}
               placement="bottom-end"
               placeholder="全部声部"
               options={tagSubjectList.value}
-              onUpdate:value={() => {
+              // onUpdate:value={() => {
+              //   onSearch();
+              // }}
+              onMoreId={(val: any) => {
+                forms.musicalInstrumentId = val.childId;
+                forms.subjectId = val.parentId;
                 onSearch();
               }}
             />