Quellcode durchsuchen

Merge branch 'ol_12_30' into online

mo vor 4 Jahren
Ursprung
Commit
5b8e5691af

+ 4 - 3
src/store/modules/selects.js

@@ -84,7 +84,7 @@ export default {
     },
     async setTeachers ({ commit, state }, force) {
       if ((!state.teachers.length || force === true) && !loadings.commit_teachers) {
-        loadings.commit_teachers = true
+        loadings.commit_teachers = getTeacher()
         try {
           state.teachersLoading =true
           const res = await getTeacher()
@@ -95,14 +95,15 @@ export default {
     },
     async setSchools ({ commit, state }, force) {
       if ((!state.schools.length || force === true) && !loadings.commit_schools) {
-        loadings.commit_schools = true
+        loadings.commit_schools = getSchool()
         try {
           state.schoolsLoading = true
-          const res = await getSchool()
+          const res = await loadings.commit_schools
           commit('commit_schools', res.data)
         } catch (error) { }
         loadings.commit_schools = false
       }
+      return loadings.commit_schools
     },
     async setVipGroupCategory ({ commit, state }, force) {
       if ((!state.vipGroupCategory.length || force === true) && !loadings.commit_vip_group_category) {

+ 3 - 3
src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -205,7 +205,7 @@
         </el-form-item>
         <el-form-item
           label="助教老师"
-          v-if="newClassForm.type != 'HIGH_ONLINE'"
+          v-if="newClassForm.type != 'HIGH_ONLINE' && newClassForm.type != 'HIGH'&&newClassForm.type"
           prop="teaching"
         >
           <remote-search
@@ -231,7 +231,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item 辜经理和焕焕狗要求不要可选声部
           label="可报名声部"
           prop="memo"
           :rules="[
@@ -256,7 +256,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           label="网络教室声部"
           prop="subjectId"

+ 1 - 1
src/views/teamDetail/components/resetClass.vue

@@ -394,7 +394,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item
+        <!-- <el-form-item 辜经理和焕焕狗要求不要可选声部
           label="可报名声部"
           prop="memo"
           :rules="[