1

1

src/views/resetTeaming/modals/subject-preview.vue

@@ -452,6 +452,12 @@ export default {
                         })
                         this.accessStatus = accessStatus
 
+                        // 所有打击乐声部没有乐保【23】
+                        if(this.subjectId == 23) {
+                            this.accessStatus = true
+                            accessStatus = true
+                        }
+
                         // 乐保服务初始化
                         this.instrumentResult.forEach(item => {
                             if(item.checked && item.kitType == "GROUP" && !accessStatus) {
@@ -613,6 +619,10 @@ export default {
                             } else {
                                 marketPrice += parseFloat(item.courseOriginalPrice)
                             }
+
+                            if(this.courseViewType == 0 && !item.isStudentOptional) {
+                                marketPrice += parseFloat(item.courseOriginalPrice)
+                            }
                         }
                     })
                 // }

src/views/teamDetail/components/modals/classroom-setting-merge.vue

@@ -68,7 +68,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         v-if="!!Object.keys(allClasss).length"
         style="display: block"
         label="排课类型"
@@ -82,7 +82,7 @@
           @click="changeTag(key)"
           >{{ courseTypeListByName[key] }}</el-tag
         >
-      </el-form-item>
+      </el-form-item> -->
       <empty v-if="isEmpty" desc="暂无可排课时长" />
       <el-collapse v-model="collapses" @change="collapseChange">
         <el-collapse-item