Merge branch 'online' into resetSound

src/api/buildTeam.js

@@ -790,4 +790,13 @@ export function clearClassCourse (data) {
     method: 'post',
     data: qs.stringify(data)
   })
+}
+
+// 课程顺延
+export function coursePostpone (data) {
+  return request({
+    url: api + '/courseSchedule/coursePostpone',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }

src/views/buildVip/index.vue

@@ -240,6 +240,25 @@
             <el-input v-model="rightForm.allPrice"
                       disabled />
           </el-form-item>
+          <el-form-item label="上课学生">
+            <!--      :loading="loading" -->
+            <el-select v-model="rightForm.students"
+                       multiple
+                       clearable
+                       placeholder="请输入关键词"
+                       remote
+                       reserve-keyword
+                       filterable
+                       :remote-method="remoteMethod">
+              <el-option v-for="(item,index) in studentList"
+                         :key="index"
+                         :label="item.username"
+                         :value="item.userId">
+                <span style="float: left">{{ item.username }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{item.parentsPhone  }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
         <el-button type="primary"
                    style="float:right"
@@ -375,6 +394,7 @@
 import { getTeacher, getSubject } from '@/api/buildTeam'
 import { vipGroupCategory, vipGroupActivityFind, getVipGroupCostCount, createVip, getVipGroupDetail, updateVipBaseInfo } from '@/api/vipSeting'
 import { getTeachSchool, getTeacherBySubject } from '@/api/teacherManager'
+import { queryStudentList } from '@/api/studentManager'
 export default {
   data () {
     return {
@@ -412,7 +432,8 @@ export default {
         offlineCourse: '',
         onlinePrice: '',
         offlinePrice: '',
-        allPrice: ''
+        allPrice: '',
+        students: []
       },
       computationalBtn: false,
       subjectList: [], // 科目列表
@@ -485,7 +506,8 @@ export default {
           required: true, message: '请选择报名结束时间', trigger: 'blur'
         }]
       },
-      id: ''
+      id: '',
+      studentList: []
     }
   },
   computed: {
@@ -544,6 +566,13 @@ export default {
     })
     // 获取所有老师的接口  根据声部id获取老师
     // 获取课程类型的接口
+
+    // 获取学生列表
+    // queryStudentList({ rows: 100000 }).then(res => {
+    //   if (res.code == 200) {
+    //     this.studentList = res.data.rows
+    //   }
+    // })
   },
   methods: {
     beginDate () {
@@ -999,7 +1028,9 @@ export default {
         courseStart: '',
         courseEnd: ''
        */
+      let studentIdList = this.rightForm.students.join(',') || null
       obj.vipGroupApplyBaseInfo = {
+        studentIdList,
         coursesExpireDate: this.leftForm.courseEnd,
         teacherSchoolId: this.leftForm.section,
         name: this.leftForm.name,
@@ -1019,6 +1050,8 @@ export default {
         giveTeachMode: this.centerForm.radio,
         subjectIdList: this.leftForm.subject,
       }
+
+
       // 调接前判断是新增还是修改
       if (!this.id) {
         // 新增
@@ -1038,7 +1071,6 @@ export default {
 
     },
     setSection (val) {
-      console.log(val)
       this.leftForm.section = '';
       this.rightForm.offlineCourse = '';
       this.rightForm.onlineCourse = '';
@@ -1117,6 +1149,32 @@ export default {
       this.rightForm.allPrice = data.totalPrice;
 
       //subjectIdList
+    },
+    remoteMethod (query) {
+      if (query !== '') {
+        // this.loading = true;
+        // 发请求搜索
+        queryStudentList({ rows: 100, search: query }).then(res => {
+          if (res.code == 200) {
+            // this.loading = false;
+            this.studentList = this.studentList.concat(res.data.rows);
+            // this.studentList = res.data.rows;
+            this.unique(this.studentList, 'userId')
+            // console.log(this.studentList)
+
+          }
+        })
+
+      }
+
+    },
+    unique (arr, u_key) {
+      let obj = {}
+      arr.reduce((prev, next) => {
+        obj[next[u_key] + typeof next[u_key]] ? '' :
+          obj[next[u_key] + typeof next[u_key]] = true && prev.push(next)
+        return prev
+      }, [])
     }
   },
   // watch: {

src/views/journal/studentComplain.vue

@@ -251,11 +251,11 @@ export default {
       let teacherRate = this.teacherRate
       let studentRate = this.studentRate
       if (type == 'submit') {
-        if (teacherRate < 0 || teacherRate > 10 || typeof teacherRate == 'string') {
+        if (teacherRate < 0 || teacherRate > 10 || Number(teacherRate) == NaN) {
           this.$message.error('老师责任比输入有误')
           return
         }
-        if (studentRate < 0 || studentRate > 10 || typeof studentRate == 'string') {
+        if (studentRate < 0 || studentRate > 10 || Number(studentRate) == NaN) {
           this.$message.error('学生责任比输入有误')
           return
         }

src/views/teamDetail/components/classList.vue

@@ -15,9 +15,16 @@
     <!-- 列表 -->
     <!-- <div class="newBand"
          @click="resetClass">班级调整</div> -->
+    <div class="newBand"
+         v-permission="'courseSchedule/coursePostpone'"
+         @click="postpone">课程顺延</div>
     <div class="tableWrap">
       <el-table :data='tableList'
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection"
+                         width="55">
+        </el-table-column>
         <el-table-column align='center'
                          prop="classGroupName"
                          label="班级名称">
@@ -51,6 +58,16 @@
                          prop="studyNum"
                          label="在读人数">
         </el-table-column>
+        <el-table-column align='center'
+                        v-if="permission('courseSchedule/coursePostpone')"
+                         label="操作">
+          <template slot-scope="scope">
+            <div>
+              <el-button type='text'
+                         @click="signPostpone(scope.row)">顺延课程</el-button>
+            </div>
+          </template>
+        </el-table-column>
         <!-- <el-table-column align='center'
                          prop="quitNum"
                          label="退团人数">
@@ -75,11 +92,50 @@
                   :page-sizes="rules.page_size"
                   @pagination="getList" />
     </div>
+    <el-dialog title="课程顺延"
+               :visible.sync="postponeVisible"
+               width="600px"
+               :before-close="handleClose">
+      <el-form :model="postponeForm"
+               ref="postponeForm"
+               :rules='postponeRules'>
+        <el-form-item label="顺延起始时间"
+                      prop="stopTime">
+          <el-date-picker v-model="postponeForm.stopTime"
+                          type="date"
+                          :picker-options="bigin"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="顺延结束时间"
+                      prop="resetTime">
+          <el-date-picker v-model="postponeForm.resetTime"
+                          type="date"
+                          :picker-options="options"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="跳过节假日">
+          <el-checkbox v-model="postponeForm.holiday"></el-checkbox>
+        </el-form-item>
+      </el-form>
+      <span style='color:#F56C6C;'>注意:将会把所选班级的课表，「顺延起始时间」之后的全部未开始课程；
+        调整到「顺延结束时间」之后重新排课，可以勾选跳过节假日；</span>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="postponeVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="submitInfo">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { getClassList } from '@/api/buildTeam'
+import { getClassList, coursePostpone } from '@/api/buildTeam'
+import { permission } from '@/utils/directivePage'
 export default {
   props: {
     teamid: {
@@ -89,6 +145,7 @@ export default {
   },
   data () {
     return {
+      postponeVisible: false,
       searchLsit: [],
       searchForm: {
         name: '',
@@ -102,7 +159,19 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-
+      postponeForm: {
+        stopTime: '',
+        resetTime: '',
+        holiday: false
+      },
+      postponeRules: {
+        stopTime: [{ required: true, message: '请选择顺延开始时间', trigger: 'blur' },],
+        resetTime: [{ required: true, message: '请选择恢复开始时间', trigger: 'blur' },],
+      },
+      activeClass: '',
+      activeList: [],
+      options: this.processDate(),
+      bigin: this.beginDate()
     }
   },
   components: {
@@ -112,6 +181,9 @@ export default {
     this.getList();
   },
   methods: {
+    permission (str) {
+      return permission(str)
+    },
     getList () {
       // search: this.teamid
       getClassList({ search: this.teamid, page: this.rules.page, rows: this.rules.limit }).then(res => {
@@ -124,7 +196,73 @@ export default {
     resetClass () {
       // 跳转到班级详情页
       this.$router.push({ path: '/business/resetClass', query: { id: this.teamid } })
-    }
+    },
+    postpone () {
+      if (this.activeList.length <= 0) {
+        this.$message.error('请至少选择一个班级');
+        return
+      }
+      this.postponeVisible = true;
+    },
+    signPostpone (row) {
+      this.activeClass = row.classGroupId;
+      this.postponeVisible = true;
+    },
+    handleClose () {
+      // 弹窗关闭之前
+      this.postponeVisible = false;
+      this.$refs['postponeForm'].resetFields();
+    },
+    handleSelectionChange (val) {
+      this.activeList = val;
+      let arr = val.map(item => {
+        return item.classGroupId
+      })
+      this.activeClass = arr.join(',')
+    },
+    submitInfo () {
+      this.$refs['postponeForm'].validate(res => {
+        if (res) {
+          let classGroupIds = this.activeClass;
+          let pauseDate = this.postponeForm.stopTime;
+          let recoveryDate = this.postponeForm.resetTime;
+          let skipHoliday = this.postponeForm.holiday;
+          let obj = {
+            classGroupIds,
+            pauseDate,
+            recoveryDate,
+            skipHoliday
+          }
+          coursePostpone(obj).then(res => {
+            if (res.code == 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+
+    },
+    processDate () {//提出结束时间必须大于提出开始时间
+      let self = this
+      return {
+        disabledDate (time) {
+          if (self.postponeForm.stopTime) {
+            return new Date(self.postponeForm.stopTime).getTime() > time.getTime()
+          } else {
+            return time.getTime() > Date.now()
+            //开始时间不选时，结束时间最大值小于等于当天
+          }
+        }
+      }
+    },
+    beginDate () {
+      let self = this
+      return {
+        disabledDate (time) {
+          return time.getTime() + 86400000 <= new Date().getTime()//开始时间不选时，结束时间最大值小于等于当天
+        }
+      }
+    },
   }
 }
 </script>

src/views/teamDetail/components/courseList.vue

@@ -69,8 +69,8 @@
            @click="removeCourses"
            v-permission="'courseSchedule/bathDelete'">批量删除</div>
       <!-- v-permission="'courseSchedule/bathDelete'" -->
-      <div class="newBand"
-           @click="resetTimer">修改日期</div>
+      <!-- <div class="newBand"
+           @click="resetTimer">修改日期</div> -->
     </div>
     <!-- -->
 
@@ -488,7 +488,8 @@ export default {
         return
       }
       this.timerVisible = true;
-    }
+    },
+
 
   }
 }

vue.config.js

@@ -21,8 +21,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
-let target = 'http://admin.dayaedu.com/' // 测试服
-// let target = 'http://192.168.3.48:8080' // 乔
+// let target = 'http://admin.dayaedu.com/' // 测试服
+let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**