Commit fe54bdd9 authored by zhengke's avatar zhengke

修改

parent 826f47e1
......@@ -124,6 +124,22 @@
})
this.$emit('success');
this.closeClassSaveForm();
if (ClassStatus == 3 && res.Message != '') {
this.$q.dialog({
title: '提示信息',
message: "注意,该班级下面任然存在未消耗完课时的学员,请核对学员课时,进行补课处理",
cancel: true,
persistent: true,
ok: "查看名单",
cancel: "我知道了",
}).onOk(() => {
this.OpenNewUrl('/stuMan/unfinishedStudent',{
ClassId:this.statusMsg.ClassId
})
}).onCancel(() => {
});
}
} else {
this.$q.notify({
icon: 'iconfont icon-chenggong',
......
......@@ -1070,6 +1070,12 @@ import { queryCourseDropdownList } from "../../api/course/index";
import { UploadSelfFile } from "../../api/common/common";
import Lockr from "lockr";
export default {
props: {
ClassId: {
type: Number,
default: null
},
},
data() {
return {
TeacherList: [],
......@@ -1304,6 +1310,10 @@ export default {
if (u) {
this.queryClass.Teacher_Id = u.AccountId;
}
if(this.ClassId){
this.msg.ClassId = this.ClassId;
}
this.getClass();
this.getSchool();
this.getCourseList();
......
......@@ -192,10 +192,15 @@
<q-item-label>状态变更</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click.stop="getStudent(props.row.ClassId)">
<!-- <q-item clickable v-close-popup @click.stop="getStudent(props.row.ClassId)">
<q-item-section>
<q-item-label>未完成学员名单</q-item-label>
</q-item-section>
</q-item> -->
<q-item v-if="props.row.ClassStatus!=3" clickable v-close-popup @click="classApply(props.row.ClassId)">
<q-item-section>
<q-item-label>调课申请</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
......@@ -212,6 +217,8 @@
</othercourseForm>
<changestatusForm v-if="isShowStatusChange" :seting-obj="classObjOption" @close="closeClassSaveForm"
@success="refreshPage"></changestatusForm>
<change-class-form v-if="isShowTiaoke" :ClassId="commonClassId" @close="closeClassSaveForm" @success="refreshPage"></change-class-form>
</div>
</div>
</template>
......@@ -231,6 +238,7 @@
import classinfoForm from '../../components/course/classinfo-form';
import othercourseForm from '../../components/course/othercourse-form';
import changestatusForm from '../../components/course/changestatus-form'
import changeClassForm from '../../components/teacher/changeClassForm.vue'
export default {
meta: {
title: "班级管理"
......@@ -239,7 +247,8 @@
classForm,
classinfoForm,
othercourseForm,
changestatusForm
changestatusForm,
changeClassForm
},
data() {
return {
......@@ -338,7 +347,9 @@
isShowClassInfo: false, //是否显示课程信息
IsShowOtherCourse: false, //是否显示其他课程
TeacherList:[],
isShowStatusChange:false
isShowStatusChange:false,
isShowTiaoke:false,
commonClassId:0
}
},
created() {
......@@ -485,6 +496,7 @@
//关闭关联其他课程弹窗
this.IsShowOtherCourse = false;
this.isShowStatusChange = false;
this.isShowTiaoke = false;
},
GetFirst(val) {
if (val) {
......@@ -528,11 +540,10 @@
}
})
},
//打开未完成学员名单
getStudent(ClassId){
this.OpenNewUrl('/stuMan/unfinishedStudent',{
ClassId:ClassId
})
//调课申请
classApply(ClassId){
this.commonClassId = ClassId;
this.isShowTiaoke = true;
}
}
}
......
......@@ -83,7 +83,8 @@
],
stuMsg: {
ClassId: 0,
School_Id: -1
School_Id: -1,
QNoFinish:1
},
selectedStudent: [],
studentList: [], //学员信息数据
......
......@@ -15,6 +15,12 @@
line-height: 16px;
border-radius: 4px;
}
.bill_Rearsons{
width:250px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis
}
</style>
<template>
......
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