mo 4 년 전
부모
커밋
d03fe45430

+ 14 - 1
src/utils/searchArray.js

@@ -166,6 +166,18 @@ const classStatus = [
   { value: '11', label: '高二' },
   { value: '12', label: '高三' },
 ]
+const classTimeList = [
+  { label: "90", value: "SINGLE" },
+  { label: "90", value: "MIX" },
+  { label: "45", value: "HIGH" },
+  { label: "45", value: "HIGH_ONLINE" },
+  { label: "90", value: "COMPREHENSIVE" },
+  { label: "25", value: "PRACTICE" },
+  { label: "25", value: "MUSIC_NETWORK" },
+  { label: "180", value: "TRAINING_SINGLE" },
+  { label: "180", value: "TRAINING_MIX" },
+  { label: "40", value: "CLASSROOM" },
+]
 
 export {
   courseType,
@@ -186,5 +198,6 @@ export {
   visitChiose,
   paymentChannelStatus,
   saleStatus,
-  classStatus
+  classStatus,
+  classTimeList
 }

+ 27 - 5
src/views/buildVip/index.vue

@@ -327,7 +327,16 @@
         </el-form-item>
         <el-form-item label="上课时间"
                       prop="startTime">
-          <el-time-select v-model.trim="maskForm.startTime"
+          <el-time-picker v-model.trim="maskForm.startTime"
+                          @change="getStartTime"
+                          format="HH:mm"
+                          value-format="HH:mm"
+                          placeholder="选择时间" />
+        </el-form-item>
+        <el-form-item label="下课时间"
+                      prop="endTime">
+          <el-time-picker v-model.trim="maskForm.endTime"
+                          disabled
                           format="HH:mm"
                           value-format="HH:mm"
                           :picker-options="{
@@ -404,6 +413,8 @@ import axios from "axios";
 import {
   getToken
 } from "@/utils/auth";
+import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
+import dayjs from 'dayjs';
 export default {
   name: "buildVip",
   data () {
@@ -441,7 +452,8 @@ export default {
       maskForm: {
         type: "",
         week: "",
-        startTime: ""
+        startTime: "",
+        endTime: ''
       },
       rightForm: {
         onlineCourse: "",
@@ -546,7 +558,8 @@ export default {
         }]
       },
       id: "",
-      studentList: []
+      studentList: [],
+      courseTimeList: []
     };
   },
   computed: {
@@ -722,9 +735,9 @@ export default {
         }
       }
       // teacherId
-      // 根据课程类型获取活动方案
+
       if (this.leftForm.courseType) {
-        // console.log(this.leftForm.teacher)
+        // 根据课程类型获取活动方案
         vipGroupActivityFind({
           categoryId: this.leftForm.courseType,
           teacherId: this.leftForm.teacher
@@ -734,6 +747,7 @@ export default {
           }
         });
       }
+
     },
     // 选择活动方案
     chioseActive (val) {
@@ -1444,6 +1458,14 @@ export default {
         }
       })
       return res
+    },
+    getStartTime (val) {
+      if (val) {
+        let date = dayjs(new Date()).format('YYYY-MM-DD')
+        this.maskForm.endTime = addTimerFormMinute(date, val, this.leftForm.classTime);
+      } else {
+        this.maskForm.endTime = ''
+      }
     }
   }
   // watch: {

+ 3 - 1
src/views/teamDetail/components/courseList.vue

@@ -256,6 +256,7 @@
                       v-if="courseVisible"
                       prop="timer">
           <el-input type='number'
+                    disabled
                     v-model="maskForm.timer"></el-input>
         </el-form-item>
         <el-form-item label="开始时间"
@@ -425,11 +426,12 @@ import {
 } from "@/api/buildTeam";
 import { permission } from "@/utils/directivePage";
 import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
