Merge branch '02/23reviewBUG' into test

src/views/resetTeaming/components/musicArchices.vue

@@ -17,7 +17,7 @@
       </el-switch>
     </div>
     <!-- searchKey="musicArchices" -->
-    <tab-router v-model="activeIndex" ref="tab">
+    <el-tabs v-model="activeIndex" ref="tab">
       <el-tab-pane
         label="基本信息"
         lazy
@@ -107,7 +107,7 @@
       >
         <survey v-if="activeIndex == 8" />
       </el-tab-pane>
-    </tab-router>
+    </el-tabs>
   </div>
 </template>
 <script>
@@ -143,7 +143,7 @@ export default {
   },
   data() {
     return {
-      activeIndex: "training-photos",
+      activeIndex: "1",
       planDtosList: [],
       planDtosList1: [],
       year: "",

src/views/teamBuild/modals/change-voice.vue

@@ -95,11 +95,12 @@
         }}</span>
       </el-form-item>
       <template>
-        <el-form-item
-          v-show="
+        <!--      v-show="
             (courseViewType == 2 && form.musicalGoods == 'OWNED') ||
             courseViewType != 2
-          "
+          " -->
+        <el-form-item
+
           v-if="activeAccessories.length || groupList.length || changeInfo"
           label="更换教辅"
           class="is-required"