zc

pages_manage/views/accessQualification/accessQualification.vue

@@ -21,7 +21,7 @@
 							:class="minItem.auditStatus==1?'titleType1':(minItem.auditStatus==0?'titleType2':(minItem.auditStatus==2?'titleType3':''))">
 							{{minItem.auditStatus==1?'未通过':(minItem.auditStatus==0?'待审核':(minItem.auditStatus==2?'已通过':''))}}
 						</view>
-						<view>{{minItem.subName}}</view>
+						<view>{{minItem.subName}}{{minItem.roomNum?'('+minItem.roomNum+')':''}}</view>
 					</view>
 					<view class="min-for-box-two">
 						<view></view>

pages_manage/views/accessQualification/accessQualificationInfo.vue

@@ -4,7 +4,7 @@
 		<view class="user-info-box">
 			<view class="user-info-box-min">
 				<view>实验室：</view>
-				<view>{{newData.labSecurityApply.subName}}</view>
+				<view>{{newData.labSecurityApply.subName}}{{newData.labSecurityApply.roomNum?'('+newData.labSecurityApply.roomNum+')':''}}</view>
 			</view>
 			<view class="user-info-box-min">
 				<view>申请人：</view>

pages_student/views/accessApplication/applicationDetails.vue

@@ -4,7 +4,7 @@
 		<view class="user-info-box">
 			<view class="user-info-box-min">
 				<view>实验室：</view>
-				<view>{{subjectData.labSecurityApply.subName}}</view>
+				<view>{{subjectData.labSecurityApply.subName}}{{subjectData.labSecurityApply.roomNum?'('+subjectData.labSecurityApply.roomNum+')':''}}</view>
 			</view>
 			<view class="user-info-box-min" style="flex-direction: column;">
 				<view>申请时限：</view>

pages_student/views/accessApplication/newApplication.vue

@@ -379,6 +379,17 @@
 					});
 					return
 				}
+				let playTime = Math.floor(new Date(this.validBeginTime).getTime() / 1000);
+				let endTime = Math.floor(new Date(this.validEndTime).getTime() / 1000);
+				if(playTime > endTime){
+					uni.showToast({
+						title: '开始时间不能大于结束时间',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
 				// if (!this.sysUser.cardNumSimple) {
 				// 	uni.showToast({
 				// 		title: '请输入物理卡号',

pages_student/views/accessApplication/safeAccess.vue

@@ -8,7 +8,7 @@
 						:class="item.auditStatus==0?'typeColor1':(item.auditStatus==1?'typeColor2':(item.auditStatus==2?'typeColor3':''))">
 						{{item.auditStatus==0?'待审核':(item.auditStatus==1?'未通过':(item.auditStatus==2?'已通过':''))}}
 					</view>
-					<view>{{item.subName}}准入申请</view>
+					<view>{{item.subName}}{{item.roomNum?'('+item.roomNum+')':''}}准入申请</view>
 				</view>
 				<view class="time-box">
 					<view></view>