|
|
@@ -163,7 +163,7 @@ import {
|
|
|
revisionClassGroup,
|
|
|
revisionAddClassGroup,
|
|
|
findClassCourseMinute,
|
|
|
- mergeClassSplitClassAffirm,
|
|
|
+ mergeClassSplitClassAffirm
|
|
|
} from "@/api/buildTeam";
|
|
|
import courseItem from "./classroom-setting-item";
|
|
|
import { classTimeList } from "@/utils/searchArray";
|
|
|
@@ -219,14 +219,14 @@ export default {
|
|
|
],
|
|
|
components: {
|
|
|
courseItem,
|
|
|
- "classrome-preview": classromePreview,
|
|
|
+ "classrome-preview": classromePreview
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
form: {
|
|
|
coreTeacher: "",
|
|
|
assistant: "",
|
|
|
- classs: {},
|
|
|
+ classs: {}
|
|
|
},
|
|
|
allClasss: {},
|
|
|
prices: {}, //分部每种课程类型的时长
|
|
|
@@ -238,7 +238,7 @@ export default {
|
|
|
musicSurplus: {},
|
|
|
previewVisible: false,
|
|
|
previewList: [],
|
|
|
- holidays: [],
|
|
|
+ holidays: []
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -250,11 +250,11 @@ export default {
|
|
|
},
|
|
|
detail() {
|
|
|
this.formatClasss();
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
computed: {
|
|
|
surplustime() {
|
|
|
- console.log(this.form,'classssurplustime')
|
|
|
+ console.log(this.form, "classssurplustime");
|
|
|
const _ = {};
|
|
|
for (const key in this.form.classs) {
|
|
|
if (this.form.classs.hasOwnProperty(key)) {
|
|
|
@@ -270,7 +270,7 @@ export default {
|
|
|
},
|
|
|
musicGroup() {
|
|
|
return MusicStore.state.musicGroup;
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
async mounted() {
|
|
|
this.setCourseTypeListByName();
|
|
|
@@ -281,13 +281,13 @@ export default {
|
|
|
async init() {
|
|
|
try {
|
|
|
await MusicStore.dispatch("getBaseInfo", {
|
|
|
- data: { musicGroupId: this.musicGroupId },
|
|
|
+ data: { musicGroupId: this.musicGroupId }
|
|
|
});
|
|
|
const res = await queryByOrganIdAndCourseType({
|
|
|
- organId: this.musicGroup.organId,
|
|
|
+ organId: this.musicGroup.organId
|
|
|
});
|
|
|
const res1 = await getSysTenantConfig({
|
|
|
- group: "holiday",
|
|
|
+ group: "holiday"
|
|
|
});
|
|
|
|
|
|
this.holidays = JSON.parse(
|
|
|
@@ -351,22 +351,18 @@ export default {
|
|
|
res = await getMusicCourseSettingsWithStudents({
|
|
|
musicGroupId: this.musicGroupId,
|
|
|
studentIds,
|
|
|
- classGroupId,
|
|
|
+ classGroupId
|
|
|
});
|
|
|
if (res.data.checkCourseTimesFlag == 1) {
|
|
|
this.$confirm("该班级学员剩余时长不一致是否继续?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
- type: "warning",
|
|
|
+ type: "warning"
|
|
|
})
|
|
|
- .then(() => {
|
|
|
-
|
|
|
- })
|
|
|
- .catch((e)=>{
|
|
|
- this.$emit('close')
|
|
|
- })
|
|
|
-
|
|
|
-
|
|
|
+ .then(() => {})
|
|
|
+ .catch(e => {
|
|
|
+ this.$emit("close");
|
|
|
+ });
|
|
|
}
|
|
|
} catch (error) {
|
|
|
console.log(error);
|
|
|
@@ -388,9 +384,9 @@ export default {
|
|
|
{
|
|
|
time: this.selectPrices ? this.selectPrices[key] : undefined,
|
|
|
coreTeacher: this.coreid,
|
|
|
- assistant: this.assistant,
|
|
|
- },
|
|
|
- ],
|
|
|
+ assistant: this.assistant
|
|
|
+ }
|
|
|
+ ]
|
|
|
};
|
|
|
}
|
|
|
}
|
|
|
@@ -421,7 +417,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- this.$refs.form.validate(async (valid) => {
|
|
|
+ this.$refs.form.validate(async valid => {
|
|
|
if (valid) {
|
|
|
const list = [];
|
|
|
for (const key in this.form.classs) {
|
|
|
@@ -445,7 +441,7 @@ export default {
|
|
|
holiday: item.holiday,
|
|
|
students: this.studentSubmitedData?.seleched,
|
|
|
courseTimes: item.cycle.length,
|
|
|
- courseTimeDtoList: item.cycle.map((_) => ({
|
|
|
+ courseTimeDtoList: item.cycle.map(_ => ({
|
|
|
classGroupTeacherMapperList: this.formatTeacher(_),
|
|
|
courseType: key,
|
|
|
dayOfWeek: _.dayOfWeek,
|
|
|
@@ -454,8 +450,8 @@ export default {
|
|
|
startDate: _.startDate,
|
|
|
endDate: _.endDate,
|
|
|
holiday: _.holiday,
|
|
|
- expectCourseNum: _.expectCourseNum,
|
|
|
- })),
|
|
|
+ expectCourseNum: _.expectCourseNum
|
|
|
+ }))
|
|
|
};
|
|
|
if (type && typeof type === "string") {
|
|
|
data[type] = true;
|
|
|
@@ -472,11 +468,11 @@ export default {
|
|
|
result.msg || `当前课程课酬预计为0,是否继续`,
|
|
|
"提示",
|
|
|
{
|
|
|
- type: "warning",
|
|
|
+ type: "warning"
|
|
|
}
|
|
|
);
|
|
|
// obj.allowZeroSalary = true;
|
|
|
- list.forEach((item) => {
|
|
|
+ list.forEach(item => {
|
|
|
item.allowZeroSalary = true;
|
|
|
});
|
|
|
await classGroupUpdate(list);
|
|
|
@@ -489,11 +485,11 @@ export default {
|
|
|
result.msg || `班级剩余排课时长不一致,请再次确认`,
|
|
|
"提示",
|
|
|
{
|
|
|
- type: "warning",
|
|
|
+ type: "warning"
|
|
|
}
|
|
|
);
|
|
|
// obj.allowZeroSalary = true;
|
|
|
- list.forEach((item) => {
|
|
|
+ list.forEach(item => {
|
|
|
item.checkCourseTimesFlag = true;
|
|
|
});
|
|
|
await classGroupUpdate(list);
|
|
|
@@ -522,16 +518,15 @@ export default {
|
|
|
} else if (this.classType == 5) {
|
|
|
// 这里是合班拆班
|
|
|
let obj = {};
|
|
|
- obj.musicGroupPaymentCalenderDtos =
|
|
|
- this.musicGroupPaymentCalenderDtos;
|
|
|
+ obj.musicGroupPaymentCalenderDtos = this.musicGroupPaymentCalenderDtos;
|
|
|
obj.classGroup4MixDtos = list;
|
|
|
obj.classGroupIds = this.classIdList;
|
|
|
obj.studentIds = this.studentSubmitedData.seleched;
|
|
|
obj.classGroupStudents = this.classGroupStudents;
|
|
|
obj.classCourseMinuteMap = this.selectPrices;
|
|
|
await mergeClassSplitClassAffirm(obj);
|
|
|
- let grend =
|
|
|
- this.$parent.$parent.$parent.$parent.$parent.$parent.$parent;
|
|
|
+ let grend = this.$parent.$parent.$parent.$parent.$parent.$parent
|
|
|
+ .$parent;
|
|
|
grend.closeStudentReset();
|
|
|
grend.getList();
|
|
|
return;
|
|
|
@@ -571,13 +566,13 @@ export default {
|
|
|
arr.push(obj);
|
|
|
}
|
|
|
if (row.assistant?.length > 0) {
|
|
|
- row.assistant.forEach((ass) => {
|
|
|
+ row.assistant.forEach(ass => {
|
|
|
arr.push({ teacherRole: "TEACHING", userId: ass });
|
|
|
});
|
|
|
}
|
|
|
return arr;
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
// watch:{
|
|
|
// musicSurplus(){
|
|
|
// deep
|
