Merge remote-tracking branch 'origin/yuetuan' into 10/23-test

src/views/categroyManager/specialSetup/modals/chargesForm.vue

@@ -81,7 +81,7 @@
                 <el-option  v-for="item in boolOptions"
                             :key="item.label"
                             :label="item.label"
-                            :value="item.value">
+                            :value="String(item.value)">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -189,7 +189,7 @@ import numeral from 'numeral'
 
 const plusNum = (items = [], key) => {
   let money = 0
-  const _items = items.filter(item => !item.isStudentOptional)
+  const _items = items.filter(item => item.isStudentOptional === 'false')
   for (const item of _items) {
     money += parseFloat(parseFloat(item[key] || 0).toFixed(2) || 0)
   }

src/views/resetTeaming/components/resetPayList.vue

@@ -324,12 +324,14 @@
       :title="payFormTitle"
       :visible.sync="userVisible"
       width="800px"
-      
+
     >
       <userPayForm
-      v-if="userVisible"
+        v-if="userVisible"
         @close="userVisible = false"
         @submited="payedSubmited"
+        @changeActive="$listeners.changeActive"
+        :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
         :rowDetail='activeRow'
         :type="payFormType"
         :baseInfo="baseInfo"
@@ -345,6 +347,7 @@
                width='800px'>
       <setStudentFee @chioseStudent='chioseStudent'
                      ref='setStudentFee'
+                     @submited="chioseStudentSubmited"
                      :clearTale="clearStduent"></setStudentFee>
       <div slot="footer"
            class="dialog-footer">
@@ -366,6 +369,9 @@ import dayjs from 'dayjs'
 import QrCode from "@/components/QrCode/index";
 import { vaildStudentUrl } from '@/utils/validate'
 import { addMusicGroupPaymentCalender, getMusicGroupPaymentCalender, resetMusicGroupPaymentCalender, delMusicGroupPaymentCalender } from "@/api/buildTeam";
+import {
+  getOrganizationCourseUnitPriceSettings
+} from '@/api/specialSetting'
 import { musicGroupPaymentCalenderQueryPage, getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd } from '../api'
 import setStudentFee from './studentPayBase'
 import userPayForm from '../modals/user-pay-form'
@@ -393,6 +399,7 @@ export default {
       userVisible: false,
       schoolVisible: false,
       reviewVisible: false,
+      organizationCourseUnitPriceSettings: [],
       searchForm: {
         payUserType: null,
       },
@@ -439,9 +446,13 @@ export default {
   //生命周期 - 挂载完成（可以访问DOM元素）
   async mounted() {
     // 获取分部
-
+    try {
+      const res = await getOrganizationCourseUnitPriceSettings({
+        rows: 9999
+      })
+      this.organizationCourseUnitPriceSettings = res.data.rows
+    } catch (error) {}
     this.init();
-    console.log(this.baseInfo)
   },
   computed: {
     payOrderTypeList() {
@@ -473,7 +484,6 @@ export default {
       this.isNew = true;
       this.activeRow = null
       this.userVisible = true;
-      
     },
     newSchoolPay() {
       this.payFormType = "school";
@@ -514,6 +524,20 @@ export default {
       this.payFormType = row.payUserType==='SCHOOL'?'school':'user'
       this.userVisible = true;
     },
+    async chioseStudentSubmited() {
+      try {
+        await this.$confirm('缴费创建完成, 是否立即排课？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+        if (this.$listeners.changeActive) {
+          this.$listeners.changeActive({
+            name: '5'
+          })
+        }
+      } catch (error) {}
+    },
     detelePay(row) {
       let id = row.id;
       this.$confirm(`确定删除该缴费周期?`, "提示", {
@@ -641,12 +665,14 @@ export default {
     onReSet() {
       this.searchForm = { payUserType: null };
     },
-        async payedSubmited(data) {
+    async payedSubmited(data) {
       try {
         await this.getList();
-        this.chioseStudentVisible = true;
-        if (data) {
-          this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
+        if (!this.isNewGropu) {
+          this.chioseStudentVisible = true;
+          if (data) {
+            this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
+          }
         }
       } catch (error) {}
     },

src/views/resetTeaming/components/studentPayBase.vue

@@ -254,16 +254,19 @@ export default {
           return item.id
         }).join(',')
       }
-      obj.courseFee = this.resetPayForm.momey;
-      if (!obj.courseFee || obj.courseFee < 0) {
-        this.$message.error('请输入正确的金额')
-        return
-      }
+      // obj.courseFee = this.resetPayForm.momey;
+      // if (!obj.courseFee || obj.courseFee < 0) {
+      //   this.$message.error('请输入正确的金额')
+      //   return
+      // }
       resetMusicGroupStudentFee(obj).then(res => {
         if (res.code == 200) {
           this.$message.success('修改成功')
           this.resetPayVisible = false
           this.getList()
+          if (this.$listeners.submited) {
+            this.$listeners.submited()
+          }
         }
       })
     }

src/views/resetTeaming/index.vue

@@ -14,7 +14,7 @@
                      v-if="permission('/resetTeaming/teamBaseInfo')"
                      name="1">
           <teamBaseInfo v-if="activeIndex == 1"
-                        @getBaseInfo="getBaseInfo" 
+                        @getBaseInfo="getBaseInfo"
                         :baseInfo="baseInfo"
                         @getName='getName' />
         </el-tab-pane>
@@ -31,7 +31,11 @@
         <el-tab-pane label="缴费设置"
                      v-if="permission('/resetTeaming/resetPayList')"
                      name="3">
-          <resetPayList :baseInfo="baseInfo" v-if="activeIndex == 3" />
+          <resetPayList
+            :baseInfo="baseInfo"
+            v-if="activeIndex == 3"
+            @changeActive="handleClick"
+          />
         </el-tab-pane>
 
         <el-tab-pane label="班级调整"

src/views/resetTeaming/modals/extra-class.vue

@@ -9,6 +9,8 @@
     >
       <el-table-column
         label="课程类型"
+        prop="courseType"
+        key="courseType"
         width="150">
         <template slot-scope="scope">
           <el-form-item
@@ -21,11 +23,13 @@
               v-model="list.form[scope.$index].courseType"
               placeholder="课程类型"
               clearable
+              @change="$listeners.priceChange(scope.row, scope.$index)"
               :disabled="isDisabled"
             >
               <el-option
                 v-for="(item, index) in courseTypeOptions"
                 :key="index"
+                :disabled="isOptionDisabled(item.value)"
                 :label="item.label"
                 :value="item.value"
               ></el-option>
@@ -36,6 +40,8 @@
       <el-table-column
         label="是否可选"
         v-if="isCommon"
+        prop="isStudentOptional"
+        key="isStudentOptional"
         width="150">
         <template slot-scope="scope">
           <el-form-item
@@ -62,6 +68,8 @@
       </el-table-column>
       <el-table-column
         label="课程时长(分钟)"
+        prop="courseTotalMinuties"
+        key="courseTotalMinuties"
         width="150">
         <template slot-scope="scope">
           <el-form-item
@@ -75,6 +83,7 @@
               v-model="list.form[scope.$index].courseTotalMinuties"
               :controls="false"
               :precision="0"
+              @change="$listeners.priceChange(scope.row, scope.$index)"
               :min="1"
               :disabled="isDisabled"
               placeholder="课程时长"
@@ -84,6 +93,8 @@
       </el-table-column>
       <el-table-column
         label="现价(元)"
+        prop="courseCurrentPrice"
+        key="courseCurrentPrice"
         width="150">
         <template slot-scope="scope">
           <el-form-item
@@ -107,6 +118,8 @@
         </template>
       </el-table-column>
       <el-table-column
+        prop="courseOriginalPrice"
+        key="courseOriginalPrice"
         label="原价(元)">
         <template slot-scope="scope">
           <el-form-item
@@ -117,7 +130,7 @@
               size="small"
               style="width: 90%!important;"
               class="number-input"
-              disabled
+              :disabled="isDisabled"
               v-model="list.form[scope.$index].courseOriginalPrice"
               :controls="false"
               :precision="0"
@@ -129,6 +142,8 @@
       </el-table-column>
       <el-table-column
         v-if="!isCommon"
+        prop="close"
+        key="close"
         width="60">
         <template slot-scope="scope">
           <i v-if="form.length > 1" @click="$listeners.remove(scope.$index)" class="el-icon-circle-close"></i>
@@ -169,9 +184,13 @@ export default {
     change(val) {
       this.$listeners.moneyChange()
     },
+    isOptionDisabled(key) {
+      const selected = this.form.map(item => item.courseType)
+      return selected.includes(key)
+    },
     getOldMoney(index) {
       return numeral(this.list.form[index].courseTotalMinuties * this.list.form[index].unitPrice).format('0,0.00')
-    }
+    },
   },
 }
 </script>

src/views/resetTeaming/modals/user-baseinfo.vue

@@ -54,11 +54,11 @@
     <el-alert
       :closable="false"
       style="margin-left: 160px;width: auto;"
-      v-if="isCommon"
+      v-if="paymentType != 0 && isCommon"
       type="warning">
       <template #title>
         <p>该乐团为3.0模式，若需创建其他模式的收费标准，请先乐团基本信息的乐团模式
-          <strong style="font-weight: 600;margin-left: 10px;cursor: pointer;">立即修改>></strong>
+          <strong style="font-weight: 600;margin-left: 10px;cursor: pointer;" @click="$listeners.changeActive({name: '1'})">立即修改>></strong>
       </p>
       </template>
     </el-alert>

src/views/resetTeaming/modals/user-pay-form.vue

@@ -7,6 +7,7 @@
       :isCommon="isCommon"
       :isUserType="isUserType"
       @getCharges="getCharges"
+      @changeActive="$listeners.changeActive"
       :typeList="typeList"
       :charges="charges"
       :paymentType="paymentType"
@@ -21,10 +22,12 @@
       >
       </el-alert>
       <extraClass
-        :form="eclass"
+        :form.sync="eclass"
         ref="eclass"
+        :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
         @create="addExtraClass"
         @remove="removeExtraClass"
+        @priceChange="priceChange"
         @moneyChange="syncAllMoney"
       />
     </template>
@@ -55,7 +58,7 @@
     <otherform :form="other" ref="other" />
     <div slot="footer" class="dialog-footer">
       <el-button @click="$listeners.close">取 消</el-button>
-      <el-button type="primary" @click="submit">下一步</el-button>
+      <el-button type="primary" @click="submit">{{paymentType == '0' ? '确认' : '下一步'}}</el-button>
     </div>
     <el-dialog
       :title="nextTitle"
@@ -82,6 +85,7 @@ import paymentCycle from "./payment-cycle";
 import extraClass from "./extra-class";
 import classrooms from "./classrooms";
 import otherform from "./other";
+import baseInfoVue from '../../teamDetail/components/baseInfo.vue';
 
 const paymentTypeFormat = {
   0: "MUSIC_APPLY",
@@ -91,7 +95,7 @@ const paymentTypeFormat = {
 };
 
 export default {
-  props: ["type", "musicGroupId", "baseInfo", "paymentType", "rowDetail"],
+  props: ["type", "musicGroupId", "baseInfo", "paymentType", "rowDetail", 'organizationCourseUnitPriceSettings'],
   components: {
     userBaseinfo,
     paymentCycle,
@@ -137,6 +141,13 @@ export default {
       }
       return data;
     },
+    organizationCourseUnitPriceSettingsByType() {
+      const _ = {}
+      for (const item of this.organizationCourseUnitPriceSettings) {
+        _[item.courseType] = item
+      }
+      return _
+    }
   },
   watch: {
     type() {
@@ -149,16 +160,16 @@ export default {
     baseInfo(val) {
       this.getCharges();
     },
-    "form.leixing"() {
+    "form.leixing"(val) {
       this.cycles = [{}];
       this.collapse = [0];
       this.cycle = {};
-      this.cycle.paymentAmount = "";
-      if (this.form.leixing === "1") {
+      this.$set(this.form, "musicGroupOrganizationCourseSettingId", undefined);
+      this.$set(this.cycle, "paymentAmount", undefined);
+      if (val === "1") {
         this.eclass = [];
-      } else if (this.form.leixing === "2") {
+      } else if (val === "2") {
         this.eclass = [{}];
-        this.$set(this.form, "musicGroupOrganizationCourseSettingId", "");
       }
     },
     "form.musicGroupOrganizationCourseSettingId"(val) {
@@ -173,8 +184,7 @@ export default {
   },
   methods: {
     init() {
-      console.log(this.rowDetail);
-       this.getCharges();
+      this.getCharges();
       if (this.rowDetail) {
         this.form.musicGroupOrganizationCourseSettingId = this.rowDetail.musicGroupOrganizationCourseSettingId;
         this.$set(
@@ -185,12 +195,25 @@ export default {
         this.$set(this.other, "memo", this.rowDetail.memo);
       }
     },
+    priceChange(item, index) {
+      const _ = [...this.eclass]
+      const active = this.organizationCourseUnitPriceSettingsByType[item.courseType] || {}
+      const price = Math.ceil((item.courseTotalMinuties || 1) * (active.unitPrice || 1))
+      item.courseCurrentPrice = price
+      item.courseOriginalPrice = price
+      _[index] = item
+      this.eclass = [..._]
+    },
     syncAllMoney() {
       let money = 0;
       for (const item of this.eclass) {
         money += item.courseCurrentPrice;
       }
-      this.$set(this.cycle, "paymentAmount", money);
+      if (!money) {
+        this.$set(this.cycle, "paymentAmount", undefined);
+      } else {
+        this.$set(this.cycle, "paymentAmount", money);
+      }
       if(this.rowDetail){
           this.$set(
         this.cycle,
@@ -200,12 +223,12 @@ export default {
       let arr = [
         this.rowDetail?.paymentValidStartDate,
         this.rowDetail?.paymentValidEndDate,
-      ]; 
+      ];
       // paymentDate startPaymentDate deadlinePaymentDate
       this.$set(this.cycle, "paymentDate", [ this.rowDetail?.startPaymentDate, this.rowDetail?.deadlinePaymentDate]);
       this.$set(this.cycle, "paymentValid", arr);
       }
-    
+
       return money;
     },
     async getChargeTypeList() {
@@ -227,7 +250,7 @@ export default {
         const eclas = this.chargesById[
           this.form.musicGroupOrganizationCourseSettingId
         ];
-        this.eclass = eclas?.details || [];
+        this.eclass = eclas?.details || [{}];
 
         this.syncAllMoney();
       } catch (error) {}
@@ -298,10 +321,10 @@ export default {
           } catch (error) {}
         } else {
            try {
-          data.id = this.rowDetail.id
-          const res = await musicGroupPaymentCalenderDetailBatchUpdate(data);
-          this.$listeners.close();
-          this.$listeners.submited(res.data);
+            data.id = this.rowDetail.id
+            const res = await musicGroupPaymentCalenderDetailBatchUpdate(data);
+            this.$listeners.close();
+            this.$listeners.submited(res.data);
           } catch (error) {}
         }
       }

src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -1,14 +1,15 @@
 <template>
   <div>
-    <el-form-item
+    <!-- <el-form-item
       label="排课次数"
-      prop="courseNum"
+      prop="courseTimes"
     >
-      <el-input v-model="form.courseNum" placeholder="请输入排课次数"/>
-    </el-form-item>
+      <el-input v-model="form.courseTimes" placeholder="请输入排课次数"/>
+    </el-form-item> -->
     <el-form-item
       label="排课起始时间"
-      prop="courseTime"
+      :prop="'classs.' + type + '.courseTime'"
+      :rules="[{ required: true, message: '请选择排课起始时间' }]"
     >
       <el-date-picker v-model.trim="form.courseTime"
         :picker-options="pickerOptions"
@@ -20,10 +21,12 @@
     </el-form-item>
     <el-form-item
       label="跳过节假日"
+      :prop="'classs.' + type + '.holiday'"
+      :rules="[{ required: true, message: '否跳过节假日' }]"
     >
-      <el-radio-group v-model="form.checked">
-        <el-radio :label="3">是</el-radio>
-        <el-radio :label="6">否</el-radio>
+      <el-radio-group v-model="form.holiday">
+        <el-radio :label="true">是</el-radio>
+        <el-radio :label="false">否</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-table
@@ -31,11 +34,15 @@
       :data="form.cycle"
     >
       <el-table-column
-        prop="date"
+        prop="dayOfWeek"
         label="循环周期"
         width="180">
         <template slot-scope="scope">
-          <el-form-item inline-message prop="dayOfWeek">
+          <el-form-item
+            inline-message
+            :rules="[{ required: true, message: '请选择循环周期' }]"
+            :prop="'classs.' + type + '.cycle.' + scope.$index + '.dayOfWeek'"
+          >
             <el-select v-model.trim="scope.row.dayOfWeek"
               style="width:100%!important"
               placeholder="请选择循环周期"
@@ -55,8 +62,10 @@
         label="课程时长(分)"
         width="180">
         <template slot-scope="scope">
-          <el-form-item inline-message>
-            <el-input v-model="scope.row.time" placeholder="请输入课程时长"/>
+          <el-form-item
+            :prop="'classs.' + type + '.cycle.' + scope.$index + '.time'"
+            inline-message>
+            <el-input disabled v-model="scope.row.time" placeholder="请输入课程时长"/>
           </el-form-item>
         </template>
       </el-table-column>
@@ -65,12 +74,16 @@
         label="开始时间"
         width="180">
         <template slot-scope="scope">
-          <el-form-item inline-message>
+          <el-form-item
+            :prop="'classs.' + type + '.cycle.' + scope.$index + '.startClassTime'"
+            :rules="[{ required: true, message: '请选择开始时间' }]"
+            inline-message>
             <el-time-picker style="width: 100%!important;"
               v-model.trim="scope.row.startClassTime"
               format='HH:mm'
               value-format='HH:mm'
               placeholder="请选择时间"
+              @change="val => startTimeChange(val, scope.row)"
               :picker-options="{
                 selectableRange: ['04:30:00 - 23:59:59']
               }">
@@ -83,10 +96,13 @@
         label="结束时间"
         width="180">
         <template slot-scope="scope">
-          <el-form-item inline-message>
+          <el-form-item
+            :prop="'classs.' + type + '.cycle.' + scope.$index + '.endClassTime'"
+            inline-message>
             <el-time-picker style="width: 100%!important;"
               v-model.trim="scope.row.endClassTime"
               format='HH:mm'
+              disabled
               value-format='HH:mm'
               placeholder="请选择时间"
               :picker-options="{
@@ -110,14 +126,29 @@
       type="info"
       size="small"
       plain
+      :disabled="surplustime < classTimeListByType[type]"
       @click="create"
       style="margin-top: 10px;width: 100%;"
     >添加循环</el-button>
   </div>
 </template>
 <script>
+import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
+import { classTimeList } from '@/utils/searchArray'
+import dayjs from 'dayjs'
+
+const classTimeListByType = {}
+for (const item of classTimeList) {
+  classTimeListByType[item.value] = item.label
+}
+
 export default {
-  props: ['form'],
+  props: ['form', 'type', 'surplustime'],
+  data() {
+    return {
+      classTimeListByType,
+    }
+  },
   computed: {
     pickerOptions() {
       return {
@@ -141,10 +172,20 @@ export default {
   },
   methods: {
     create() {
-      this.form.cycle.push({})
+      this.form.cycle.push({
+        time: classTimeListByType[this.type]
+      })
     },
     remove(index) {
       this.form.cycle.splice(index, 1)
+    },
+    startTimeChange(val, item) {
+      if (val) {
+        let str = dayjs(new Date()).format('YYYY-MM-DD')
+        this.$set(item, 'endClassTime', addTimerFormMinute(str, val, item.time))
+      } else {
+        this.$set(item, 'endClassTime', '')
+      }
     }
   },
 }

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -5,10 +5,11 @@
       inline
       ref="form"
       label-suffix=": "
-      label-width="100px"
+      label-width="110px"
     >
       <el-form-item
         label="主教老师"
+        prop="coreTeacher"
         :rules="[{ required: true, message: '请选择主教老师' }]"
       >
         <el-select
@@ -46,14 +47,17 @@
       </el-form-item>
       <el-collapse v-model="collapses" @change="collapseChange">
         <el-collapse-item
-          v-for="(item, index) in courseTypeList"
-          :title="item.label"
+          v-for="(item, key, index) in form.classs"
           :name="index"
-          :key="index"
+          :key="key"
         >
+          <template #title>
+            <p>{{courseTypeListByName[key]}}, 剩余可排课时长{{surplustime[key]}}分钟</p>
+          </template>
           <courseItem
-            :key="index"
-            :form="form.classs[item.value]"
+            :surplustime="surplustime[key]"
+            :type="key"
+            :form="item"
           />
         </el-collapse-item>
       </el-collapse>
@@ -65,10 +69,38 @@
   </div>
 </template>
 <script>
-import { getMusicCourseSettingsWithStudents, classGroupUpdate } from '@/api/buildTeam'
+import { getMusicCourseSettingsWithStudents, classGroupUpdate, revisionClassGroup, revisionAddClassGroup } from '@/api/buildTeam'
 import courseItem from "./classroom-setting-item";
+import { classTimeList } from '@/utils/searchArray'
+
+const classTimeListByType = {}
+for (const item of classTimeList) {
+  classTimeListByType[item.value] = item.label
+}
+
+const formatClassGroupTeacherMapperList = (core, ass) => {
+  const list = []
+  if (core) {
+    list.push({ userId: core, teacherRole: "BISHOP" })
+  }
+  if (ass) {
+    for (const item of ass) {
+      list.push({ userId: item, teacherRole: "TEACHING" })
+    }
+  }
+  return list
+}
+
+const plusNum = (items = [], key) => {
+  let money = 0
+  for (const item of items) {
+    money += parseFloat(parseFloat(item[key] || 0).toFixed(2) || 0)
+  }
+  return money
+}
+
 export default {
-  props: ["teacherList", "activeType", "courseTypeList", 'cooperationList', 'musicGroupId', 'detail', 'studentSubmitedData'],
+  props: ["teacherList", "activeType", "courseTypeList", 'cooperationList', 'musicGroupId', 'detail', 'studentSubmitedData', 'classType'],
   components: {
     courseItem,
   },
@@ -80,58 +112,105 @@ export default {
         classs: {}
       },
       collapses: [0],
-      courseTimes: {}
+      courseTimes: {},
+      courseTypeListByName: {},
+      classTimeListByType
     };
   },
-  created() {
-    const classs = {}
-    for (const item of this.courseTypeList) {
-      classs[item.value] = {
-        cycle: [{}]
+  watch: {
+    courseTypeList() {
+      this.setCourseTypeListByName()
+    },
+    studentSubmitedData() {
+      this.formatClasss()
+    },
+    detail() {
+      this.formatClasss()
+    }
+  },
+  computed: {
+    surplustime() {
+      const _ = {}
+      for (const key in this.form.classs) {
+        if (this.form.classs.hasOwnProperty(key)) {
+          const item = this.form.classs[key];
+          _[key] = item.courseTotalMinuties - plusNum(item.cycle, 'time')
+        }
       }
+      return _
     }
-    this.form.classs = classs
   },
   async mounted() {
-    try {
-      const studentIds = this.detail ? this.detail.subjectIdList : this.studentSubmitedData.seleched.join(',')
-      const res = await getMusicCourseSettingsWithStudents({
-        musicGroupId: this.musicGroupId,
-        studentIds: studentIds
-      })
-      const classs = {}
-      const courseTimes = {}
-      for (const item of res.data) {
-        courseTimes[item.courseType] = item
+    this.setCourseTypeListByName()
+    this.formatClasss()
+  },
+  methods: {
+    setCourseTypeListByName() {
+      const courseTypeListByName = {}
+      for (const item of this.courseTypeList) {
+        courseTypeListByName[item.value] = item.label
       }
-      for (const key in this.form.classs) {
-        if (this.form.classs.hasOwnProperty(key)) {
-          const item = this.form.classs[key]
+      this.courseTypeListByName = courseTypeListByName
+    },
+    async formatClasss() {
+      try {
+        const res = await getMusicCourseSettingsWithStudents({
+          musicGroupId: this.musicGroupId,
+          studentIds: (this.detail ? undefined : this.studentSubmitedData?.seleched.join(',')),
+          classGroupId: this.detail?.id
+        })
+        const classs = {}
+        const courseTimes = {}
+        for (const item of res.data) {
+          courseTimes[item.courseType] = item
+        }
+        for (const item of this.courseTypeList) {
+          const key = item.value
           if (courseTimes[key]) {
-            classs[key] = item
+            classs[key] = {
+              courseTotalMinuties: courseTimes[key].courseTotalMinuties,
+              cycle: [{
+                time: classTimeListByType[key]
+              }]
+            }
           }
         }
+        this.$set(this.form, 'classs', classs)
+        // this.courseTimes = courseTimes
+      } catch (error) {
+        console.log(error)
       }
-      console.log(classs)
-      this.$set(this.form, 'classs', classs)
-      this.courseTimes = courseTimes
-    } catch (error) {}
-  },
-  methods: {
+    },
     submit() {
+      for (const key in this.surplustime) {
+        if (this.surplustime.hasOwnProperty(key)) {
+          const item = this.surplustime[key];
+          if (item > 0) {
+            this.$message.error(`${this.courseTypeListByName[key]}，还剩余${item}分钟剩余可排时长`)
+            return
+          }
+        }
+      }
       this.$refs.form.validate(async valid => {
         if (valid) {
-          console.log({...this.form})
           const list = []
           for (const key in this.form.classs) {
             if (this.form.classs.hasOwnProperty(key)) {
               const item = this.form.classs[key];
               list.push({
                 type: key,
+                courseType: key,
+                classGroupName: (this.studentSubmitedData?.name || this.detail?.classGroupName),
                 classGroupId: this.detail?.id,
+                musicGroupId: this.musicGroupId,
                 startDate: item.courseTime,
-                coreTeacher: this.form.coreTeacher,
-                assistant: this.form.assistant,
+                classGroupTeacherMapperList: formatClassGroupTeacherMapperList(
+                  this.form.coreTeacher,
+                  this.form.assistant
+                ),
+                holiday: item.holiday,
+                students: this.studentSubmitedData.seleched,
+                courseTimes: item.cycle.length,
                 courseTimeDtoList: item.cycle.map(_ => ({
                   courseType: key,
                   dayOfWeek: _.dayOfWeek,
@@ -142,9 +221,23 @@ export default {
             }
           }
           try {
-            await classGroupUpdate(list)
-            tthis.$message.success('排课成功')
-          } catch (error) {}
+            if (this.detail) {
+              await classGroupUpdate(list)
+              this.$message.success('排课修改成功')
+            } else {
+              if (this.classType === 1) {
+                await revisionClassGroup(list)
+                this.$message.success('排课成功')
+              } else if (this.classType === 2 || this.classType === 3) {
+                await revisionAddClassGroup(list)
+                this.$message.success('排课成功')
+              }
+            }
+            this.$listeners.submited()
+            this.$listeners.close()
+          } catch (error) {
+            console.log(error)
+          }
         }
       })
     },

src/views/teamDetail/components/resetClass.vue

@@ -86,14 +86,14 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
-                           width="400px"
+                           width="200px"
                            label="操作">
             <template slot-scope="scope">
               <div>
                 <!-- v-if="scope.row.type !='MIX'" -->
-                <!-- <el-button type="text"
+                <el-button type="text"
                            @click="resetClass(scope.row)"
-                           v-if="scope.row.type != 'MUSIC_NETWORK'">学员调整</el-button> -->
+                           v-if="scope.row.type != 'MUSIC_NETWORK'">学员调整</el-button>
                 <el-button type="text"
                            @click="classAdjustment(scope.row)">班级调整</el-button>
                 <!--<el-button type="text"
@@ -155,6 +155,7 @@
       title="学员选择"
       width="750px"
       :visible.sync="studentVisible"
+      destroy-on-close
     >
       <selectStudent
         :studentList="studentList"
@@ -299,8 +300,10 @@
       width="950px"
       :visible.sync="infoVisible"
       :modal-append-to-body="false"
+      destroy-on-close
     >
       <classroomSetting
+        :classType="classType"
         :teacherList="teacherList"
         :musicGroupId="teamid"
         :activeType="activeType"
@@ -309,6 +312,7 @@
         :detail="infoDetail"
         :studentSubmitedData="studentSubmitedData"
         @close="infoVisible = false"
+        @submited="getList"
       />
     </el-dialog>
     <!-- <el-dialog title="班级设置"
@@ -710,6 +714,7 @@
     <el-dialog
       title="学员列表"
       :visible.sync="studentListModalVisible"
+      destroy-on-close
     >
       <viewStudentList
         :list="studentListModal"
@@ -764,6 +769,7 @@ export default {
   },
   data () {
     return {
+      classType: 0,
       pickerOptions: {
         firstDayOfWeek: 1,
         disabledDate (time) {
@@ -998,6 +1004,7 @@ export default {
     },
     // 临时调整
     temporary () {
+      this.classType = 1;
       this.activeClass = "";
       this.activeListStudent = [];
       this.studentList = [];
@@ -1062,6 +1069,7 @@ export default {
     },
     // 新增班级
     addNewClass (type) {
+      this.classType = (type === 'NORMAL' ? 2 : 3)
       /**
        *      { value: 'NORMAL', label: '单技班' },
         { value: 'MIX', label: '合奏班' },
@@ -1756,7 +1764,8 @@ export default {
           sound: "",
           expectStudentNum: ""
         };
-        this.$refs["teacherForm"].resetFields();
+        this.infoDetail = null
+        // this.$refs["teacherForm"].resetFields();
         this.weekList = [];
       }
     },