1226 17:02

111

src/views/teamDetail/components/studentSignin.vue

@@ -13,9 +13,9 @@
                :model="searchForm">
         <el-form-item label='开课时间'>
           <el-date-picker v-model="searchForm.times"
-                          type="datetimerange"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          format="yyyy-MM-dd HH:mm:ss"
+                          type="daterange"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期">
@@ -147,7 +147,11 @@ export default {
         this.searchForm.times = []
       }
       let startTime = this.searchForm.times[0] || null
+      if (startTime) startTime += ' 00:00:00'
+
       let endTime = this.searchForm.times[1] || null
+      if (endTime) endTime += ' 23:59:59'
+
       let courseScheduleName = this.searchForm.courseName || null
       let userName = this.searchForm.studentName || null
       let signStatus = this.searchForm.sign || null

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

@@ -418,10 +418,33 @@ export default {
     recoveryCourse (scope) {
       getStudentPauseInfo({ studentId: scope.row.id, vipGroupId: this.id }).then(res => {
         if (res.code == 200) {
-          this.activeStudent = res.data.studentId
-          this.adjustmentVisible = true;
-          this.adjustmentForm.teacher = res.data.teacherId;
-          this.adjustmentForm.count = `${res.data.totalCourseTimes}+${res.data.giveCourseTimes}`
+
+          if (res.data.isPause == 0) {
+            // vip状态没暂停 不需要排课
+            // 课程编号  学生编号
+            this.$confirm('将按照当前剩余课时安排上课', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              // 发请求 恢复上课
+              recoverForStudent({ vipGroupId: this.id, userId: scope.row.id }).then(res => {
+                if (res.code == 200) {
+                  this.adjustmentVisible = false;
+                  this.getStudents()
+                }
+              })
+
+            }).catch(() => {
+            });
+
+          } else {
+            this.activeStudent = res.data.studentId
+            this.adjustmentVisible = true;
+            this.adjustmentForm.teacher = res.data.teacherId;
+            this.adjustmentForm.count = `${res.data.totalCourseTimes}+${res.data.giveCourseTimes}`
+          }
+
         }
       })