Browse Source

添加教务老师

lex-xin 4 years ago
parent
commit
74b6b7e955
40 changed files with 59 additions and 5 deletions
  1. 0 0
      dist/app.0575b2455dbd5d090168.js
  2. 0 0
      dist/app.6442b3edda8b9679d5c0.js
  3. 0 0
      dist/css/PeriodAdjust~PeriodChange~VIPApply~addVisit.8d36cab7.css
  4. 0 0
      dist/css/VIPApply.74166682.css
  5. 0 0
      dist/css/VIPApply.c84cbf91.css
  6. 0 0
      dist/index.html
  7. 0 0
      dist/js/Approval.6d88fe11.js
  8. 0 0
      dist/js/Approval.cf0235e7.js
  9. 0 0
      dist/js/Attendance.37e84646.js
  10. 0 0
      dist/js/Attendance.f61fe6e0.js
  11. 0 0
      dist/js/CallNames.1dc181dd.js
  12. 0 0
      dist/js/CourseApply.1d1d8596.js
  13. 0 0
      dist/js/CourseApply.6a37effe.js
  14. 0 0
      dist/js/CourseEvaluation.30f5ada3.js
  15. 0 0
      dist/js/CourseEvaluation.eb74a41e.js
  16. 0 0
      dist/js/IStarted.118cf44c.js
  17. 0 0
      dist/js/IStarted.56e6f6d7.js
  18. 0 0
      dist/js/Leave.601ecb07.js
  19. 0 0
      dist/js/Leave.af756b08.js
  20. 0 0
      dist/js/PeriodAdjust.c711f076.js
  21. 0 0
      dist/js/PeriodAdjust~PeriodChange.8b692dcc.js
  22. 0 0
      dist/js/PeriodAdjust~PeriodChange.9885c5ab.js
  23. 0 0
      dist/js/PeriodAdjust~PeriodChange~VIPApply~addVisit.8a81f71d.js
  24. 0 0
      dist/js/PeriodAdjust~PeriodChange~addVisit.552a0f10.js
  25. 0 0
      dist/js/PeriodChange.16763c83.js
  26. 0 0
      dist/js/TeachingSchool.6095510d.js
  27. 0 0
      dist/js/TeachingSchool.a61a706c.js
  28. 0 0
      dist/js/TeachingSet.25538d4c.js
  29. 0 0
      dist/js/TeachingSet.911d187c.js
  30. 0 0
      dist/js/VIPApply.9386cf16.js
  31. 0 0
      dist/js/VIPApply.fc86abc8.js
  32. 0 0
      dist/js/addVisit.16aaa823.js
  33. 0 0
      dist/js/addVisit.4c2b385c.js
  34. 0 0
      dist/js/order.a79116d1.js
  35. 0 0
      dist/js/order.fbd0d1cf.js
  36. 0 0
      dist/js/privacy.d41510a8.js
  37. 0 0
      dist/js/visitList.4d6c530d.js
  38. 11 1
      src/api/teacher.js
  39. 46 2
      src/views/teacher/VIPApply.vue
  40. 2 2
      vue.config.js

File diff suppressed because it is too large
+ 0 - 0
dist/app.0575b2455dbd5d090168.js


File diff suppressed because it is too large
+ 0 - 0
dist/app.6442b3edda8b9679d5c0.js


+ 0 - 0
dist/css/PeriodAdjust~PeriodChange~addVisit.8d36cab7.css → dist/css/PeriodAdjust~PeriodChange~VIPApply~addVisit.8d36cab7.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/VIPApply.74166682.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/VIPApply.c84cbf91.css


File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/js/Approval.6d88fe11.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Approval.cf0235e7.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Attendance.37e84646.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Attendance.f61fe6e0.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/CallNames.1dc181dd.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/CourseApply.1d1d8596.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/CourseApply.6a37effe.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/CourseEvaluation.30f5ada3.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/CourseEvaluation.eb74a41e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/IStarted.118cf44c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/IStarted.56e6f6d7.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Leave.601ecb07.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Leave.af756b08.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust.c711f076.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust~PeriodChange.8b692dcc.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust~PeriodChange.9885c5ab.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust~PeriodChange~VIPApply~addVisit.8a81f71d.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust~PeriodChange~addVisit.552a0f10.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodChange.16763c83.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/TeachingSchool.6095510d.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/TeachingSchool.a61a706c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/TeachingSet.25538d4c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/TeachingSet.911d187c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.9386cf16.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.fc86abc8.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/addVisit.16aaa823.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/addVisit.4c2b385c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/order.a79116d1.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/order.fbd0d1cf.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/privacy.d41510a8.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/visitList.4d6c530d.js


+ 11 - 1
src/api/teacher.js

@@ -402,6 +402,15 @@ const visitGetInfo = (data) => {
   })
 }
 
