From 74c4912f9488074d0f09f1c06908b43c60d26d65 Mon Sep 17 00:00:00 2001
From: lb01 <Vimicro@lb>
Date: Mon, 28 Nov 2022 16:35:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F=E6=8C=89?=
 =?UTF-8?q?=E5=A4=A9=E8=AF=B7=E5=81=87=E9=A1=B5=E9=9D=A2=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=AD=A6=E7=94=9F=20=E8=AF=B7=E5=81=87?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuLeaveManagement/Check/list.vue         |  8 ++++++--
 .../StuLeaveManagement/Check/single.vue       |  4 ++--
 .../pages/studentCheck/list.vue               | 20 +++++++++++++++++--
 3 files changed, 26 insertions(+), 6 deletions(-)

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 @@
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">开始时间：</text>
-							{{ displayListItem(item, "StartTime") }}
+							{{ itmeDel(displayListItem(item, "StartTime"))}}
 						</view>
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">结束时间：</text>
-							{{ displayListItem(item, "EndTime") }}
+							{{ itmeDel(displayListItem(item, "EndTime"))  }}
 						</view>
 
 						<view class="customlist-item-field">
@@ -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 }}
 							</view>
 						 <view class="studCheckStatue"
-								:class="k.Sort == '迟到'? 'studCheckStatue2' : k.Sort == '早退'? 'studCheckStatue2' : k.Sort == '病假'? 'studCheckStatue4' : k.Sort == '事假'? 'studCheckStatue2' : k.Sort == '准时'? 'studCheckStatue1' : 'studCheckStatue3' ">
+								:class="k.Sort == '迟到'? 'studCheckStatue5' : k.Sort == '早退'? 'studCheckStatue2' : k.Sort == '病假'? 'studCheckStatue4' : k.Sort == '事假'? 'studCheckStatue6' : k.Sort == '准时'? 'studCheckStatue1' : 'studCheckStatue3' ">
 								<text></text> {{ k.Sort }}
 							</view>
 						</view>
@@ -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;