01/06

1

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

@@ -5,7 +5,7 @@
     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"  
+      <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>
@@ -15,7 +15,7 @@
     <classPayListItem
       :payInfo="payInfo"
       ref="base"
-      :courseTypesByType="courseTypesByType" 
+      :courseTypesByType="courseTypesByType"
       v-for="(item, index) in form.classList"
       :key="index"
       :item="item"
@@ -37,11 +37,9 @@
       ref="classSetting"
         :musicGroupPaymentCalenderDtos="musicGroupPaymentCalenderDtos"
         :classType="5"
-        :teacherList="selects.teachers"
         :musicGroupId="teamid"
         :activeType="activeType"
         :courseTypeList="courseTypeList"
-        :cooperationList="selects.teachers"
         :studentSubmitedData="studentSubmitedData"
         :classIdList="classIdList"
         :classGroupStudents="classGroupStudents"
@@ -55,7 +53,7 @@
         <el-button @click="showLastVisable = false">上一步</el-button>
         <el-button type="primary" @click="submitResetClass">确 定</el-button>
       </div>
-          
+
     </el-dialog>
   </div>
 </template>
@@ -97,25 +95,25 @@ export default {
     // 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
-        
+
           try{
            const res = await getOrganCourseDurationSettings({organId:this.organId})
            this.organCourseTime = res.data;
-             
+
            this.setTimeList(res.data)
-           
+
           }catch{}
         })
   },
   methods: {
     init(){
-       this.$store.dispatch('setTeachers')
+      //  this.$store.dispatch('setTeachers')
       this.studentList = []
       let classGroupStudents = []
       this.form.classList.forEach(classes=>{
@@ -129,7 +127,7 @@ export default {
       this.classGroupStudents = classGroupStudents
       this.teamid = this.$route.query.id
       this.activeType = this.form.classList[0].type
-      this.courseTypeList = getCourseType(this.activeType) 
+      this.courseTypeList = getCourseType(this.activeType)
       this.studentSubmitedData = {
         name:'',
         seleched:this.studentList.map(stu=> {return stu.userId})
@@ -159,7 +157,7 @@ export default {
        this.$refs.courseTimeForms.validate(_=>{
         if(_){
       const forms = this.getForms();
-      
+
       let musicGroupPaymentCalenderDtos = []
       // 判断有没有缴费项目(因为又可能没有)
       // let flag = false
@@ -176,14 +174,14 @@ export default {
       if(arr.length>0){
         return
       }
-     
+
            this.musicGroupPaymentCalenderDtos = musicGroupPaymentCalenderDtos
       this.init()
         }
       })
       // 弹出最后一页
-     
-           
+
+
     },
     submitResetClass(){
       this.$refs.classSetting.submit()
@@ -196,7 +194,7 @@ export default {
          arr =organCourseTime[course].split(',')
       }else {
         arr = [classTime[course]]
-      } 
+      }
         this.courseTimeForm.timeList.push({type:course,value:'',label:courseType[course],list:arr})
       })
     },
@@ -211,7 +209,7 @@ export default {
         }
       }
       this.payInfo = obj;
-    
+
     }
   },
 
@@ -228,4 +226,4 @@ export default {
   text-align: right;
 }
 
-</style>
+</style>

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

@@ -21,7 +21,7 @@
         label-width="88px"
         :rules="[{ required: true, message: '请选择主教老师' }]"
       >
-        <el-select
+        <!-- <el-select
           v-model.trim="form.coreTeacher"
           placeholder="请选择主教老师"
           clearable
@@ -34,10 +34,12 @@
             :label="item.realName"
             :value="String(item.id)"
           ></el-option>
-        </el-select>
+        </el-select> -->
+         <remote-search :commit="'setTeachers'" v-model="form.coreTeacher"  />
       </el-form-item>
       <el-form-item label="助教老师" prop="assistant">
-        <el-select
+         <remote-search :commit="'setTeachers'" v-model="form.assistant"  :multiple='true'/>
+        <!-- <el-select
           v-model.trim="form.assistant"
           placeholder="请选择助教老师"
           filterable
@@ -50,7 +52,7 @@
             :label="item.realName"
             :value="item.id"
           ></el-option>
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-alert
         v-if="isEmpty"
@@ -131,10 +133,8 @@ const plusNum = (items = [], key) => {
 
 export default {
   props: [
-    "teacherList",
     "activeType",
     "courseTypeList",
-    "cooperationList",
     "musicGroupId",
     "detail",
     "studentSubmitedData",
@@ -214,7 +214,7 @@ export default {
       this.courseTypeListByName = courseTypeListByName;
     },
     async formatClasss() {
-     
+
       if (this.detail) {
         let coreid = "";
         const assistant = [];
@@ -242,7 +242,7 @@ export default {
       if (this.classType == 5) {
         // res = await findClassCourseMinute(this.classIdList);
         res.data = this.classCouresTimeList;
-        
+
       } else {
         try {
           res = await getMusicCourseSettingsWithStudents({
@@ -274,7 +274,7 @@ export default {
         }
         this.$set(this.form, "classs", classs);
         // this.courseTimes = courseTimes
-      
+
     },
     submit() {
       this.$refs.form.validate(async (valid) => {