Merge branch 'ol_12_30' into online

src/views/teamDetail/components/modals/class-pay-list.vue

@@ -1,16 +1,36 @@
 <template>
   <div>
-     <el-alert
-    title="课程时长设置"
-    type="info" :closable='false'>
-  </el-alert>
-    <el-form :model='courseTimeForm' ref='courseTimeForms' :inline='true' style="margin-top:20px;">
-      <el-form-item v-for="(item,index) in courseTimeForm.timeList" :key="index" :label="item.label"
-       :prop="'timeList.' + index + '.value'" :rules="[{required: true, message: '请选择课程时长', trigger: 'blur'}]" label-width="100px">
-        <el-select clearable v-model="item.value" placeholder="请选择课程时长" @change="(val)=>setCourseTime(item,val)">
-          <el-option v-for="(time,index) in item.list" :key='index' :value='time' :label="time"></el-option>
+    <el-alert title="课程时长设置" type="info" :closable="false"> </el-alert>
+    <el-form
+      :model="courseTimeForm"
+      ref="courseTimeForms"
+      :inline="true"
+      style="margin-top: 20px"
+    >
+      <el-form-item
+        v-for="(item, index) in courseTimeForm.timeList"
+        :key="index"
+        :label="item.label"
+        :prop="'timeList.' + index + '.value'"
+        :rules="[
+          { required: true, message: '请选择课程时长', trigger: 'blur' },
+        ]"
+        label-width="100px"
+      >
+        <el-select
+          clearable
+          v-model="item.value"
+          placeholder="请选择课程时长"
+          @change="(val) => setCourseTime(item, val)"
+        >
+          <el-option
+            v-for="(time, index) in item.list"
+            :key="index"
+            :value="time"
+            :label="time"
+          ></el-option>
         </el-select>
-       </el-form-item>
+      </el-form-item>
     </el-form>
     <classPayListItem
       :payInfo="payInfo"
@@ -26,15 +46,15 @@
       <el-button type="primary" @click="gotoLast">下一步</el-button>
     </div>
     <div style="clear: both"></div>
-        <el-dialog
+    <el-dialog
       :visible.sync="showLastVisable"
       title="合并结果确认"
       append-to-body
       width="800px"
     >
       <classSetting
-      :form='form'
-      ref="classSetting"
+        :form="form"
+        ref="classSetting"
         :musicGroupPaymentCalenderDtos="musicGroupPaymentCalenderDtos"
         :classType="5"
         :musicGroupId="teamid"
@@ -43,105 +63,116 @@
         :studentSubmitedData="studentSubmitedData"
         :classIdList="classIdList"
         :classGroupStudents="classGroupStudents"
-        :selectPrices='classCourseMinuteMap'
-        :classCouresTimeList ="classCouresTimeList "
+        :selectPrices="classCourseMinuteMap"
+        :classCouresTimeList="classCouresTimeList"
+        :teacherList="teacherList"
+        :cooperationList="teacherList"
         @close="showLastVisable = false"
         v-if="showLastVisable"
-
       />
-        <div slot="footer" class="dialog-footer" >
+      <div slot="footer" class="dialog-footer">
         <el-button @click="showLastVisable = false">上一步</el-button>
         <el-button type="primary" @click="submitResetClass">确 定</el-button>
       </div>
-
     </el-dialog>
   </div>
 </template>
 <script>
 import classNewInfo from "./class-new-info";
