Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/stuMan/subscribe/makeUp.vue

@@ -100,9 +100,8 @@
         this.$emit("changeshow", val);
       },
       getStu() {
-
         this.msg.NextCourseGradeNo = this.saveObj.Ranks,
-          this.msg.CourseGradeId = this.saveObj.CourseGradeId;
+        this.msg.CourseGradeId = this.saveObj.CourseGradeId;
         getCanAppointmentStuList_V2(this.msg).then(res => {
           if (res.Code == 1) {
             this.stuOptions = res.Data;

src/pages/stuMan/AppointmentStatistics.vue

@@ -46,7 +46,7 @@
         persistent: false,
         loading: false,
         //是否显示新增弹窗
-        isShowAddForm:false,
+        isShowAddForm: false,
         msg: {
           StartTime: "",
           EndTime: "",
@@ -92,8 +92,8 @@
         });
       },
       refreshPage() {
-        this.isShowAddForm=false;
-this.setingObj={};
+        this.isShowAddForm = false;
+        this.setingObj = {};
         this.getPlanAppointmentList();
       },
       //获取学员预约统计
@@ -105,10 +105,9 @@ this.setingObj={};
         });
       },
       //线索新增弹窗
-      ShowAddForm()
-      {
-this.isShowAddForm=true;
-this.setingObj={};
+      ShowAddForm() {
+        this.isShowAddForm = true;
+        this.setingObj = {};
       }
     },
   };

src/pages/studyAbroad/subscribe.vue

@@ -150,10 +150,6 @@
                         <div class="flex no-wrap" v-if="__item.ClassType == 3">
                           <span class="">最小成班人数：</span><span>{{ __item.ScrollMinNum }}</span>
                         </div>
-                        <!-- <div class="flex no-wrap" v-if="__item.ClassType == 3">
-                        <span class="">最大成班人数：</span
-                        ><span>{{ __item.ScrollMaxNum }}</span>
-                      </div> -->
                       </div>
                       <div v-if="viewType == 'week'&&__item.ClassType === 3"
                         style="white-space:normal;font-size:10px">
@@ -228,9 +224,6 @@
                       <div class="flex no-wrap" v-if="__item.ClassType == 3">
                         <span class="">最小成班人数：</span><span>{{ __item.ScrollMinNum }}</span>
                       </div>
-                      <!-- <div class="flex no-wrap" v-if="__item.ClassType == 3">
-                      <span class="">最大成班人数：</span><span>{{ __item.ScrollMaxNum }}</span>
-                    </div> -->
                     </div>
                   </el-popover>
                 </div>