From 89f2eaaea756c5a5f8cd42930f4d4ef4c77033ef Mon Sep 17 00:00:00 2001 From: lb01 Date: Fri, 2 Dec 2022 09:20:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AF=BE=E8=A1=A8=E6=98=BE=E7=A4=BA=E8=AF=B7=E5=81=87=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/timeTable/list.vue | 63 ++++++++++++++----- 1 file changed, 48 insertions(+), 15 deletions(-) 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 9574e6578..40172bf34 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 @@ -41,8 +41,17 @@ {{ k.teacher }} + + + 请假 + + + {{LeaveItem(k.checkType)}} + + + - + @@ -54,6 +63,10 @@ + + @@ -72,7 +85,7 @@ num: 0, user: null, weekDayTime: 0, - noClassTime:0, + noClassTime: 0, todayWeek: {}, dataArr: [], weekArr: [{ @@ -137,7 +150,7 @@ timeTap(num) { let _this = this; if (num == 1) { - _this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime ; + _this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime; _this.todayWeek.SundayTime = _this.todayWeek.SundayTime - _this.weekDayTime; } else { _this.todayWeek.MondayTime = _this.todayWeek.MondayTime + _this.weekDayTime; @@ -151,7 +164,7 @@ }, // 获取数据 loadData(start, end) { - if(!this.user) return + if (!this.user) return let { Description, account: Account @@ -209,12 +222,15 @@ if (_this.user.Description == "教师") { //console.log("教师"); } else if (_this.user.Description == "学生") { - let LeaveType = data.LeaveType; - //console.log(LeaveType); - let IsCheck = data.IsCheck; - //console.log(IsCheck); + let LeaveType = data.leaveType; + console.log(LeaveType); + let IsCheck = data.checkType; + console.log(IsCheck); if (LeaveType == "1") { let msg = "请假申请中"; + if(!IsCheck){ + msg = "请假申请中"; + } if (IsCheck == "1") { msg = "请假通过"; } @@ -236,6 +252,15 @@ this.NAV_TO('./leaveFrom', data, true); } } + }, + LeaveItem(data){ + if(!data){ + return '请假申请中' + }else if(data == 1){ + return '请假通过' + }else if(data == 2){ + return '请假未通过' + } } }, created() { @@ -376,7 +401,7 @@ .tSec2ListLi { border-bottom: 1px solid #d5eaf7; overflow: hidden; - height: 60px; + height: 75px; } .tSec2ListL { @@ -385,7 +410,7 @@ height: 100%; width: 20%; text-align: center; - line-height: 36px; + line-height: 58px; padding: 11px 0; font-size: 14px; color: #646464; @@ -409,7 +434,7 @@ .tSec2ListT { color: #3e3e3e; font-size: 15px; - margin: 5px 0; + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -418,22 +443,30 @@ .tSec2ListTxt { color: #888888; font-size: 13px; + margin: 5px 0; } .tSec2Location { width: 38%; float: left; - line-height: 22px; + line-height: 30px; font-size: 13px; color: #888888; display: flex; - flex-direction: column; - } + flex-direction: column; + } .noHtml { height: 100%; - line-height: 60px; + line-height: 75px; text-align: center; font-size: 14px; } + + .tSec2Leave { + padding-left: 10px; + font-size: 15px; + margin-top: 5px; + line-height: 25px; + } From 714ec1ed6850f8a5113a056868c4d0d85cd345e8 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 2 Dec 2022 10:20:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=B7=E5=81=87=E7=AE=A1=E7=90=86=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=AF=B9=E6=8E=A5=E8=80=83=E5=8B=A4=E7=9A=84=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuLeaveManagement/StuLeaveManagementService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs index dd7118f6d..cf574d924 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs @@ -345,8 +345,8 @@ and a.lessondate between '{startTime}' and '{endTime}'"); stuAttendanceEntity.AcademicYearNo = arrangeLessonTerm.AcademicYearNo; stuAttendanceEntity.Semester = arrangeLessonTerm.Semester; stuAttendanceEntity.StuNo = model.CreateUserNo; - stuAttendanceLeave.StuName = arrangeLessonTerm.StuName; - stuAttendanceEntity.Gender = arrangeLessonTerm.GenderNo=="0"?"女":"男"; + stuAttendanceEntity.StuName = arrangeLessonTerm.StuName; + stuAttendanceEntity.Gender = arrangeLessonTerm.GenderNo.ToLower()=="true"?"男":"女"; stuAttendanceEntity.Grade = arrangeLessonTerm.Grade; stuAttendanceEntity.DeptNo = arrangeLessonTerm.DeptNo; stuAttendanceEntity.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)