-// import { courseType } from "@/utils/searchArray";
+import { classTimeList } from "@/utils/searchArray";
 export default {
   name: "tcourseList",
   data () {
     return {
+      classTimeList,
       courseType: [
         { value: "SINGLE", label: "单技课" },
         { value: "MIX", label: "合奏课" },

+ 29 - 17
src/views/teamDetail/components/resetClass.vue

@@ -430,6 +430,7 @@
             <el-input placeholder="时长(分)"
                       type="number"
                       v-model.trim="item.time"
+                      disabled
                       @input="()=>{setItem(item,index)}"
                       style="width:100px!important"></el-input>
             <span>开始时间</span>
@@ -697,6 +698,7 @@ import { queryEmployByOrganId } from "@/api/systemManage";
 import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
 import dayjs from 'dayjs'
 import axios from "axios";
+import { classTimeList } from "@/utils/searchArray";
 import qs from "qs";
 export default {
   name: "tresetClass",
@@ -713,6 +715,7 @@ export default {
       topForm: {
         classType: ""
       },
+      classTimeList,
       tableList: [],
       maxClassList: [],
       activeSingleList: [],
@@ -756,12 +759,7 @@ export default {
         expectStudentNum: [{ required: true, message: "请填写预计招生人数" }]
       },
       weekList: [
-        {
-          week: "",
-          startTime: "",
-          endTime: "",
-          id: new Date().getTime()
-        }
+
       ],
       teacherList: [], // 存储的老师列表
       courseTypeList: [],
@@ -818,7 +816,8 @@ export default {
         subjectId: null
       },
       classGroupIds: null,
-      maxMun: 16
+      maxMun: 16,
+      courseTime: ''
     };
   },
   created () {
@@ -1352,8 +1351,8 @@ export default {
         dayOfWeek: "",
         startClassTime: "",
         endClassTime: "",
-        time: "",
-        id: new Date()
+        time: this.courseTime,
+        id: new Date().getTime()
       });
     },
     // 删除循环周
@@ -1625,14 +1624,27 @@ export default {
     },
     changeCourseType (val) {
       console.log(val)
-      this.weekList = [
-        {
-          week: "",
-          startTime: "",
-          endTime: "",
-          id: new Date().getTime()
-        }
-      ]
+      if (val) {
+        this.classTimeList.forEach(item => {
+          if (item.value == val) {
+            this.courseTime = item.label
+          }
+        })
+        // courseTime
+        this.weekList = [
+          {
+            week: "",
+            startTime: "",
+            endTime: "",
+            time: this.courseTime,
+            id: new Date().getTime()
+          }
+        ]
+      } else {
+        this.courseTime = null
+        this.weekList = []
+      }
+
       // if (val === 'HIGH_ONLINE' || val === 'HIGH' || val === 'MUSIC_NETWORK') {
       //   this.step = '00:05'
       // } else {

+ 2 - 3
src/views/vipClass/vipReset.vue

@@ -553,7 +553,6 @@ export default {
       startTime: "",
       chioseVipList: [],
       organList: [],
-      vipTime: 45
     };
   },
   created () { },
@@ -962,7 +961,7 @@ export default {
     },
     changeStartTime (val) {
       if (val) {
-        this.$set(this.maskForm, 'endTime', addTimerFormMinute(this.maskForm.date, val, this.vipTime))
+        this.$set(this.maskForm, 'endTime', addTimerFormMinute(this.maskForm.date, val, this.courseTime))
       } else {
         this.$set(this.maskForm, 'endTime', '')
       }
@@ -971,7 +970,7 @@ export default {
     changeStartTimes (val, item) {
       if (val) {
         let str = dayjs(new Date()).format('YYYY-MM-DD')
-        this.$set(item, 'endClassTime', addTimerFormMinute(str, val, this.vipTime))
+        this.$set(item, 'endClassTime', addTimerFormMinute(str, val, this.courseTime))
       } else {
         this.$set(item, 'endClassTime', '')
       }