Merge branch 'tmp_meeting_needs' into online

src/api/teacher.js

@@ -420,7 +420,7 @@ const visitGetInfo = (data) => {
   })
 }
 
-// 教务老师
+// 乐团主管
 const findEducationUsers = (data) => {
   return axios({
     url: '/api-teacher/teacher/findEducationUsers',

src/views/teacher/VIP00Apply.vue

@@ -6,7 +6,7 @@
 			<!-- <van-field v-model="form.name" label="课程班名称" input-align="right" size="large" placeholder="请输入班级名称" /> -->
 			<van-field v-model="formName.subjectListName" @click="onGetSheetList('subjectList')" label="科目名称" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
 			<van-field v-model="formName.vipGroupCategoryName" @click="onGetSheetList('vipGroupCategory')" label="课程形式" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
-			<van-field v-model="formName.educationalTeacherName" @click="onGetSheetList('teacherList')" label="教务老师" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
+			<van-field v-model="formName.educationalTeacherName" @click="onGetSheetList('teacherList')" label="乐团主管" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
 			<van-cell title="上课学生" @click="onCheckStudent" :readonly="true" input-align="right" :is-link="checkboxSelectDataList.length > 0 ? false : true" size="large" :value="checkboxSelectDataList.length > 0 ? '重新选择' : '请选择'" :value-class="checkboxSelectDataList.length > 0 ? 'studentColor' : null" />
 			<div v-if="checkboxSelectDataList.length > 0" style="text-align: center;line-height: 1.8; padding: .05rem 0;background: #fafbff;">
 				<p style="color: #323233;" v-for="(item, index) in checkboxSelectDataList" :key="index">
@@ -277,7 +277,7 @@
 					teacherSchoolName: null, // 线下课地址
 					teacherSchoolIndex: 0, // 线下课地址
 					giveTeachModeName: null, // 赠课类型
-					educationalTeacherName: null, // 教务老师
+					educationalTeacherName: null, // 乐团主管
 					educationalTeacherIndex: 0,
 				},
 				other: {
@@ -426,7 +426,7 @@
 							sheetForm.loading = false
 						}
 					})
-				} else if (sheetForm.currentType == 'teacherList') { // 教务老师
+				} else if (sheetForm.currentType == 'teacherList') { // 乐团主管
 					findEducationUsers().then(res => {
 						let result = res.data
 						if (result.code == 200 && result.data.length > 0) {
@@ -440,7 +440,7 @@
 							sheetForm.columns = tempArr
 							sheetForm.loading = false
 						} else {
-							this.$toast('暂无教务老师')
+							this.$toast('暂无乐团主管')
 							sheetForm.loading = false
 						}
 					})
@@ -529,7 +529,7 @@
 					form.teacherSchoolId = value.value
 					formName.teacherSchoolName = value.text
 					formName.teacherSchoolIndex = index
-				} else if (sheetForm.currentType == 'teacherList') { // 教务老师
+				} else if (sheetForm.currentType == 'teacherList') { // 乐团主管
 					form.educationalTeacherId = value.value
 					formName.educationalTeacherName = value.text
 					formName.educationalTeacherIndex = index
@@ -984,7 +984,7 @@
 					return false
 				}
 				if (!form.educationalTeacherId) {
-					this.$toast('请选择教务老师')
+					this.$toast('请选择乐团主管')
 					return
 				}
 				if(this.checkboxSelectIds.length <= 0) {

src/views/teacher/VIP11Apply.vue

@@ -6,7 +6,7 @@
 			<!-- <van-field v-model="form.name" label="课程班名称" input-align="right" size="large" placeholder="请输入班级名称" /> -->
 			<van-field v-model="formName.subjectListName" @click="onGetSheetList('subjectList')" label="科目名称" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
 			<van-field v-model="formName.vipGroupCategoryName" @click="onGetSheetList('vipGroupCategory')" label="课程形式" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
-			<van-field v-model="formName.educationalTeacherName" @click="onGetSheetList('teacherList')" label="教务老师" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
+			<van-field v-model="formName.educationalTeacherName" @click="onGetSheetList('teacherList')" label="乐团主管" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
 			<van-field v-model="formName.vipGroupActivityName" @click="onGetSheetList('vipGroupActivity')" label="活动方案" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
 			<van-cell title="上课学生" @click="onCheckStudent" :readonly="true" input-align="right" :is-link="checkboxSelectDataList.length > 0 ? false : true" size="large" :value="checkboxSelectDataList.length > 0 ? '重新选择' : '请选择'" :value-class="checkboxSelectDataList.length > 0 ? 'studentColor' : null" />
 			<div v-if="checkboxSelectDataList.length > 0" style="text-align: center;line-height: 1.8; padding: .05rem 0;background: #fafbff;">
@@ -277,7 +277,7 @@
 					teacherSchoolName: null, // 线下课地址
 					teacherSchoolIndex: 0, // 线下课地址
 					giveTeachModeName: null, // 赠课类型
-					educationalTeacherName: null, // 教务老师
+					educationalTeacherName: null, // 乐团主管
 					educationalTeacherIndex: 0,
 				},
 				other: {
@@ -425,7 +425,7 @@
 							sheetForm.loading = false
 						}
 					})
-				} else if (sheetForm.currentType == 'teacherList') { // 教务老师
+				} else if (sheetForm.currentType == 'teacherList') { // 乐团主管
 					findEducationUsers().then(res => {
 						let result = res.data
 						if (result.code == 200 && result.data.length > 0) {
@@ -439,7 +439,7 @@
 							sheetForm.columns = tempArr
 							sheetForm.loading = false
 						} else {
-							this.$toast('暂无教务老师')
+							this.$toast('暂无乐团主管')
 							sheetForm.loading = false
 						}
 					})
@@ -528,7 +528,7 @@
 					form.teacherSchoolId = value.value
 					formName.teacherSchoolName = value.text
 					formName.teacherSchoolIndex = index
-				} else if (sheetForm.currentType == 'teacherList') { // 教务老师
+				} else if (sheetForm.currentType == 'teacherList') { // 乐团主管
 					form.educationalTeacherId = value.value
 					formName.educationalTeacherName = value.text
 					formName.educationalTeacherIndex = index
@@ -983,7 +983,7 @@
 					return false
 				}
 				if (!form.educationalTeacherId) {
-					this.$toast('请选择教务老师')
+					this.$toast('请选择乐团主管')
 					return
 				}
 				if(this.checkboxSelectIds.length <= 0) {