Skip to content

C
confucius
Commit edc941eb authored by 罗超's avatar 罗超
Browse files
Options

2

parent 49ecfba8
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 39 deletions
src/components/stuMan/subscribe/detail.vue
View file @ edc941eb
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
<q-field filled label="进度" stack-label class="col-6"> <q-field filled label="进度" stack-label class="col-6">
<template v-slot:control> <template v-slot:control>
<div> <div>
{{ saveObj.Ranks }}/{{ saveObj.TotalPlanNum }} <span v-if="saveObj.ClassType == 1">{{ saveObj.Ranks }}/{{ saveObj.TotalPlanNum }}</span>
<span v-if="saveObj.ClassType == 3">第{{ saveObj.Ranks||0 }}次课</span>
<span class="q-ml-sm" v-if="saveObj.ClassType == 3">({{ saveObj.CourseGradeName }})</span> <span class="q-ml-sm" v-if="saveObj.ClassType == 3">({{ saveObj.CourseGradeName }})</span>
</div> </div>
</template> </template>
......
src/components/stuMan/subscribe/reStudy.vue
View file @ edc941eb
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
return { return {
reStuMsg: { reStuMsg: {
StuName: "", StuName: "",
ChapterNo: 0, CourseGradeNo: 0,
CourseGradeId: 0 CourseGradeId: 0
}, },
stuInfo: "", stuInfo: "",
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
}); });
return; return;
} }
this.reStuMsg.ChapterNo = this.saveObj.Ranks+this.saveObj.CourseGradeId; this.reStuMsg.CourseGradeNo=this.saveObj.Ranks,
this.reStuMsg.CourseGradeId = this.saveObj.CourseGradeId; this.reStuMsg.CourseGradeId = this.saveObj.CourseGradeId;
getCanAppointmentAgainList(this.reStuMsg).then(res => { getCanAppointmentAgainList(this.reStuMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
......
src/components/stuMan/subscribe/replenish.vue
View file @ edc941eb
...@@ -106,7 +106,8 @@ export default { ...@@ -106,7 +106,8 @@ export default {
}, },
getStu() { getStu() {
const msg = { const msg = {
ChapterNo: this.saveObj.Ranks+this.saveObj.CourseGradeId CourseGradeNo:this.saveObj.Ranks,
CourseGradeId:this.saveObj.CourseGradeId
}; };
getCanMakeupStuList(msg).then(res => { getCanMakeupStuList(msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -143,7 +144,7 @@ export default { ...@@ -143,7 +144,7 @@ export default {
StuId: this.stuInfo.StuId, StuId: this.stuInfo.StuId,
GuestId: this.stuInfo.GuestId, GuestId: this.stuInfo.GuestId,
CourseId: this.saveObj.CourseId, CourseId: this.saveObj.CourseId,
ChapterNo: this.saveObj.Ranks+this.saveObj.CourseGradeId, CourseGradeNo:this.saveObj.Ranks,
CourseGradeId: this.saveObj.CourseGradeId CourseGradeId: this.saveObj.CourseGradeId
}; };
setAppointmentMakeup(saveMsg).then(res => { setAppointmentMakeup(saveMsg).then(res => {
......
src/components/stuMan/subscribe/subscribeForm.vue
View file @ edc941eb
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
this.courseCheckList = []; this.courseCheckList = [];
this.stuList = []; this.stuList = [];
this.allStuList = []; this.allStuList = [];
if (this.editType == 2) { if (this.editType == 2&&this.saveObj.ClassType==3) {
this.getStu(); this.getStu();
} }
} }
...@@ -295,7 +295,6 @@ ...@@ -295,7 +295,6 @@
this.stuMsg.CourseGradeId = this.saveObj.CourseGradeId || 0; this.stuMsg.CourseGradeId = this.saveObj.CourseGradeId || 0;
this.stuMsg.NextCourseGradeNo = this.saveObj.Ranks || 0; this.stuMsg.NextCourseGradeNo = this.saveObj.Ranks || 0;
} }
console.log(298,this.checkChapter)
GetCanAppointmentStuList(this.stuMsg).then(res => { GetCanAppointmentStuList(this.stuMsg).then(res => {
this.stuList = JSON.parse(JSON.stringify(res.Data)); this.stuList = JSON.parse(JSON.stringify(res.Data));
this.allStuList = JSON.parse(JSON.stringify(res.Data)); this.allStuList = JSON.parse(JSON.stringify(res.Data));
...@@ -390,8 +389,7 @@ ...@@ -390,8 +389,7 @@
const totalTime = this.courseCheckList.reduce((pre, cur) => { const totalTime = this.courseCheckList.reduce((pre, cur) => {
return (pre += cur.Minutes); return (pre += cur.Minutes);
}, 0); }, 0);
console.log(this.courseCheckList) console.log(this.courseCheckList,totalTime)
console.log(totalTime)
if (this.checkChapter.StudyMinutes !== totalTime) { if (this.checkChapter.StudyMinutes !== totalTime) {
this.$q.notify({ this.$q.notify({
message: "课时不匹配，请重新上课时段", message: "课时不匹配，请重新上课时段",
......
src/pages/studyAbroad/subscribe.vue
View file @ edc941eb
...@@ -93,9 +93,13 @@ ...@@ -93,9 +93,13 @@
<div class="flex"> <div class="flex">
<span class="detailLabel">教室：</span>{{ __item.RoomName }} <span class="detailLabel">教室：</span>{{ __item.RoomName }}
</div> </div>
<div class="flex no-wrap" v-if="__item.ClassType !== 2"> <div class="flex no-wrap" v-if="__item.ClassType == 1">
<span class="detailLabel">进度：</span><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span> <span class="detailLabel">进度：</span><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
</div> </div>
<div class="flex no-wrap" v-if="__item.ClassType == 3">
<span class="detailLabel">进度：</span><span>第{{ __item.Ranks||0 }}次课</span>
<span class="q-ml-sm" v-if="__item.CourseGradeName">({{__item.CourseGradeName}})</span>
</div>
<div class="row flex no-wrap"> <div class="row flex no-wrap">
<span class="detailLabel">课程：</span> <span class="detailLabel">课程：</span>
<div class="detailValue">{{ __item.CourseName }}</div> <div class="detailValue">{{ __item.CourseName }}</div>
...@@ -103,9 +107,9 @@ ...@@ -103,9 +107,9 @@
<div class="flex no-wrap"> <div class="flex no-wrap">
<span class="detailLabel">班级：</span> <span class="detailLabel">班级：</span>
<span>{{ __item.ClassName }} <span>{{ __item.ClassName }}
<span v-if="__item.ClassType===2"> <span v-if="__item.ClassType === 2">
<span v-if="__item.ReserveType===0">(正常试听)</span> <span v-if="__item.ReserveType === 0">(正常试听)</span>
<span v-if="__item.ReserveType===1">(跟班试听)</span> <span v-if="__item.ReserveType === 1">(跟班试听)</span>
</span> </span>
</span> </span>
</div> </div>
...@@ -117,13 +121,6 @@ ...@@ -117,13 +121,6 @@
类型：<span></span><span v-if="__item.ClassType == 1">跟班</span><span 类型：<span></span><span v-if="__item.ClassType == 1">跟班</span><span
v-if="__item.ClassType == 2">试听课</span><span v-if="__item.ClassType == 3">约课</span></span> v-if="__item.ClassType == 2">试听课</span><span v-if="__item.ClassType == 3">约课</span></span>
</div> </div>
<div class="flex no-wrap" v-if="__item.ClassType !== 2">
<span class="detailLabel">进度：</span><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
<span class="q-ml-sm">{{
__item.CourseGradeName
}}</span>
</div>
<div class="flex no-wrap" v-if="__item.ClassType !== 2"> <div class="flex no-wrap" v-if="__item.ClassType !== 2">
<span class="detailLabel">学员：</span> <span class="detailLabel">学员：</span>
<div> <div>
...@@ -178,20 +175,21 @@ ...@@ -178,20 +175,21 @@
<div class="flex no-wrap"> <div class="flex no-wrap">
<span class="detailLabel">班级：</span> <span class="detailLabel">班级：</span>
<span>{{ __item.ClassName }} <span>{{ __item.ClassName }}
<span v-if="__item.ClassType===2"> <span v-if="__item.ClassType === 2">
<span v-if="__item.ReserveType===0">(正常试听)</span> <span v-if="__item.ReserveType === 0">(正常试听)</span>
<span v-if="__item.ReserveType===1">(跟班试听)</span> <span v-if="__item.ReserveType === 1">(跟班试听)</span>
</span> </span>
</span> </span>
</div> </div>
<div class="flex no-wrap"> <div class="flex no-wrap">
<span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span> <span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
</div> </div>
<div class="flex no-wrap" v-if="__item.ClassType !== 2"> <div class="flex no-wrap" v-if="__item.ClassType == 1">
<span class="detailLabel">进度：</span><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span> <span class="detailLabel">进度：</span><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
<span class="q-ml-sm">{{ </div>
__item.CourseGradeName <div class="flex no-wrap" v-if="__item.ClassType == 3">
}}</span> <span class="detailLabel">进度：</span><span>第{{ __item.Ranks||0 }}次课</span>
<span class="q-ml-sm" v-if="__item.CourseGradeName">({{__item.CourseGradeName}})</span>
</div> </div>
<div class="flex no-wrap"> <div class="flex no-wrap">
<span class="detailLabel"> 类型：</span><span v-if="__item.ClassType == 1">跟班</span><span <span class="detailLabel"> 类型：</span><span v-if="__item.ClassType == 1">跟班</span><span
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment