Merge branch '04/14resetSalaryName' into dev

src/views/teamDetail/componentCourse/modals/coursePostpone.vue

@@ -65,10 +65,13 @@ export default {
   methods: {
     processDate() {
       //提出结束时间必须大于提出开始时间
+      let that = this
+      let dayjs = this.$helpers.dayjs
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          return time.getTime() + 86400000 <= Date.now();
+         let flag = dayjs(that.postponeForm.pauseDate).format('YYYY-MM-DD')==dayjs(time).format('YYYY-MM-DD')
+          return (time.getTime() + 86400000 <= Date.now())||flag;
           //开始时间不选时，结束时间最大值小于等于当天
         },
       };

src/views/teamDetail/componentCourse/modals/resetCourses.vue

@@ -40,7 +40,6 @@
           filterable
           clearable
         >
-          <el-option label="不修改" :value="''"></el-option>
           <el-option
             v-for="(item, index) in schoolList"
             :key="index"
@@ -138,6 +137,10 @@ export default {
           this.$message.error('请选择开始时间')
           return
         }
+        if(this.timeForm.teachMode == 'OFFLINE'&&this.groupType == 'VIP'&&!this.timeForm.address){
+           this.$message.error('请选择教学点')
+          return
+        }
           let obj = {
             courseScheduleIds: this.idList,
             changeMainTeacher: false,

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -100,7 +100,7 @@
       </el-table>
     </div>
     <el-dialog title="学员列表" width="70%" :visible.sync="maskVisible">
-      <el-form :model="maskForm" :inline="true">
+      <el-form :model="maskForm" :inline="true" @submit.native.prevent>
         <el-form-item>
           <el-input
             placeholder="请输入学生姓名或手机号"