diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index fd3dc1203..9f8498363 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -591,6 +591,43 @@ "navigationBarTitleText": "课表请假管理" } }, + // 按天请假管理 + { + "path": "pages/EducationalAdministration/StuLeaveManagement/list", + "style": { + "navigationBarTitleText": "按天请假管理" + } + }, + { + "path": "pages/EducationalAdministration/StuLeaveManagement/single", + "style": { + "navigationBarTitleText": "详情" + } + }, + { + "path": "pages/EducationalAdministration/StuLeaveManagement/Check/list", + "style": { + "navigationBarTitleText": "学生按天请假审核" + } + }, + { + "path": "pages/PersonnelManagement/CustmerLeave/TeacherLeave/list", + "style": { + "navigationBarTitleText": "普通教师请假统计" + } + }, + { + "path": "pages/PersonnelManagement/CustmerLeave/LeaderLeave/list", + "style": { + "navigationBarTitleText": "中层领导请假统计" + } + }, + { + "path": "pages/EducationalAdministration/StuLeaveManagement/Check/single", + "style": { + "navigationBarTitleText": "审核" + } + }, //疫情详细信息 { "path": "pages/PersonnelManagement/ContactsDetails/list", diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue index 53a913d5a..374ea45e0 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue @@ -3,7 +3,7 @@ - {{ tips }} + {{ tips }} diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/IndexInStudent/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/IndexInStudent/list.vue index 40d5c2d9f..0b8df7c32 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/IndexInStudent/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/IndexInStudent/list.vue @@ -1,453 +1,519 @@ - diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue new file mode 100644 index 000000000..0240f441d --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue @@ -0,0 +1,471 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue new file mode 100644 index 000000000..d03b67a11 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue @@ -0,0 +1,329 @@ + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue new file mode 100644 index 000000000..0323cbf9f --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue @@ -0,0 +1,455 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue new file mode 100644 index 000000000..e4c00d3f5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue @@ -0,0 +1,322 @@ + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue new file mode 100644 index 000000000..6fbf61b1b --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue @@ -0,0 +1,439 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue new file mode 100644 index 000000000..d5c32ac72 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue @@ -0,0 +1,443 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue index be691ca81..4fde22a67 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue @@ -196,15 +196,22 @@ this.HIDE_LOADING(); _this.semester = res.semester _this.dataArr = _this.ProcessingData(res.weekList); - console.log(_this.dataArr) + // console.log(_this.dataArr) // 回显日期 if (!start) { _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); - _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() _this.num = 0; _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); } + // if (!start) { + // _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); + // _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + // _this.num = 0; + // _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); + // _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); + // } }); }, 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 a496cd49a..50709ce63 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 @@ -191,15 +191,22 @@ // 回显日期 if (!start) { _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); - _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + _this.todayWeek.SundayTime = new Date(res.endDate).valueOf(); _this.num = 0; _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); } + // if (!start) { + // _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); + // _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + // _this.num = 0; + // _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); + // _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); + // } - console.log(res) + // console.log(res) _this.dataArr.length = 0; - for(let j = 1; j < 8; j++){ + for(let j = 1; j < 11; j++){ let dataFlag = true; var num = Math.floor(Math.random() * 100000000); res.results.forEach((n, i) => { 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 7fca372e9..15927e262 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 @@ -137,6 +137,7 @@ _this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime; } _this.num = 0; + // console.log(_this.todayWeek.MondayTime) _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); _this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday); @@ -160,14 +161,22 @@ this.HIDE_LOADING(); _this.semester = res.semester _this.dataArr = _this.ProcessingData(res.weekList); - // 回显日期 + // console.log(res) if (!start) { _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); - _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + _this.todayWeek.SundayTime = new Date(res.endDate).valueOf(); _this.num = 0; _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); } + // // 回显日期 + // if (!start) { + // _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); + // _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + // _this.num = 0; + // _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); + // _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); + // } }); }, @@ -187,7 +196,7 @@ }, classTap(data) { // return "" - console.log(data) + // console.log(data) let _this = this; // console.log(_this.user) if (_this.user.Description == "教师") {