修改位置

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

@@ -116,14 +116,6 @@ export default defineComponent({
           </NSpace>
 
           <div class={styles.searchSelect}>
-            <CCascader
-              placeholder="全部声部"
-              v-model:value={forms.musicalInstrumentId}
-              options={tagSubjectList.value}
-              onUpdate:value={() => {
-                onSearch();
-              }}
-            />
             {forms.type === 'MUSIC' && props.type === 'shareResources' && (
               <CCascader
                 placeholder="全部教材"
@@ -136,6 +128,14 @@ export default defineComponent({
                 }}
               />
             )}
+            <CCascader
+              placeholder="全部声部"
+              v-model:value={forms.musicalInstrumentId}
+              options={tagSubjectList.value}
+              onUpdate:value={() => {
+                onSearch();
+              }}
+            />
           </div>
 
           <NInput

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

@@ -108,17 +108,8 @@ export default defineComponent({
       <>
         <div class={styles.searchGroup}>
           <div class={styles.searchSelect}>
-            <CCascader
-              v-model:value={forms.musicalInstrumentId}
-              placeholder="全部声部"
-              options={tagSubjectList.value}
-              onUpdate:value={() => {
-                onSearch();
-              }}
-            />
             {props.type !== 'myMusic' && (
               <CCascader
-                placement="bottom-end"
                 placeholder="全部版本"
                 v-model:value={musics.value}
                 options={tagList.value}
@@ -129,6 +120,15 @@ export default defineComponent({
                 }}
               />
             )}
+            <CCascader
+              v-model:value={forms.musicalInstrumentId}
+              placement="bottom-end"
+              placeholder="全部声部"
+              options={tagSubjectList.value}
+              onUpdate:value={() => {
+                onSearch();
+              }}
+            />
           </div>
           <NInput
             type="text"