10/24

vip修改完毕

src/api/buildTeam.js

@@ -44,7 +44,7 @@ export function getTeacher (data) {
 // 获取所有声部集合
 export function getSubject (data) {
   return request({
-    url: '/web-server/subject/queryPageTree',
+    url: '/web-server/subject/findSubSubjects',
     method: 'get',
     params: qs.stringify(data)
   })

src/api/teacherManager.js

@@ -129,3 +129,13 @@ export function updateTeacherCoursesSalary (data) {
   })
 }
 
+
+//获取教师vip课教学点
+export function getTeachSchool (data) {
+  return request({
+    url: '/web-server/school/findVipSchoolByTeacher',
+    // url: '/api-student/course/updateTeacherCoursesSalary',
+    method: 'get',
+    params: data
+  })
+}

src/views/buildVip/index.vue

@@ -28,6 +28,7 @@
           <el-form-item label="指导老师"
                         prop="teacher">
             <el-select v-model="leftForm.teacher"
+                       @change="setSection"
                        :disabled="!leftForm.subject">
               <el-option v-for="(item,index) in teacherList"
                          :key="index"
@@ -56,6 +57,17 @@
                          :label="item.name"></el-option>
             </el-select>
           </el-form-item>
+          <!-- 11111111111111111111111111111111 -->
+          <el-form-item label="教学点">
+            <el-select v-model="leftForm.section"
+                       :disabled="!leftForm.teacher">
+              <el-option v-for='(item,index) in scetionList'
+                         :key='index'
+                         :value="item.id"
+                         :label="item.name">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="每班人数">
             <el-input type='number'
                       disabled
@@ -283,6 +295,7 @@
 <script>
 import { getTeacher, getSubject } from '@/api/buildTeam'
 import { vipGroupCategory, vipGroupActivityFind, getVipGroupCostCount, createVip } from '@/api/vipSeting'
+import { getTeachSchool } from '@/api/teacherManager'
 export default {
   data () {
     return {
@@ -299,7 +312,8 @@ export default {
         signUpStart: '',
         signUpEnd: '',
         courseStart: '',
-        courseEnd: ''
+        courseEnd: '',
+        section: ''
       },
       centerForm: {
         allCourseNum: '',
@@ -335,6 +349,7 @@ export default {
       timeTable: [], // 真正的课表
       giveNum: '',
       weekDay: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+      scetionList: [],
       courseOption: {
         disabledDate: time => {
           let startTime = this.leftForm.courseStart;
@@ -371,7 +386,7 @@ export default {
     // 获取所有科目的接口
     getSubject().then(res => {
       if (res.code == 200) {
-        this.subjectList = res.data.rows;
+        this.subjectList = res.data;
       }
 
     })
@@ -541,6 +556,7 @@ export default {
             type: 'error',
             message: '该时间段已排课请重选时间'
           })
+          return
         }
       } else {
         this.lookList.push({
@@ -634,8 +650,22 @@ export default {
       let date = this.maskForm.courseStart;
       let date1 = this.maskForm.courseStart;
       let startWeekday = this.maskForm.courseStart.getDay();
-      let onlineList = [];
-      let offlineList = [];
+      let onlineList = []; // 装线上课的数组
+      let offlineList = []; //装线下课的数组
+      if (this.lookList.length <= 0) {
+        this.$message.error('请先排课后再点击确认按钮');
+        return
+      }
+      if (online > 0 && onlineList.length <= 0) {
+        this.$message.error('选择了线上课单但未排线上课');
+        this.timeTable = [];
+        return;
+      }
+      if (offline > 0 && offlineList.length <= 0) {
+        this.$message.error('选择了线下课但未排线下课')
+        this.timeTable = [];
+        return;
+      }
       for (let i in this.lookList) {
         if (this.lookList[i].type == '线上课') {
           onlineList.push({ week: this.lookList[i].weekDay, date: this.lookList[i] })
@@ -667,19 +697,19 @@ export default {
         date.setDate(date.getDate() + 7);
       }
 
+
       while (offline && offline > 0) {
         // 排线下课
         for (let i in offlineList) {
           let num;
           offlineList[i].week - date1.getDay() >= 0 ? num = offlineList[i].week - date1.getDay() : num = offlineList[i].week - date1.getDay() + 7// +差值的天数://差值的天数+7
           let dataStr = this.getThinkDate(date1, num);
-          console.log(dataStr);
           this.timeTable.push({
             'classDate': dataStr + ' 00:00:00',
             'actualTeacherId': this.leftForm.teacher,
             'startClassTimeStr': offlineList[i].date.startTime,
             "endClassTimeStr": offlineList[i].date.endTime,
-            "teachMode": 'OFFNLINE'
+            "teachMode": 'OFFLINE'
           })
           offline--;
           if (offline == 0) break
@@ -687,6 +717,7 @@ export default {
         // 加一周
         date1.setDate(date1.getDate() + 7);
       }
+
       this.dialogFormVisible = false;
     },
     getThinkDate (date, num) {
@@ -768,6 +799,7 @@ export default {
        */
       obj.vipGroupApplyBaseInfo = {
         coursesExpireDate: this.leftForm.courseEnd,
+        teacherSchoolId: this.left.section,
         name: this.leftForm.name,
         offlineClassesNum: offline,
         onlineClassesNum: online,
@@ -785,7 +817,16 @@ export default {
         giveTeachMode: this.centerForm.radio,
         subjectIdList: this.leftForm.subject,
       }
+      console.log(this.timeTable)
+      return;
       createVip(obj).then(res => { })
+    },
+    setSection (val) {
+      getTeachSchool({ userId: val }).then(res => {
+        if (res.code == 200) {
+          this.scetionList = res.data;
+        }
+      })
     }
   },
 }

src/views/teamBuild/components/teamSoundMoney.vue

@@ -542,7 +542,7 @@ export default {
     getSubject().then(res => {
       // console.log(res);
       if (res.code == 200) {
-        this.soundList = res.data.rows;
+        this.soundList = res.data;
         // // 生成动态的checkList
         for (let key in this.soundList) {
           this.$set(this.soundLists, key, [])

src/views/teamDetail/components/courseList.vue

@@ -107,10 +107,10 @@
                          prop="masterTeacherName"
                          label="指导老师">
         </el-table-column>
-        <el-table-column align='center'
+        <!-- <el-table-column align='center'
                          prop="subTeacherName"
                          label="助教老师">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align='center'
                          label="操作">
           <template slot-scope="scope">
@@ -132,15 +132,23 @@
                width="400px"
                :visible.sync="courseVisible">
       <el-form :model="maskForm"
+               ref="maskForm"
+               :rules="maskRules"
                :inline="true">
-        <el-form-item label="主教老师">
-          <el-input></el-input>
+        <el-form-item label="主教老师"
+                      prop="teacher">
+          <el-select v-model="maskForm.teacher"></el-select>
         </el-form-item>
-        <el-form-item label="助教老师">
-          <el-input></el-input>
+        <el-form-item label="助教老师"
+                      prop="assistant">
+          <el-select v-model="maskForm.assistant"></el-select>
         </el-form-item>
-        <el-form-item label="上课日期">
-          <el-input></el-input>
+        <el-form-item label="上课日期"
+                      prop="date">
+          <el-date-picker v-model="maskForm.date"
+                          type="date"
+                          placeholder="选择日期">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="上课时间">
           <el-input></el-input>
@@ -182,7 +190,12 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      maskForm: {}
+      maskForm: {
+        teacher: '',
+        assistant: '',
+        date: ''
+      },
+      maskRules: {}
     }
   },
   components: {