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)
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;
+ }