+// 教务老师
+const findEducationUsers = (data) => {
+  return axios({
+    url: '/api-teacher/teacher/findEducationUsers',
+    method: 'get',
+    params: data
+  })
+}
+
 export {
   queryMyCreatedList,
   queryWaitList,
@@ -446,5 +455,6 @@ export {
   queryStudentsWithTeacher,
   geteduVisitList,
   visitAdd,
-  visitGetInfo
+  visitGetInfo,
+  findEducationUsers
 }

+ 46 - 2
src/views/teacher/VIPApply.vue

@@ -6,6 +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-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">
@@ -159,8 +160,10 @@
 		findVipSchoolByTeacher2,
 		findByTeacherAndCategory,
 		vipGroupApply,
+		findEducationUsers,
 		queryStudentsWithTeacher
 	} from '@/api/teacher'
+	import setLoading from '@/utils/loading'
 	let minutes = [] // 分钟数
 	for (let i = 0; i < 60; i++) {
 		let mi = i < 10 ? '0' + i : i
@@ -206,6 +209,8 @@
 					vipGroupActivitySelect: [], // 选中的活动文案JSON
 					teacherSchool: [], // 线下课地址
 					teacherSchoolSelect: [], // 选中的线下课地址JSON
+					teacherList: [], // 线下课地址
+					teacherListSelect: [], // 选中的线下课地址JSON
 					giveTeachMode: [{
 						name: '线上课',
 						value: 'ONLINE'
@@ -247,6 +252,7 @@
 					vipGroupCategoryId: null,
 					vipGroupActivityId: null,
 					teacherSchoolId: null,
+					educationalTeacherId: null,
 					studentNum: null,
 					singleClassMinutes: null,
 					onlineClassesNums: null,
@@ -272,6 +278,8 @@
 					teacherSchoolName: null, // 线下课地址
 					teacherSchoolIndex: 0, // 线下课地址
 					giveTeachModeName: null, // 赠课类型
+					educationalTeacherName: null, // 教务老师
+					educationalTeacherIndex: 0,
 				},
 				other: {
 					onlineSalary: null, // 线上课课酬结算方式
@@ -416,6 +424,24 @@
 							sheetForm.loading = false
 						}
 					})
+				} else if (sheetForm.currentType == 'teacherList') { // 教务老师
+					findEducationUsers().then(res => {
+						let result = res.data
+						if (result.code == 200 && result.data.length > 0) {
+							let tempArr = []
+							result.data.forEach(item => {
+								item.value = item.userId
+								item.text = item.userName
+								tempArr.push(item)
+							})
+							this.loadData.teacherList = tempArr
+							sheetForm.columns = tempArr
+							sheetForm.loading = false
+						} else {
+							this.$toast('暂无教务老师')
+							sheetForm.loading = false
+						}
+					})
 				}
 			},
 			findTeacherCategory(id) { // 获取教师课酬
@@ -501,6 +527,10 @@
 					form.teacherSchoolId = value.value
 					formName.teacherSchoolName = value.text
 					formName.teacherSchoolIndex = index
+				} else if (sheetForm.currentType == 'teacherList') { // 教务老师
+					form.educationalTeacherId = value.value
+					formName.educationalTeacherName = value.text
+					formName.educationalTeacherIndex = index
 				}
 
 				sheetForm.sheetStatus = false
@@ -928,7 +958,7 @@
 				}
 				return value;
 			},
-			onSubmit() {
+			async onSubmit() {
 				let form = this.form
 				let statusList = this.statusList
 				// 排课
@@ -946,14 +976,20 @@
 					this.$toast('请选择课程形式')
 					return false
 				}
+				if (!form.educationalTeacherId) {
+					this.$toast('请选择教务老师')
+					return
+				}
 				if(this.checkboxSelectIds.length <= 0) {
 					this.$toast('请选择上课学生')
 					return
 				}
+
 				if (!form.vipGroupActivityId) {
 					this.$toast('请选择活动方案')
 					return false
 				}
+
 				// 判断是否有线下
 				if (statusList.hasOffline) {
 					if (!form.teacherSchoolId) {
@@ -1043,8 +1079,10 @@
 					return
 				}
 				this.onSubmitStatus = false
-				vipGroupApply(params).then(res => {
+				setLoading(true)
+				await vipGroupApply(params).then(res => {
 					let result = res.data
+					setLoading(false)
 					if (result.code == 200) {
 						this.$toast('申请成功')
 						setTimeout(() => {
@@ -1065,6 +1103,8 @@
 						this.onSubmitStatus = true
 						this.$toast(result.msg)
 					}
+				}).catch(() => {
+					setLoading(false)
 				})
 			},
 			// 搜索
@@ -1300,4 +1340,8 @@
 	.studentColor {
 		color: #14928A;
 	}
+
+	/deep/.van-field--disabled .van-field__label {
+		color: #323233;
+	}
 </style>

+ 2 - 2
vue.config.js

@@ -1,8 +1,8 @@
-let targetUrl = 'http://mteadev.dayaedu.com'
+// let targetUrl = 'http://mteadev.dayaedu.com'
 // let targetUrl = 'http://192.168.3.139:8000' // 箭河
 // let targetUrl = 'https://online.dayaedu.com'
 // let targetUrl = 'http://dev.dayaedu.com/'
-// let targetUrl = 'http://192.168.3.196:8080'
+let targetUrl = 'http://192.168.3.196'
 module.exports = {
   chainWebpack: config => {
     config.devtool('inline-source-map')

Some files were not shown because too many files changed in this diff