app 学生考勤打卡 教师考勤打卡修改

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue

@@ -150,12 +150,12 @@
 				// }else {
 				// 	this.imgsrc=dkred;
 				// }
+				// 保存原打卡状态
+				this.resInfo = {
+					AttendanceType:this.info.AttendanceType,
+					AttendanceTypeString:this.info.AttendanceTypeString,
+				}
 				if (![5].includes(this.info.AttendanceType)) {
-					// 保存原打卡状态，改为外勤
-					this.resInfo = {
-						AttendanceType:this.info.AttendanceType,
-						AttendanceTypeString:this.info.AttendanceTypeString,
-					}
 					this.$set(this.info, 'AttendanceType', 4)
 					this.$set(this.info, 'AttendanceTypeString', '外勤打卡')
 					this.$set(this.postData, 'AIsOut', 1)
@@ -287,23 +287,24 @@
 		width: 100%;
 		background-color: #fff;
 	}
-
+	
 	.content {
-		width: 48%;
+		width: 100%;
 		height: 50%;
 		position: absolute;
 		top: 15%;
 		left: 50%;
 		transform: translate(-50%, 10%);
+		text-align: center;
 	}
-
+	
 	.title {
 		font-size: 14px;
 		text-align: center;
 		color: #333;
 		margin-top: 8px;
 	}
-
+	
 	.rules {
 		display: flex;
 		justify-content: space-between;
@@ -311,33 +312,31 @@
 		padding: 15px;
 		line-height: 24px;
 	}
-
+	
 	.rules>* {
 		width: 49%;
 		background-color: #BDE4FF;
 		padding: 8px;
 		border-radius: 8px 12px;
 	}
-
+	
 	.rules>*>*:first-child {
 		color: #333;
 	}
-
+	
 	#show {
 		text-align: center;
 		height: 200rpx;
 		font-size: 56rpx;
 	}
-
+	
 	.pen {
-		// height: 48%;
+		width: 48%;
+		display: inline-block;
 		border-radius: 50%;
 		background-color: #e7f5ff;
-		display: flex;
-		align-items: center;
-		justify-content: center;
 	}
-
+	
 	.pen2 {
 		width: 91%;
 		height: 91%;
@@ -347,7 +346,7 @@
 		align-items: center;
 		justify-content: center;
 	}
-
+	
 	.pen3 {
 		width: 84%;
 		height: 84%;
@@ -360,7 +359,7 @@
 		justify-content: center;
 		color: #ffff;
 	}
-
+	
 	.footer {
 		width: 100%;
 		position: fixed;
@@ -368,7 +367,7 @@
 		bottom: 0;
 		overflow: hidden;
 	}
-
+	
 	.gray {
 		-webkit-filter: grayscale(100%);
 		-moz-filter: grayscale(100%);

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single.vue

@@ -130,7 +130,7 @@
 						console.log(postData)
 						let strEntity = JSON.parse(postData.strEntity)
 						let strEntity_ = {...strEntity,...this.params}
-						this.HTTP_POST('learun/adms/attendance/clockin', {strEntity:JSON.stringify(strEntity_)}, '打卡失败').then(success => {
+						this.HTTP_POST('learun/adms/attendance/clockin', JSON.stringify(strEntity_), '打卡失败').then(success => {
 							this.HIDE_LOADING()
 							if (!success) {
 								this.TOAST('打卡失败')

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue

@@ -15,7 +15,7 @@
 						下课 {{info.EndTime}}
 					</view>
 					<view class="">
-						{{info.UserCloseTime?info.UserCloseTime.split(' ')[1]+' 打卡':'未打卡'}}
+						{{info.UserCloseTime?info.UserCloseTime.split(' ')[1]+' 打卡':'--'}}
 					</view>
 				</view>
 			</view>
@@ -25,16 +25,20 @@
 					<img :class="{gray:info.AttendanceType != 1}" id="attimg" :src="imgsrc" alt="" width="100%">
 				</view>
 				<view class="title">
-					
 					<text>{{resInfo.AttendanceTypeString}}</text>
-					<text>{{postData.AIsOut== 1 ? ' | ' + info.AttendanceTypeString:''}}</text>
+					<text>{{postData.AIsOut == 1 ? ' | ' + info.AttendanceTypeString:''}}</text>
 					<view style="color: #666;">
-						{{postData.ClockPlace}}
-						<view class="">
-							{{info.LessonSortNo == 1?'必修:':info.LessonSortNo == 2?'选修:':''}} {{info.LessonName}}
+						<view>
+							{{info.Classroom?'教室:'+info.Classroom:''}}
+						</view>
+						<view>
+							{{info.LessonName}} {{info.LessonSortNo == 1?'必修':info.LessonSortNo == 2?'选修':''}}
 						</view>
-						<view class="">
-							教师:{{info.EmpName}}
+						<view>
+							{{info.EmpName?'教师:'+info.EmpName:''}}
+						</view>
+						<view>
+							{{postData.ClockPlace}}
 						</view>
 					</view>
 				</view>
@@ -117,6 +121,10 @@
 			async action(type) {
 				switch (type) {
 					case 'dk':
+						if (this.info.UserWorkTime) {
+							this.TOAST('已打卡，不可再次打卡')
+							return
+						}
 						if ([5].includes(this.info.AttendanceType)) {
 							return
 						}
@@ -161,12 +169,12 @@
 				// }else {
 				// 	this.imgsrc=dkred;
 				// }
+				// 保存原打卡状态
+				this.resInfo = {
+					AttendanceType:this.info.AttendanceType,
+					AttendanceTypeString:this.info.AttendanceTypeString,
+				}
 				if (![5].includes(this.info.AttendanceType)) {
-					// 保存原打卡状态，改为外勤
-					this.resInfo = {
-						AttendanceType:this.info.AttendanceType,
-						AttendanceTypeString:this.info.AttendanceTypeString,
-					}
 					this.$set(this.info, 'AttendanceType', 4)
 					this.$set(this.info, 'AttendanceTypeString', '外勤打卡')
 					this.$set(this.postData, 'AIsOut', 1)
@@ -304,12 +312,13 @@
 	}
 
 	.content {
-		width: 48%;
+		width: 100%;
 		height: 50%;
 		position: absolute;
 		top: 15%;
 		left: 50%;
 		transform: translate(-50%, 10%);
+		text-align: center;
 	}
 
 	.title {
@@ -345,12 +354,10 @@
 	}
 
 	.pen {
-		// height: 48%;
+		width: 48%;
+		display: inline-block;
 		border-radius: 50%;
 		background-color: #e7f5ff;
-		display: flex;
-		align-items: center;
-		justify-content: center;
 	}
 
 	.pen2 {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/single.vue

@@ -130,7 +130,7 @@
 						console.log(postData)
 						let strEntity = JSON.parse(postData.strEntity)
 						let strEntity_ = {...strEntity,...this.params}
-						this.HTTP_POST('learun/adms/attendance/clockinStudent', {strEntity:JSON.stringify(strEntity_)}, '打卡失败').then(success => {
+						this.HTTP_POST('learun/adms/attendance/clockinStudent', JSON.stringify(strEntity_), '打卡失败').then(success => {
 							this.HIDE_LOADING()
 							if (!success) {
 								this.TOAST('打卡失败')