Skip to content

C
confucius
Commit 2a4972bf authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 204f5ec8 bab5738b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 176 deletions
src/api/stuMan/index.js
View file @ 2a4972bf
......@@ -22,12 +22,23 @@ export function PlanAppointmentConfig(data) {
});
}
/**
* 修改学员上课方式
*/
export function SetGuestCheckStyle(data) {
return request({
url: '/ScheduleCourse/SetGuestCheckStyle',
method: 'post',
data
});
}
/**
* 获取学员出勤情况
*/
export function getStudentAttendanceDayStatistics(data) {
return request({
url: '/stu/GetStudentAttendanceDayStatistics',
url: '/ScheduleCourse/GetAppointCheckPage',
method: 'post',
data
});
......
src/components/stuMan/subscribe/detail.vue
View file @ 2a4972bf
......@@ -4,7 +4,6 @@
<q-field filled label="老师" stack-label class="col-6">
<template v-slot:control>
<div>{{ saveObj.TeacherName }}</div>
<!-- dateObj.date>formattedString -->
<q-btn color="accent" size="xs" label="修改"
v-if="auth.IsEdit&&saveObj.ClassType==3&&(saveObj.State==1||saveObj.State==2)" @click="modifyTeacher"
class="q-ml-md" />
......@@ -73,6 +72,8 @@
saveObj.AppointState == 1 &&
isShowTag(saveObj.GuestList, saveObj.ScrollMinNum)
" />
<q-btn color="accent" size="xs" label="取消" v-if="auth.IsEdit
" @click="CancelAdminAppointment(saveObj)" class="q-ml-md" :loading="saveLoading" />
</template>
</q-field>
<q-field filled label="最小成班人数：" stack-label class="col-6" v-if="saveObj.ClassType == 3">
......@@ -138,14 +139,17 @@
<script>
import {
CancelAppointment,
SetSureAppointment
SetSureAppointment,
cancelSureAppointment
} from "../../../api/studyabroad/subscribe.js";
import ChangeCourse from "./changeCourse";
import MakeUp from "./makeUp.vue"
import CancelSub from './deleteStu'
import Room from "./changeRoom.vue"
import changeTeacher from "./changeTeacher.vue"
import { date } from 'quasar'
import {
date
} from 'quasar'
export default {
components: {
ChangeCourse,
......@@ -259,6 +263,45 @@
}
});
},
//取消预约
CancelAdminAppointment(item) {
let that = this;
var postMsg = {
AppointIds: "",
Date: this.dateObj.date,
ShiftSort: item.ShiftSort,
TeacherId: item.Tid
};
var tempList = [];
if (item.GuestList && item.GuestList.length > 0) {
item.GuestList.forEach(subItem => {
tempList.push(subItem.AppointmentId);
})
}
if (tempList && tempList.length > 0) {
postMsg.AppointIds = tempList.join(",");
}
this.$q
.dialog({
title: "提示信息",
message: "是否要取消本次预约",
cancel: true,
ok: "是",
cancel: "否"
})
.onOk(() => {
cancelSureAppointment(postMsg).then(res => {
if (res.Code == 1) {
that.$q.notify({
message: "操作成功",
position: "top"
});
that.$emit("close");
}
});
})
.onCancel(() => {});
},
//显示调课弹窗
showChangeCourse() {
this.CourseObj = {
......
src/components/stuMan/subscribe/subscribeForm.vue
View file @ 2a4972bf
......@@ -482,14 +482,6 @@
},
//获取学生列表
getStu_V2() {
// if (!this.stuMsg_v2.StuName) {
// this.$q.notify({
// position: "top",
// message: "请输入学生姓名",
// timeout: 2500
// });
// return;
// }
if (this.editType == 1) {
this.stuMsg_v2.NextCourseGradeNo = this.checkChapter.ChapterGradeNo;
this.stuMsg_v2.CourseGradeId = this.checkChapter.CourseRate;
......@@ -544,6 +536,7 @@
}
});
this.saveMsg.ChapterNo = this.checkChapter.ChapterNo;
// HK 2024-09-06 注释，可以不选老师，不选老师就默认通班的时间段
// this.saveMsg.TeacherId = 0;
// this.teacherTimeList = [];
//获取学生列表
......@@ -677,48 +670,6 @@
},
//保存约课
SaveStuAppointment() {
// this.$refs.CourseId.validate();
// this.$refs.StuId.validate();
// if (!this.saveMsg.CourseId) {
// this.$q.notify({
// type: 'negative',
// position: "top",
// message: `请选择课程`
// })
// return;
// }
// if(!this.saveMsg.ChapterNo){
// this.$q.notify({
// type: 'negative',
// position: "top",
// message: `请选择章节`
// })
// return;
// }
// if(!this.saveMsg.TeacherId){
// this.$q.notify({
// type: 'negative',
// position: "top",
// message: `请选择老师`
// })
// return;
// }
// if (this.courseCheckList.length === 0) {
// this.$q.notify({
// message: "请选择上课时段",
// position: "top",
// type: "negative"
// });
// return;
// }
// if(this.saveMsg.ChooseStuList.length===0){
// this.$q.notify({
// message: "请添加学员",
// position: "top",
// type: "negative"
// });
// return;
// }
var tipStr = ""
if (this.saveMsg.ChooseStuList && this.saveMsg.ChooseStuList.length > 0) {
this.saveMsg.ChooseStuList.forEach(item => {
......
src/pages/course/classManage.vue
View file @ 2a4972bf
......@@ -44,8 +44,8 @@
</div>
<div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目"
clearable />
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options
label="所属科目" clearable />
</div>
<div class="col-3">
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.TeacherName"
......@@ -55,6 +55,18 @@
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.CourseName"
label="学习课程" @clear="getClassList" maxlength="20" />
</div>
<div class="col-3">
<q-input v-model="msg.StartTime" mask="date" label="开班时间" standout="bg-primary text-white" clearable
@clear="getClassList" @change="getClassList">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qCStartTime" transition-show="scale" transition-hide="scale">
<q-date v-model="msg.StartTime" mask="YYYY-MM-DD" @input="() =>changeDate()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" option-value="SId" option-label="SName"
v-model="msg.School_Id" :options="schoolList" emit-value map-options label="关联校区" />
......@@ -97,12 +109,14 @@
pageSize: 12,
rowsPerPage: 12,
ClassName: '', //班级名称
ClassStatus: 0, //班级状态
ClassStatus: 2, //班级状态
TeacherName: '', //带班老师
CourseName: '', //学习课程
School_Id: -1, //关联校区
ClassNo: '', //班号
CourseSubject: "", //所属科目
StartTime: "", //开班开始时间
EndTime: "", //开班结束时间
},
//班级状态
classStatusList: [],
......@@ -137,6 +151,10 @@
this.getClassList();
},
methods: {
changeDate() {
this.$refs.qCStartTime.hide();
this.getClassList();
},
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
......
src/pages/stuMan/stuClassManage.vue
View file @ 2a4972bf
......@@ -68,15 +68,8 @@
label="学习课程" @clear="getClassList" maxlength="20" />
</div>
<div class="col-3">
<!-- <q-field filled dense label="开始时间" standout="bg-primary text-white">
<template v-slot:control>
<el-date-picker type="date" style="width:100%" v-model="msg.StartTime" value-format="yyyy-MM-dd"
placeholder="开班时间" @change="getClassList">
</el-date-picker>
</template>
</q-field> -->
<q-input v-model="msg.StartTime" mask="date" label="开班时间" standout="bg-primary text-white" clearable
@clear="getClassList">
@clear="getClassList" @change="getClassList">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qCStartTime" transition-show="scale" transition-hide="scale">
......@@ -129,7 +122,7 @@
pageSize: 12,
rowsPerPage: 12,
ClassName: '', //班级名称
ClassStatus: 0, //班级状态
ClassStatus: 2, //班级状态
TeacherName: '', //带班老师
CourseName: '', //学习课程
School_Id: -1, //关联校区
......@@ -159,7 +152,7 @@
if (this.$route.query && this.$route.query.ClassName) {
this.msg.ClassName = decodeURI(this.$route.query.ClassName)
}
this.msg.StartTime = this.$commonUtils.getCurrentDate();
//this.msg.StartTime = this.$commonUtils.getCurrentDate();
this.getClassStatus();
this.getSchool();
this.GetTeacherList();
......
src/pages/stuMan/studentManage.vue
View file @ 2a4972bf
This diff is collapsed.
src/pages/teacher/myClass.vue
View file @ 2a4972bf
......@@ -40,13 +40,25 @@
</div>
<div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目"
clearable />
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options
label="所属科目" clearable />
</div>
<div class="col-3">
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.CourseName"
label="学习课程" @clear="getClassList" maxlength="20" />
</div>
<div class="col-3">
<q-input v-model="msg.StartTime" mask="date" label="开班时间" standout="bg-primary text-white" clearable
@clear="getClassList" @change="getClassList">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qCStartTime" transition-show="scale" transition-hide="scale">
<q-date v-model="msg.StartTime" mask="YYYY-MM-DD" @input="() =>changeDate()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" option-value="SId" option-label="SName"
v-model="msg.School_Id" :options="schoolList" emit-value map-options label="关联校区" />
......@@ -90,12 +102,14 @@
pageSize: 12,
rowsPerPage: 12,
ClassName: '', //班级名称
ClassStatus: 0, //班级状态
ClassStatus: 2, //班级状态
TeacherName: '', //带班老师
Teacher_Id: 0,
CourseName: '', //学习课程
School_Id: -1, //关联校区
CourseSubject: "", //所属科目
StartTime: "", //开班开始时间
EndTime: "", //开班结束时间
},
//班级状态
classStatusList: [],
......@@ -124,6 +138,10 @@
this.getClassList();
},
methods: {
changeDate() {
this.$refs.qCStartTime.hide();
this.getClassList();
},
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
......
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