diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/list.vue
index f7a0c9843..ec539b4f5 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/list.vue
@@ -102,14 +102,14 @@ export default {
};
if (true) {
_postParam.queryJson = JSON.stringify({
- StuNo: _this.user.account,
- StuMajorNo: _this.user.majorno,
- StuGrade: _this.user.grade
+ StuNo: _this.user.account||undefined,
+ StuMajorNo: _this.user.majorno||undefined,
+ StuGrade: _this.user.grade||undefined
});
}
// console.log(_this.user)
_this.LOADING('加载数据中…')
- _this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, '加载数据时出错').then(res => {
+ _this.HTTP_GET('learun/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, '加载数据时出错').then(res => {
_this.HIDE_LOADING();
// console.log(res);
this.data = this.data.concat(res.rows);
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/list.vue
index 8459c70f7..e3f8f190a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/list.vue
@@ -108,7 +108,7 @@ export default {
});
}
_this.LOADING('加载数据中…')
- _this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, '加载数据时出错').then(res => {
+ _this.HTTP_GET('learun/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, '加载数据时出错').then(res => {
_this.HIDE_LOADING();
// console.log(res);
this.data = this.data.concat(res.rows);
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/list.vue
index 93722987f..733d3cee9 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentSelected/list.vue
@@ -106,7 +106,7 @@ export default {
});
}
_this.LOADING('加载数据中…')
- _this.HTTP_GET('learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/studentpagelist', _postParam, '加载数据时出错').then(res => {
+ _this.HTTP_GET('learun/OpenLessonPlanOfElectiveStudent/studentpagelist', _postParam, '加载数据时出错').then(res => {
_this.HIDE_LOADING();
// console.log(res);
this.data = this.data.concat(res.rows);
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..086abf436 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
@@ -130,7 +130,7 @@ export default {
}),
this.FETCH_DATASOURCE('bjsj').then(data => {
// console.log(data)
- this.dataSource.ClassNo = data.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({
+ this.dataSource.ClassNo = data.data.map(t => ({
text: t.classname,
value: t.classno
}));
@@ -175,14 +175,14 @@ export default {
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;
this.queryData.MajorName = this.displayListItem(res, 'MajorNo');
this.queryData.ClassNo = res.ClassNo;
this.queryData.ClassName = this.displayListItem(res, 'ClassNo');
- this.queryData.Remark = res.Remark;
+ this.queryData.Remark = '';
this.queryData.LeaveType = '1';
this.queryData.LessonNo = this.pageInfo.LessonNo;
@@ -208,10 +208,10 @@ export default {
this.LOADING('保存数据中…');
this.HTTP_POST('learun/adms/EducationalAdministration/StuAttendanceLeave/save', _postData, '加载数据时出错').then(res => {
this.HIDE_LOADING();
- console.log(res)
+ //console.log(res)
if(res){
this.TOAST('提交成功!');
- this.EMIT('timeTable');
+ this.EMIT('timeTable',this.queryData.LessonDate);
this.NAV_BACK();
}
});
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..e71538603 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
@@ -11,40 +11,35 @@
{{todayWeek.Monday}}
-
{{todayWeek.Sunday}}
-
+
-
-
- {{ item.en }}
- {{ item.cn }}
-
+
+ {{ item.en }}
+ {{ item.cn }}
-
-
+
-
- 该时间段没有课表
-
-
-
- 第 {{ k.jc }} 节
+ 该时间段没有课表
+
+
+ 第 {{ k.sectionTime }} 节
- {{ k.curriculum }}
+ {{ k.LessonName }}
+ {{ k.ClassName }}
- {{ k.teacher }}
+ {{ k.EmpName }}
- {{ k.className }}
+ {{ k.ClassroomName }}
@@ -57,364 +52,334 @@