|
@@ -399,8 +399,8 @@ export default {
|
|
|
this.setTimeTable() // 重新排课
|
|
|
|
|
|
// 时间安排
|
|
|
- form.registrationStartTime = value.startTime
|
|
|
- form.coursesExpireDate = value.endTime
|
|
|
+ // form.registrationStartTime = value.startTime
|
|
|
+ // form.coursesExpireDate = value.endTime
|
|
|
} else if(sheetForm.currentType == 'teacherSchool') { // 线下课地址
|
|
|
form.teacherSchoolId = value.value
|
|
|
formName.teacherSchoolName = value.text
|
|
@@ -646,14 +646,15 @@ export default {
|
|
|
let onss = obj.onlineSalarySettlement
|
|
|
// 有线上课
|
|
|
if(onss.salarySettlementType == 'TEACHER_DEFAULT') {
|
|
|
- let b = (vcs.singleClassMinutes / 30).toFixed(2) // 每30Min计算一些课酬
|
|
|
- form.onlineTeacherSalary = b * tc.onlineClassesSalary // 线上课酬
|
|
|
+ let b = vcs.singleClassMinutes / 30 // 每30Min计算一些课酬
|
|
|
+ form.onlineTeacherSalary = (b * tc.onlineClassesSalary).toFixed(2) // 线上课酬
|
|
|
} else if(onss.salarySettlementType == 'RATIO_DISCOUNT') {
|
|
|
// 老师课酬的折扣 如果有则不打折
|
|
|
- form.onlineTeacherSalary = vcs.onlineClassesUnitPrice * (onss.settlementValue ? onss.settlementValue : 100) / 10
|
|
|
+ form.onlineTeacherSalary = (vcs.onlineClassesUnitPrice * (onss.settlementValue ? onss.settlementValue : 100) / 100).toFixed(2)
|
|
|
} else if(onss.salarySettlementType == 'FIXED_SALARY') {
|
|
|
form.onlineTeacherSalary = (onss.settlementValue).toFixed(2)
|
|
|
}
|
|
|
+ form.onlineTeacherSalary = Number(form.onlineTeacherSalary)
|
|
|
}
|
|
|
if (obj && obj.offlineSalarySettlement) {
|
|
|
let offss = obj.offlineSalarySettlement
|
|
@@ -667,6 +668,7 @@ export default {
|
|
|
} else if(offss.salarySettlementType == 'FIXED_SALARY') {
|
|
|
form.offlineTeacherSalary = (offss.settlementValue).toFixed(2)
|
|
|
}
|
|
|
+ form.offlineTeacherSalary = Number(form.offlineTeacherSalary)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -792,6 +794,15 @@ export default {
|
|
|
return false
|
|
|
}
|
|
|
|
|
|
+ if(!form.registrationStartTime) {
|
|
|
+ this.$toast('请选择报名开始时间')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if(!form.coursesExpireDate) {
|
|
|
+ this.$toast('请选择报名结束时间')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+
|
|
|
let vipGroupActivitySelect = this.loadData.vipGroupActivitySelect
|
|
|
if(vipGroupActivitySelect.type == 'GIVE_CLASS' && !form.giveTeachMode) {
|
|
|
this.$toast('请选择赠课类型')
|