diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue
index ef2a9e1e2..a496cd49a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue
@@ -9,38 +9,45 @@
{{todayWeek.Monday}}
-
- {{todayWeek.Sunday}}
-
+ {{todayWeek.Sunday}}
+
-
- {{ item.en }}
- {{ item.cn }}
+
+
+ {{ item.en }}
+ {{ item.cn }}
+
-
-
+
+
{{ k.LessonName }}
-
+
{{ k.LessonDate }}
-
+
+
{{ k.Teacher }}
-
+
+
{{ k.ClassRoomName }}
-
-
+
+
{{ k.Sort }}
-
+
该时间段没有数据
@@ -53,268 +60,364 @@
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue
index 0e5c2b05b..5f7021bcb 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue
@@ -14,10 +14,10 @@
-
+
-
+
@@ -61,12 +61,12 @@ export default {
dataSource: '1',
dataSourceId: 'BaseUser,f_realname,f_userid'
},
- LessonSortNo: {
+ lessonSortNo: {
type: 'select',
dataSource: '1',
dataSourceId: 'BaseUser,f_realname,f_userid'
},
- ClassRoomNo: {
+ classRoomNo: {
type: 'select',
dataSource: '1',
dataSourceId: 'BaseUser,f_realname,f_userid'
@@ -77,8 +77,8 @@ export default {
MajorNo: [],
ClassNo: [],
LessonNo: [],
- LessonSortNo: [],
- ClassRoomNo: [],
+ lessonSortNo: [],
+ classRoomNo: [],
LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text }))
},
pageInfo: null,
@@ -99,9 +99,9 @@ export default {
ClassName: '',
LessonNo: '',
LessonName: '',
- LessonSortNo: '',
+ lessonSortNo: '',
LessonSortName: '',
- ClassRoomNo: '',
+ classRoomNo: '',
ClassroomName: '',
LessonDate: '',
LessonTime: '',
@@ -143,22 +143,24 @@ export default {
}));
}),
this.FETCH_DATASOURCE('CdLessonSort').then(data => {
- // console.log(data)
- this.dataSource.LessonSortNo = data.data.map(t => ({
+ console.log(data)
+ return this.dataSource.lessonSortNo = data.data.map(t => ({
text: t.lessonsortname,
value: t.lessonsortno
}));
}),
this.FETCH_DATASOURCE('ClassRoomInfo').then(data => {
// console.log(data)
- this.dataSource.ClassRoomNo = data.data.map(t => ({
+ this.dataSource.classRoomNo = data.data.map(t => ({
text: t.classroomname,
- value: t.classroomno
+ value: t.classRoomNo
}));
}),
() => {}
- ]);
+ ]).then(res=>{
+ console.log(res)
+ });
this.userinfo = this.GET_GLOBAL('loginUser'); //获取登录信息
this.pageInfo = this.GET_PARAM(); //获取页面传递参数
@@ -170,12 +172,12 @@ export default {
this.HIDE_LOADING();
this.data = res;
// console.log(res)
- this.queryData.AcademicYearNo = this.pageInfo.AcademicYear;
- this.queryData.Semester = this.pageInfo.Semester;
+ this.queryData.AcademicYearNo = this.pageInfo.academicyear;
+ this.queryData.Semester = this.pageInfo.semester;
this.queryData.StuNo = res.StuNo;
this.queryData.StuName = res.StuName;
this.queryData.Grade = res.Grade;
- this.queryData.EmpNo = res.EmpNo;
+ this.queryData.EmpNo = this.pageInfo.empno;
this.queryData.DeptNo = res.DeptNo;
this.queryData.DeptName = this.displayListItem(res, 'DeptNo');
this.queryData.MajorNo = res.MajorNo;
@@ -185,16 +187,18 @@ export default {
this.queryData.Remark = res.Remark;
this.queryData.LeaveType = '1';
- this.queryData.LessonNo = this.pageInfo.LessonNo;
- this.queryData.LessonName = this.displayListItem(this.pageInfo, 'LessonNo');
+ this.queryData.LessonNo = this.pageInfo.lessonNo;
+ // this.queryData.LessonName = this.displayListItem(this.pageInfo, 'LessonNo');
+ this.queryData.LessonName =this.pageInfo.curriculum;
+ this.queryData.lessonSortNo = this.pageInfo.lessonSortNo;
+ this.queryData.LessonSortName = this.displayListItem(this.pageInfo, 'lessonSortNo');
- this.queryData.LessonSortNo = this.pageInfo.LessonSortNo;
- this.queryData.LessonSortName = this.displayListItem(this.pageInfo, 'LessonSortNo');
+ this.queryData.classRoomNo = this.pageInfo.classRoomNo;
+ // this.queryData.ClassroomName = this.displayListItem(this.pageInfo, 'classRoomNo');
+ this.queryData.ClassroomName = this.pageInfo.classRoom;
- this.queryData.ClassRoomNo = this.pageInfo.ClassRoomNo;
- this.queryData.ClassroomName = this.displayListItem(this.pageInfo, 'ClassRoomNo');
- this.queryData.LessonDate = this.pageInfo.LessonDate;
- this.queryData.LessonTime = this.pageInfo.LessonTime;
+ this.queryData.LessonDate = this.pageInfo.lessonDate;
+ this.queryData.LessonTime = this.pageInfo.lessonTime;
// console.log(res);
// console.log(this.pageInfo);
console.log(this.queryData);
@@ -220,7 +224,10 @@ export default {
displayListItem(item, field) {
const fieldItem = this.scheme[field];
const value = item[field];
-
+
+
+
+
switch (fieldItem.type) {
case 'currentInfo':
case 'organize':
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue
index 1bc43b77d..7fca372e9 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue
@@ -186,7 +186,8 @@
return courseCateByDay;
},
classTap(data) {
- return ""
+ // return ""
+ console.log(data)
let _this = this;
// console.log(_this.user)
if (_this.user.Description == "教师") {