Commit 83ec657f authored by 黄奎's avatar 黄奎

页面修改

parent 27a4c245
...@@ -218,6 +218,18 @@ export function saveClass(data) { ...@@ -218,6 +218,18 @@ export function saveClass(data) {
}) })
} }
/**
* 修改班级状态
* @param {JSON数据} data
*/
export function saveClassStatus(data) {
return request({
url: '/Class/SetClassStatus',
method: 'post',
data
})
}
/** /**
* 新增修改班级 * 新增修改班级
* @param {JSON数据} data * @param {JSON数据} data
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</div> </div>
<div class="col-6"> <div class="col-6">
<q-select filled stack-label option-value="CourseId" option-label="CourseName" v-model="objOption.CouseId" <q-select filled stack-label option-value="CourseId" option-label="CourseName" v-model="objOption.CouseId"
ref="CouseId" :options="ClassList" label="关联课程" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value ref="CouseId" :options="CourseList" label="关联课程" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
map-options /> map-options />
</div> </div>
</div> </div>
...@@ -353,7 +353,7 @@ ...@@ -353,7 +353,7 @@
}, },
optionTitle: "", optionTitle: "",
saveCourseLoading: false, saveCourseLoading: false,
ClassList: [], //关联课程下拉数据 CourseList: [], //关联课程下拉数据
TeacherList: [], //关联教师下拉数据 TeacherList: [], //关联教师下拉数据
SchoolList: [], //关联校区下拉数据 SchoolList: [], //关联校区下拉数据
ClassRoomList: [], //教室下拉数据 ClassRoomList: [], //教室下拉数据
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
created() { created() {
this.initDayList(); this.initDayList();
this.getSchool(); this.getSchool();
this.CourseList(); this.getCourseList();
this.getClassRoomList(); this.getClassRoomList();
this.GetTeacherList(); this.GetTeacherList();
this.GetClassTypeList(); this.GetClassTypeList();
...@@ -501,7 +501,6 @@ ...@@ -501,7 +501,6 @@
}, },
//保存班级 //保存班级
saveCourse() { saveCourse() {
this.saveCourseLoading = true
this.objOption.ClassStepPriceList = this.ladderPriceList; this.objOption.ClassStepPriceList = this.ladderPriceList;
if (this.objOption.ClassName == '') { if (this.objOption.ClassName == '') {
this.$q.notify({ this.$q.notify({
...@@ -557,6 +556,7 @@ ...@@ -557,6 +556,7 @@
this.objOption.WeekDayList = this.checkedDays; this.objOption.WeekDayList = this.checkedDays;
//默认上课时间 //默认上课时间
this.objOption.DefaultPlanTimeList = this.DefaultPlanTimeList; this.objOption.DefaultPlanTimeList = this.DefaultPlanTimeList;
this.saveCourseLoading = true;
saveClass(this.objOption).then(res => { saveClass(this.objOption).then(res => {
this.saveCourseLoading = false this.saveCourseLoading = false
this.$q.notify({ this.$q.notify({
...@@ -573,10 +573,15 @@ ...@@ -573,10 +573,15 @@
}) })
}, },
//获取课程 //获取课程
CourseList() { getCourseList() {
queryCourseDropdownList({}).then(res => { queryCourseDropdownList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.ClassList = res.Data; this.CourseList = res.Data;
var obj = {
CourseName: '请选择',
CourseId: 0
}
this.CourseList.unshift(obj);
} }
}) })
}, },
...@@ -585,6 +590,11 @@ ...@@ -585,6 +590,11 @@
getTeacherDropDownList({}).then(res => { getTeacherDropDownList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.TeacherList = res.Data; this.TeacherList = res.Data;
var obj = {
TeacherName: '请选择',
TId: 0
}
this.TeacherList.unshift(obj);
} }
}) })
}, },
...@@ -594,7 +604,7 @@ ...@@ -594,7 +604,7 @@
if (res.Code == 1) { if (res.Code == 1) {
this.SchoolList = res.Data; this.SchoolList = res.Data;
var obj = { var obj = {
SName: '全部', SName: '请选择',
SId: 0 SId: 0
} }
this.SchoolList.unshift(obj); this.SchoolList.unshift(obj);
...@@ -606,6 +616,11 @@ ...@@ -606,6 +616,11 @@
queryClassRoomList({}).then(res => { queryClassRoomList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.ClassRoomList = res.Data; this.ClassRoomList = res.Data;
var obj = {
RoomName: '请选择',
RoomId: 0
}
this.ClassRoomList.unshift(obj);
} }
}) })
}, },
...@@ -639,7 +654,7 @@ ...@@ -639,7 +654,7 @@
this.DefaultPlanTimeList.splice(index, 1); this.DefaultPlanTimeList.splice(index, 1);
}, },
//获取班级类型下拉 //获取班级类型下拉
GetClassTypeList(){ GetClassTypeList() {
GetClassTypeList({}).then(res => { GetClassTypeList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.classTypeList = res.Data; this.classTypeList = res.Data;
......
...@@ -354,7 +354,6 @@ ...@@ -354,7 +354,6 @@
<div class="less_Isout" v-if="isShowSignBtn"> <div class="less_Isout" v-if="isShowSignBtn">
<span v-if="item.IsCheck==0">出勤</span> <span v-if="item.IsCheck==0">出勤</span>
<span v-if="item.IsCheck==1">缺勤</span> <span v-if="item.IsCheck==1">缺勤</span>
<!-- <span v-if="item.IsCheck==-1">缺勤</span> -->
</div> </div>
<div class="less_Isout" v-else> <div class="less_Isout" v-else>
<span v-if="item.IsCheck==0">出勤</span> <span v-if="item.IsCheck==0">出勤</span>
...@@ -367,7 +366,6 @@ ...@@ -367,7 +366,6 @@
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="isShowSign=false" /> <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="isShowSign=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveSign()" /> <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveSign()" />
</q-card-actions> </q-card-actions>
</div> </div>
</div> </div>
</div> </div>
...@@ -599,7 +597,8 @@ ...@@ -599,7 +597,8 @@
this.dayObj = res.Data; this.dayObj = res.Data;
var d = new Date(); var d = new Date();
var datetime = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate(); var datetime = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate();
if (this.dayObj.ClassDate == datetime) { //HK 2020-12-25修改
if (this.dayObj.ClassDate <= datetime) {
this.isShowSignBtn = true; this.isShowSignBtn = true;
} else { } else {
this.isShowSignBtn = false; this.isShowSignBtn = false;
......
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