-import classPayListItem from './class-pay-list-item'
-import classSetting from './classroom-setting'
-import  {getCourseType} from "@/utils/utils"
-import {courseType,classTime} from '@/constant'
-import { getOrganCourseDurationSettings} from '@/api/buildTeam'
-import MusicStore from '@/views/resetTeaming/store'
+import classPayListItem from "./class-pay-list-item";
+import classSetting from "./classroom-setting";
+import { getCourseType } from "@/utils/utils";
+import { courseType, classTime } from "@/constant";
+import { getOrganCourseDurationSettings } from "@/api/buildTeam";
+import MusicStore from "@/views/resetTeaming/store";
 export default {
-  props: ["form", "payInfo", "courseTypesByType","classIdList","addCourseType",'classMaxCourseNumMap'],
+  props: [
+    "form",
+    "payInfo",
+    "courseTypesByType",
+    "classIdList",
+    "addCourseType",
+    "classMaxCourseNumMap",
+    "teacherList",
+  ],
   components: {
     classNewInfo,
     classPayListItem,
-    classSetting
+    classSetting,
   },
   data() {
     return {
-      showLastVisable:false,
-      musicGroupPaymentCalenderDtos:null,
-      teacherList:[],
-      studentList:[],
-      teamid:'',
-      activeType:'',
-      courseTypeList:[],
-      studentSubmitedData:{},
-      classGroupStudents:[],
-      courseTimeForm:{
-        timeList:[]
+      showLastVisable: false,
+      musicGroupPaymentCalenderDtos: null,
+      teacherList: [],
+      studentList: [],
+      teamid: "",
+      activeType: "",
+      courseTypeList: [],
+      studentSubmitedData: {},
+      classGroupStudents: [],
+      courseTimeForm: {
+        timeList: [],
       },
-      organId:'',
-      organCourseTime:{},
-      classCourseMinuteMap:{}
+      organId: "",
+      organCourseTime: {},
+      classCourseMinuteMap: {},
     };
   },
-  async mounted(){
+  async mounted() {
     // 1.查询该分部下得所有课程时长
     // 2.组成select需要得选项并且指定
 
+    this.teamid = this.$route.query.id;
+    MusicStore.dispatch("getBaseInfo", {
+      data: { musicGroupId: this.teamid },
+    }).then(async (res) => {
+      this.organId = res.data.musicGroup.organId;
 
-         this.teamid = this.$route.query.id;
-        MusicStore.dispatch('getBaseInfo', {
-          data: { musicGroupId: this.teamid }
-        }).then(async (res) => {
-          this.organId =res.data.musicGroup.organId
-
-          try{
-           const res = await getOrganCourseDurationSettings({organId:this.organId})
-           this.organCourseTime = res.data;
-
-           this.setTimeList(res.data)
+      try {
+        const res = await getOrganCourseDurationSettings({
+          organId: this.organId,
+        });
+        this.organCourseTime = res.data;
 
-          }catch{}
-        })
+        this.setTimeList(res.data);
+      } catch {}
+    });
   },
   methods: {
-    init(){
+    init() {
       //  this.$store.dispatch('setTeachers')
-      this.studentList = []
-      let classGroupStudents = []
-      this.form.classList.forEach(classes=>{
-          this.studentList = this.studentList.concat(classes.studentList)
-          let arr = []
-          classes.studentList.forEach(stu=>{
-            arr.push(stu.userId)
-          })
-          classGroupStudents.push({[classes.classId]:arr.join(',')})
-      })
-      this.classGroupStudents = classGroupStudents
-      this.teamid = this.$route.query.id
-      this.activeType = this.form.classList[0].type
-      this.courseTypeList = getCourseType(this.activeType)
+      this.studentList = [];
+      let classGroupStudents = [];
+      this.form.classList.forEach((classes) => {
+        this.studentList = this.studentList.concat(classes.studentList);
+        let arr = [];
+        classes.studentList.forEach((stu) => {
+          arr.push(stu.userId);
+        });
+        classGroupStudents.push({ [classes.classId]: arr.join(",") });
+      });
+      this.classGroupStudents = classGroupStudents;
+      this.teamid = this.$route.query.id;
+      this.activeType = this.form.classList[0].type;
+      this.courseTypeList = getCourseType(this.activeType);
       this.studentSubmitedData = {
-        name:'',
-        seleched:this.studentList.map(stu=> {return stu.userId})
+        name: "",
+        seleched: this.studentList.map((stu) => {
+          return stu.userId;
+        }),
+      };
+      this.courseTimeForm.timeList.map((item) => {
+        this.classCourseMinuteMap[item.type] = item.value;
+      });
+      // this.classMaxCourseNumMap;
+      this.classCouresTimeList = {};
+      for (let key in this.classCourseMinuteMap) {
+        this.classCouresTimeList[key] =
+          this.classMaxCourseNumMap[key] * this.classCourseMinuteMap[key];
       }
-    this.courseTimeForm.timeList.map(item=>{
-     this.classCourseMinuteMap[item.type]=item.value
-    })
-    // this.classMaxCourseNumMap;
-    this.classCouresTimeList ={}
-    for(let key in this.classCourseMinuteMap){
-      this.classCouresTimeList[key] =  this.classMaxCourseNumMap[key]*this.classCourseMinuteMap[key]
-    }
 
-    this.showLastVisable = true
+      this.showLastVisable = true;
     },
     close() {
       this.$emit("close");
@@ -154,65 +185,74 @@ export default {
         .map((item) => item.$refs.form || item);
     },
     gotoLast() {
-       this.$refs.courseTimeForms.validate(_=>{
-        if(_){
-      const forms = this.getForms();
+      this.$refs.courseTimeForms.validate((_) => {
+        if (_) {
+          const forms = this.getForms();
 
-      let musicGroupPaymentCalenderDtos = []
-      // 判断有没有缴费项目(因为又可能没有)
-      // let flag = false
-      let arr = []
-      for (const form of forms) {
-         let data =  form.getData()
-        if(data=='error'){
-          arr.push(data)
-        }
-        if(data&&data!='error'){
-          musicGroupPaymentCalenderDtos.push(data)
-        }
-      }
-      if(arr.length>0){
-        return
-      }
+          let musicGroupPaymentCalenderDtos = [];
+          // 判断有没有缴费项目(因为又可能没有)
+          // let flag = false
+          let arr = [];
+          for (const form of forms) {
+            let data = form.getData();
+            if (data == "error") {
+              arr.push(data);
+            }
+            if (data && data != "error") {
+              musicGroupPaymentCalenderDtos.push(data);
+            }
+          }
+          if (arr.length > 0) {
+            return;
+          }
 
-           this.musicGroupPaymentCalenderDtos = musicGroupPaymentCalenderDtos
-      this.init()
+          this.musicGroupPaymentCalenderDtos = musicGroupPaymentCalenderDtos;
+          this.init();
         }
-      })
+      });
       // 弹出最后一页
-
-
     },
-    submitResetClass(){
-      this.$refs.classSetting.submit()
+    submitResetClass() {
+      this.$refs.classSetting.submit();
     },
-    setTimeList(organCourseTime){
-
-      this.addCourseType.map(course=>{
-        let arr = []
-      if(organCourseTime[course]){
-         arr =organCourseTime[course].split(',')
-      }else {
-        arr = [classTime[course]]
-      }
-        this.courseTimeForm.timeList.push({type:course,value:'',label:courseType[course],list:arr})
-      })
+    setTimeList(organCourseTime) {
+      this.addCourseType.map((course) => {
+        let arr = [];
+        if (organCourseTime[course]) {
+          arr = organCourseTime[course].split(",");
+        } else {
+          arr = [classTime[course]];
+        }
+        this.courseTimeForm.timeList.push({
+          type: course,
+          value: "",
+          label: courseType[course],
+          list: arr,
+        });
+      });
     },
-    setCourseTime(item,val){
-      console.log(this.payInfo)
-      let obj = {...this.payInfo}
-      for(let k in obj){
-        if( obj[k][item.type]){
-         let courseCurrentPrice =val?val* obj[[k]][item.type].unitPrice:0
-         let courseTotalMinuties = val?val*obj[[k]][item.type].courseTotalNum:0
-           this.$emit('resetPayInfo',item.type,courseCurrentPrice,courseTotalMinuties)
+    setCourseTime(item, val) {
+      console.log(this.payInfo);
+      let obj = { ...this.payInfo };
+      for (let k in obj) {
+        if (obj[k][item.type]) {
+          let courseCurrentPrice = val
+            ? val * obj[[k]][item.type].unitPrice
+            : 0;
+          let courseTotalMinuties = val
+            ? val * obj[[k]][item.type].courseTotalNum
+            : 0;
+          this.$emit(
+            "resetPayInfo",
+            item.type,
+            courseCurrentPrice,
+            courseTotalMinuties
+          );
         }
       }
       this.payInfo = obj;
-
-    }
+    },
   },
-
 };
 </script>
 <style lang="scss" scoped>
@@ -225,5 +265,4 @@ export default {
 .dialog-footer {
   text-align: right;
 }
-
 </style>

src/views/teamDetail/components/modals/classList-group.vue

@@ -30,10 +30,11 @@
     >
       <classPayList
         :classIdList="classIdList"
-        :addCourseType='addCourseType'
+        :addCourseType="addCourseType"
         :courseTypesByType="courseTypesByType"
         :classMaxCourseNumMap="classMaxCourseNumMap"
         :form="form"
+        :teacherList="teacherList"
         :payInfo.sync="payInfo"
         @resetPayInfo="resetPayInfo"
         @close="showSecondVisable = false"
@@ -47,7 +48,7 @@ import classListItem from "./classList-item";
 import classPayList from "./class-pay-list";
 import { getDefaultPaymentCalender } from "@/api/buildTeam";
 export default {
-  props: ["classList", "courseTypesByType"],
+  props: ["classList", "courseTypesByType", "teacherList"],
   components: { classListItem, classPayList },
   data() {
     return {
@@ -66,7 +67,7 @@ export default {
       showSecondVisable: false,
       classIdList: [],
       activeClassList: [],
-      addCourseType:[]
+      addCourseType: [],
     };
   },
   mounted() {
@@ -105,8 +106,8 @@ export default {
           try {
             let result = await getDefaultPaymentCalender(this.classIdList);
             this.payInfo = result.data.defaultPaymentCalender;
-            this.addCourseType = result.data.groupTypeSet
-            this.classMaxCourseNumMap = result.data.classMaxCourseNumMap
+            this.addCourseType = result.data.groupTypeSet;
+            this.classMaxCourseNumMap = result.data.classMaxCourseNumMap;
             this.showSecondVisable = true;
           } catch {}
         }
@@ -129,7 +130,7 @@ export default {
         });
         this.form.classList.forEach((classes) => {
           if (classes.classId == id) {
-            classes.type = item.type
+            classes.type = item.type;
           }
         });
 
@@ -154,24 +155,19 @@ export default {
         };
       });
     },
-    resetPayInfo(key,value,time){
-       console.log(value,time)
-       console.log(this.payInfo)
-       let obj = {...this.payInfo}
-      for(let k in obj){
-
-        if( obj[k][key]){
-
-         obj[k][key].courseCurrentPrice=value
-         obj[k][key].courseOriginalPrice=value
-        obj[k][key].courseTotalMinuties= parseInt(time)
+    resetPayInfo(key, value, time) {
+      console.log(value, time);
+      console.log(this.payInfo);
+      let obj = { ...this.payInfo };
+      for (let k in obj) {
+        if (obj[k][key]) {
+          obj[k][key].courseCurrentPrice = value;
+          obj[k][key].courseOriginalPrice = value;
+          obj[k][key].courseTotalMinuties = parseInt(time);
         }
       }
-      this.payInfo = obj
-
-
-    }
-
+      this.payInfo = obj;
+    },
   },
 };
 </script>

src/views/teamDetail/components/modals/student-reset-view.vue

@@ -6,7 +6,7 @@
               class="alert"
               show-icon>
     </el-alert>
-    <classListGroup :classList="classList" ref='classListGroup' :courseTypesByType='courseTypesByType'/>
+    <classListGroup :classList="classList" ref='classListGroup' :courseTypesByType='courseTypesByType' :teacherList='teacherList'/>
      <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
       <el-button  type="primary" @click="gotoSecond">下一步</el-button>
@@ -17,7 +17,7 @@
 <script>
 import classListGroup from './classList-group'
 export default {
-  props: ['classList','courseTypesByType'],
+  props: ['classList','courseTypesByType','teacherList'],
   components: {
     classListGroup
   },
@@ -41,6 +41,6 @@ export default {
 }
 .dialog-footer {
   float: right;
-  
+
 }
-</style>
+</style>

src/views/teamDetail/components/resetClass.vue

@@ -491,6 +491,7 @@
       :visible.sync="studentResetVisiable"
     >
       <studentResetView
+        :teacherList="teacherList"
         :courseTypesByType="courseTypesByType"
         v-if="studentResetVisiable"
         :classList="mergeList"