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 index e880eb91f..4c86865a2 100644 --- 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 @@ -43,12 +43,12 @@ 开始时间: - {{ displayListItem(item, "StartTime") }} + {{ itmeDel(displayListItem(item, "StartTime"))}} 结束时间: - {{ displayListItem(item, "EndTime") }} + {{ itmeDel(displayListItem(item, "EndTime")) }} @@ -485,6 +485,10 @@ LeaveTypeItem(data) { }, + itmeDel(data){ + var newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(data) + return newDate[0] + } }, created() { this.user = this.GET_GLOBAL('loginUser'); 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 index 6e1c0e9ae..4ce7433c1 100644 --- 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 @@ -193,8 +193,8 @@ export default { CheckTime:{ type: 'text', title: '审核人' }, CheckUserNo: { type: 'select', title: '审核人',dataSource: '1' }, LeaveType: { type: 'select', title: '请假类型', dataSource: '0' }, - StartTime: { type: 'datetime', title: '开始时间', dateformat: '1' }, - EndTime: { type: 'datetime', title: '结束时间', dateformat: '1' }, + StartTime: { type: 'datetime', title: '开始时间', dateformat: '0' }, + EndTime: { type: 'datetime', title: '结束时间', dateformat: '0' }, LeaveDay: { type: 'number', title: '请假天数',verify:"NumOrNull" }, LeaveReason: { type: 'texteditor', title: '请假事由' }, CreateUserNo: { type: 'text', title: '学号' }, 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 50709ce63..af8cd70a1 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 @@ -45,7 +45,7 @@ {{ k.ClassRoomName }} + :class="k.Sort == '迟到'? 'studCheckStatue5' : k.Sort == '早退'? 'studCheckStatue2' : k.Sort == '病假'? 'studCheckStatue4' : k.Sort == '事假'? 'studCheckStatue6' : k.Sort == '准时'? 'studCheckStatue1' : 'studCheckStatue3' "> {{ k.Sort }} @@ -420,7 +420,23 @@ .studCheckStatue4 text { background: #29cf41; } - + + .studCheckStatue5 { + color: #ad5151; + } + + .studCheckStatue5 text { + background: #ad5151; + } + + .studCheckStatue6 { + color: #84f193; + } + + .studCheckStatue6 text { + background: #84f193; + } + .noHtml { height: 100%; line-height: 60px;