Merge branch 'ol_12_30' into online

src/components/remote-search/index.vue

@@ -82,7 +82,7 @@ export default {
           if (this.multiple) {
             return flag || this.value.includes(item.userId);
           } else {
-            console.log(query,this.value)
+            // console.log(query,this.value)
             return flag || item.userId == this.value;
           }
         });
@@ -97,7 +97,7 @@ export default {
             this.options = uniqBy(this.options, 'userId')
           }
           }catch(e){
-            console.log(e)
+            // console.log(e)
           }
 
       }

src/views/recodeManager/recodeList.vue

@@ -18,7 +18,7 @@
             v-model.trim="searchForm.search"
             clearable
             @keyup.enter.native="search"
-            placeholder="关键字搜索"
+            placeholder="老师课程名、课程编号"
           ></el-input>
         </el-form-item>
         <el-form-item prop="organId">

src/views/studentManager/studentList.vue

@@ -46,7 +46,8 @@
         </el-form-item>
 
         <el-form-item>
-          <el-select
+            <remote-search :commit="'setTeachers'" v-model="searchForm.teacherId" />
+          <!-- <el-select
             placeholder="指导老师"
             v-model="searchForm.teacherId"
             clearable
@@ -58,8 +59,9 @@
               :value="item.id"
               :key="index"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
+
         <el-form-item prop="isActive">
           <el-select
             class="multiple"

src/views/teamDetail/componentClass/calenderStudentList.vue

@@ -119,7 +119,6 @@ export default {
     async submit() {
       let obj = {};
       let some = this.getData();
-      console.log(some);
       if (some) {
         obj.musicGroupPaymentCalenderDtos = [some];
       } else {
@@ -139,7 +138,6 @@ export default {
         // 2.清空合并班
         // 3.刷新列表
         this.$emit("refresh");
-        console.log(reset);
       } catch (e) {
         console.log(e);
       }

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

@@ -88,7 +88,7 @@
     </el-form>
     <div slot="footer" class="dialog-footer" v-if="classType != 5">
       <el-button @click="$listeners.close">取 消</el-button>
-      <el-button type="primary" v-if="!isEmpty" @click="submit">确 定</el-button>
+      <el-button type="primary" :disabled="isEmpty" @click="submit">确 定</el-button>
     </div>
   </div>
 </template>