Merge branch 'nov23'

debug.log

@@ -1 +1,4 @@
 
+[1127/100753.385:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1127/100753.402:ERROR:filesystem_win.cc(129)] GetFileAttributes C:\Users\lex\AppData\Local\Google\Chrome\User Data\Crashpad\attachments\6cd524b3-9b87-4263-8992-de833b809784: 系统找不到指定的路径。 (0x3)
+[1127/100753.406:ERROR:filesystem_win.cc(129)] GetFileAttributes C:\Users\lex\AppData\Local\Google\Chrome\User Data\Crashpad\attachments\8b20b593-2a91-4130-9aa1-1910ad894bc8: 系统找不到指定的路径。 (0x3)

src/views/teamDetail/componentCourse/courseList.vue

@@ -136,6 +136,7 @@ export default {
     this.init()
   },
   mounted () {
+
     this.init()
   },
   methods: {

src/views/teamDetail/componentCourse/resetClass.vue

@@ -7,7 +7,9 @@
              label-position="right"
              label-width="120px"
              :inline="true">
+      <!--    -->
       <el-form-item label="主教老师"
+                    v-if="maskForm.type == 'VIP'"
                     prop="teacher">
         <el-select v-model.trim="maskForm.teacher"
                    style="width:220px!important"
@@ -20,6 +22,19 @@
                      :label="item.realName"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="主教老师"
+                    v-else
+                    prop="teacher">
+        <el-select v-model.trim="maskForm.teacher"
+                   style="width:220px!important"
+                   clearable
+                   filterable>
+          <el-option v-for="(item,index) in teacherList"
+                     :key="index"
+                     :value="item.id"
+                     :label="item.realName"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="助教老师"
                     v-if="maskForm.type != 'MUSIC_NETWORK'&&maskForm.type != 'HIGH_ONLINE'&&maskForm.groupType == 'MUSIC'"
                     prop="assistant">
@@ -90,8 +105,9 @@
         </el-select>
       </el-form-item>
       <el-form-item label="教学地点"
-                    v-if="maskForm.teachMode == 'OFFLINE'&&  maskForm.type == 'VIP'">
-        <el-select v-model.trim="maskForm.address"
+                    v-if="maskForm.teachMode == 'OFFLINE'">
+        <el-select v-model.trim="
+                    maskForm.address"
                    style="width:220px!important"
                    filterable
                    clearable>
@@ -114,6 +130,7 @@
 import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
 import { getTeacher, resetCourse, getCourseScheduleDetail } from "@/api/buildTeam";
 import { getTeachSchool } from "@/api/teacherManager";
+import { getSchool } from "@/api/systemManage"
 import cleanDeep from 'clean-deep'
 import dayjs from 'dayjs';
 export default {
@@ -220,7 +237,6 @@ export default {
     getDetail (id) {
       getCourseScheduleDetail({ courseScheduleId: id }).then(res => {
         if (res.code == 200) {
-          console.log(res.data.groupType)
           this.maskForm = {
             id: res.data.id,
             teacher: res.data.actualTeacherId,
@@ -231,7 +247,7 @@ export default {
             timer: null,
             type: res.data.type,
             groupType: res.data.groupType,
-            schoolId: res.data.schoolId,
+            address: res.data.schoolId,
             teachMode: res.data.teachMode,
           }
           this.maskForm.assistant = [];
@@ -243,7 +259,7 @@ export default {
           let time = diffTimerFormMinute(dayjs(res.data.classDate).format('YYYY-MM-DD'), dayjs(res.data.startClassTime).format('HH:mm'), dayjs(res.data.endClassTime).format('HH:mm'))
           console.log(dayjs(res.data.startClassTime).format('HH:mm'))
           this.maskForm.timer = time;
-          if (this.maskForm.teacher) {
+          if (this.maskForm.teacher && this.maskForm.type == 'VIP') {
             getTeachSchool({
               userId: this.maskForm.teacher
             }).then(res => {
@@ -251,6 +267,12 @@ export default {
                 this.schoolList = res.data;
               }
             })
+          } else {
+            getSchool({ organId: res.data.organId }).then(res => {
+              if (res.code == 200) {
+                this.schoolList = res.data;
+              }
+            })
           }
         }
       })
@@ -263,48 +285,6 @@ export default {
         this.getDetail(val)
       }
     },
-    // show (val) {
-    //   console.log(val)
-    //   this.courseVisible = val;
-    // },
-    // courseVisible (val) {
-    //   if (!val) {
-    //     this.$emit("closeReset");
-    //   }
-    // },
-    // item: {
-    //   immediate: true,
-    //   deep: true,
-    //   handler (row, oldValue) {
-    //     if (row) {
-    //       console.log(row)
-
-    //       this.maskForm.assistant = [];
-    //       for (let i in row.teachingTeachers) {
-    //         if (row.teachingTeachers[i].teacherRole == "TEACHING") {
-    //           this.maskForm.assistant.push(row.teachingTeachers[i].userId);
-    //         }
-    //       }
-    //       let time = diffTimerFormMinute(dayjs(row.classDate).format('YYYY-MM-DD'), dayjs(row.startClassTime).format('HH:mm'), dayjs(row.endClassTime).format('HH:mm'))
-    //       console.log(dayjs(row.startClassTime).format('HH:mm'))
-    //       this.maskForm.timer = time;
-    //     } else {
-    //       this.maskForm = {
-    //         id: null,
-    //         teacher: null,
-    //         assistant: null,
-    //         date: null,
-    //         startTime: null,
-    //         endTime: null,
-    //         timer: null,
-    //         type: null,
-    //         groupType: null,
-    //         schoolId: null,
-    //         teachMode: null,
-    //       }
-    //     }
-    //   }
-    // },
     'maskForm.timer' (val) {
       this.$nextTick(res => {
         if (val) {

src/views/teamDetail/components/courseList.vue

@@ -284,6 +284,20 @@
                             minTime: maskForm.startTime
                           }"></el-time-select>
         </el-form-item>
+        <el-form-item label="教学地点"
+                      prop="schoolId"
+                      v-if="maskForm.courseScheduleType != 'HIGH_ONLINE'&&maskForm.courseScheduleType != 'MUSIC_NETWORK'">
+          <el-select v-model.trim="
+                    maskForm.schoolId"
+                     style="width:220px!important"
+                     filterable
+                     clearable>
+            <el-option v-for="(item,index) in schoolList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer"
            class="dialog-footer">
@@ -428,6 +442,7 @@ import {
 import { permission } from "@/utils/directivePage";
 import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
 import { classTimeList } from "@/utils/searchArray";
+import { getSchool } from "@/api/systemManage"
 import cleanDeep from 'clean-deep'
 export default {
   name: "tcourseList",
@@ -474,6 +489,9 @@ export default {
         type: "",
         timer: '',
         courseScheduleType: null,
+        address: '',
+        teachMode: '',
+        schoolId: ''
       },
       typeForm: {
         teacher: "",
@@ -485,9 +503,9 @@ export default {
         id: null
       },
       maskRules: {
-        // type:[
-        //   {required: true, message: "请选择课程类型", trigger: "blur"}
-        // ],
+        schoolId: [
+          { required: true, message: "请选教学地点", trigger: "blur" }
+        ],
         teacher: [
           { required: true, message: "请选择主教老师名称", trigger: "blur" }
         ],
@@ -518,7 +536,9 @@ export default {
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
-      }
+      },
+      organId: '',
+      schoolList: []
     };
   },
   components: {
@@ -526,6 +546,12 @@ export default {
   },
   mounted () {
     this.init();
+    getSchool({ organId: this.$route.query.organId }).then(res => {
+      if (res.code == 200) {
+        this.schoolList = res.data;
+      }
+    })
+
   },
   activated () {
     this.init();
@@ -533,6 +559,7 @@ export default {
   methods: {
     init () {
       this.teamid = this.$route.query.id;
+      this.organId = this.$route.query.organId
       this.getList();
       // 获取所有老师
       // findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then(res => {
@@ -654,7 +681,9 @@ export default {
       this.maskForm.endTime = addTimerFormMinute(row.classDate, row.startClassTimeStr, time)
       // this.maskForm.endTime = row.endClassTimeStr.substring(0, 5);
       this.maskForm.id = row.courseScheduleId;
+      this.maskForm.schoolId = row.schoolId
       this.courseVisible = true;
+
       // 修改课时
 
       // let obj = {
@@ -730,7 +759,8 @@ export default {
             teachingTeacherIdList,
             classDate: maskForm.date,
             type: maskForm.type,
-            groupType: 'MUSIC'
+            groupType: 'MUSIC',
+            schoolId: maskForm.schoolId
           };
           resetCourse(cleanDeep(obj)).then(res => {
             if (res.code == 200) {

src/views/teamDetail/teamCourseList.vue

@@ -52,7 +52,7 @@
           <el-select v-model.trim="searchForm.groupType"
                      clearable
                      filterable
-                     placeholder="课程租类型">
+                     placeholder="课程组类型">
             <el-option v-for="(item, index) in courseListType"
                        :key="index"
                        :value="item.value"
@@ -368,6 +368,7 @@
     <el-dialog :visible.sync="show"
                width="400px">
       <resetClass :show="show"
+                  v-if="show"
                   @closeReset='closeReset'
                   @getList='getList'
                   :id='id' />

src/views/teamDetail/teamList.vue

@@ -520,7 +520,7 @@ export default {
         case 'PROGRESS': {
           // 进行中
           // 调到乐团详情 teamDetails
-          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search, rules } })
+          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search, rules, organId: row.organId } })
           break
         }
         case 'CANCELED': {

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

@@ -151,6 +151,7 @@ export default {
     __init () {
       let id = this.$route.query.id;
       this.id = id;
+      this.rules.page = 1
       this.getList();
     },
     search () {

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

@@ -383,6 +383,7 @@ export default {
     __init () {
       let id = this.$route.query.id;
       this.id = id;
+      this.rules.page = 1
       // 获取vip教学记录
       this.getList()
       // 获取分部教学点

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

@@ -319,6 +319,7 @@ export default {
     __init () {
       let id = this.$route.query.id;
       this.id = id;
+      this.rules.page = 1
       this.getStudents()
       findTeacherWithVipGroupOrganAndSubject({ vipGroupId: this.id }).then(res => {
         if (res.code == 200) {