Explorar el Código

访客通行微信端简化流程功能制作完成

黄勇成 hace 2 años
padre
commit
1b5188585c

+ 24 - 23
src/main/webapp/WEB-INF/pages/wechat/visitordetails.jsp

@@ -27,6 +27,30 @@
 <input type="hidden" id="visitorQrCode" value="${result.visitorQrCode}" />
 <input type="hidden" id="passList" value="${passList}" />
 <body>
+
+	<c:if test="${ result.visitorOrderStatus==1 && (fn:contains(passType,'2'))}">
+		<div class="code-wp" style="margin-top: 15px;">
+			<div class="title">
+				<h6 class="throuth_code">通行码</h6>
+				<span class="throuth_code_tip">可在闸机二维码读头设备处扫码通行</span>
+			</div>
+			<div class="qrcode_img_wrap">
+				<div id="visitorCode"></div>
+			</div>
+			<div class="tip">二维码当日有效,截止当日时间23:59:59</div>
+		</div>
+	</c:if>
+
+	<c:if test="${ result.visitorOrderStatus==1 && (fn:contains(passType,'3'))}">
+		<div class="code-wp" style="margin-top: 15px;">
+			<div class="title throuth_code">请在客服处扫码打印访客单</div>
+			<div class="qrcode_img_wrap">
+				<div id="code"></div>
+			</div>
+			<div class="tip">二维码当日有效,截止当日时间23:59:59</div>
+		</div>
+	</c:if>
+
 	<div class="topstyle">
 		<c:if test="${type != '3' }">
 			<c:if test="${result.visitorOrderStatus==0 }">
@@ -118,29 +142,6 @@
 		</c:if>
 	</div>
 
-	<c:if test="${ result.visitorOrderStatus==1 && (fn:contains(passType,'2'))}">
-		<div class="code-wp">
-			<div class="title">
-				<h6 class="throuth_code">通行码</h6>
-				<span class="throuth_code_tip">可在闸机二维码读头设备处扫码通行</span>
-			</div>
-			<div class="qrcode_img_wrap">
-				<div id="visitorCode"></div>
-			</div>
-			<div class="tip">二维码当日有效,截止当日时间23:59:59</div>
-		</div>
-	</c:if>
-
-	<c:if test="${ result.visitorOrderStatus==1 && (fn:contains(passType,'3'))}">
-		<div class="code-wp">
-			<div class="title throuth_code">请在客服处扫码打印访客单</div>
-			<div class="qrcode_img_wrap">
-				<div id="code"></div>
-			</div>
-			<div class="tip">二维码当日有效,截止当日时间23:59:59</div>
-		</div>
-	</c:if>
-
 	<c:if test="${not empty passList}">
 		<div class="pass-wp">
 			<h6 class="title">通行记录</h6>

+ 3 - 1
src/main/webapp/WEB-INF/pages/wechat/visitorform.jsp

@@ -43,6 +43,8 @@
 <input type="hidden" id="visitedMobileType" value="${visitedMobileType }" />
 <input type="hidden" id="visitCompType" value="${visitCompType}" />
 <input type="hidden" id="visitNameType" value="${visitNameType}" />
+<input type="hidden" id="orderAffirm" value="${orderAffirm}" />
+
 <body>
 	<form:form action="${ctx }/wechat/visitor/saveVisitorUserInfo" method="post" id="saveuserform">
 		<div class="outDiv">
@@ -222,7 +224,7 @@
 	</form:form>
 </body>
 
-<script type="text/javascript" src="${ctx }/scripts/visitor/visitor.js?v=20220225.1"></script>
+<script type="text/javascript" src="${ctx }/scripts/visitor/visitor.js?v=20220613.1"></script>
 <script type="text/javascript" src="${ctx }/plugin/mobileSelector/js/mPicker.min.js"></script>
 
 </html>

+ 46 - 48
src/main/webapp/WEB-INF/pages/wechat/visitorinfo.jsp

@@ -39,6 +39,51 @@
 		<input type="hidden" id="passType" value="${passType}" />
 
 		<div class="bottomView" style="background:transparent;box-shadow: none;">
+			<c:if test="${fn:contains(passType,'0')}">
+				<div class="clearfix">
+					<p class="title" style="">
+						<c:if test="${visitorInfo.visitorAccount==0 }">
+							<c:if test="${empty visitorInfo.imageUrL }">
+								请使用密码进入
+							</c:if>
+						</c:if>
+						<c:if test="${visitorInfo.visitorAccount==0 }">
+							<c:if test="${not empty visitorInfo.imageUrL }">
+								直接刷脸进入,无需排队
+							</c:if>
+						</c:if>
+						<c:if test="${visitorInfo.visitorAccount==1 }">
+							<c:if test="${empty visitorInfo.imageUrL }">
+								添加头像, 直接刷脸进入,无需排队
+							</c:if>
+						</c:if>
+					</p>
+					<p class="reservationCode" style="">预约码</p>
+					<p class="reservationCodeNum" style="">${visitorInfo.visitorPassword }</p>
+					<p class="titles" style="">通行卡兑换凭证</p>
+					<p class="reservationCodeTime" style="">有效时间:${dateweek }&nbsp;${visitorInfo.week }&nbsp;
+							${visitorInfo.toDate }</p>
+				</div>
+			</c:if>
+			<c:if test="${fn:contains(passType,'2')}">
+				<div class="qrcode_wrap" style="font-size: 18px;color: #007BFF;background: #ffffff;border-bottom-right-radius: 10px;border-bottom-left-radius:10px">
+					<p class="qrcode_title" style="padding-bottom:10px">通行码</p>
+					<p style="font-size: 15px;color: #333333;text-align:center;padding-bottom:10px">可在闸机二维码读头设备处扫码通行</p>
+					<div class="qrcode_img_wrap">
+						<div id="visitorCode"></div>
+					</div>
+					<p class="qrcode_tip ">二维码当日有效,截止当日时间23:59:59</p>
+				</div>
+			</c:if>
+			<c:if test="${fn:contains(passType,'3')}">
+				<div class="qrcode_wrap" style="margin-top: 20px;font-size: 18px;color: #007BFF;background: #ffffff;border-radius: 10px;">
+					<p class="qrcode_title">请在客服处扫码打印访客单</p>
+					<div class="qrcode_img_wrap">
+						<div id="code"></div>
+					</div>
+					<p class="qrcode_tip ">二维码当日有效,截止当日时间23:59:59</p>
+				</div>
+			</c:if>
 			<div class="net" style="padding-top: 20px;border-top-right-radius: 10px;border-top-left-radius:10px">
 				<p class="welcomeSty" style="font-size: 30px;">欢迎到访</p>
 				<div class="headTime" style="font-size: 15px;">
@@ -114,53 +159,6 @@
 
 				</div>
 			</div>
-			
-			<c:if test="${fn:contains(passType,'0')}">
-				<div class="clearfix">
-					<p class="title" style="">
-						<c:if test="${visitorInfo.visitorAccount==0 }">
-							<c:if test="${empty visitorInfo.imageUrL }">
-								请使用密码进入
-							</c:if>
-						</c:if>
-						<c:if test="${visitorInfo.visitorAccount==0 }">
-							<c:if test="${not empty visitorInfo.imageUrL }">
-								直接刷脸进入,无需排队
-							</c:if>
-						</c:if>
-						<c:if test="${visitorInfo.visitorAccount==1 }">
-							<c:if test="${empty visitorInfo.imageUrL }">
-								添加头像, 直接刷脸进入,无需排队
-							</c:if>
-						</c:if>
-					</p>
-					<p class="reservationCode" style="">预约码</p>
-					<p class="reservationCodeNum" style="">${visitorInfo.visitorPassword }</p>
-					<p class="titles" style="">通行卡兑换凭证</p>
-					<p class="reservationCodeTime" style="">有效时间:${dateweek }&nbsp;${visitorInfo.week }&nbsp;
-						${visitorInfo.toDate }</p>
-				</div>
-			</c:if>
-
-			<c:if test="${fn:contains(passType,'2')}">
-				<div class="qrcode_wrap" style="font-size: 18px;color: #007BFF;background: #ffffff;border-bottom-right-radius: 10px;border-bottom-left-radius:10px">
-					<p class="qrcode_title" style="padding-bottom:10px">通行码</p>
-					<p style="font-size: 15px;color: #333333;text-align:center;padding-bottom:10px">可在闸机二维码读头设备处扫码通行</p>
-					<div class="qrcode_img_wrap">
-						<div id="visitorCode"></div>
-					</div>
-					<p class="qrcode_tip ">二维码当日有效,截止当日时间23:59:59</p>
-				</div>
-			</c:if>
-			<c:if test="${fn:contains(passType,'3')}">
-				<div class="qrcode_wrap" style="margin-top: 20px;font-size: 18px;color: #007BFF;background: #ffffff;border-radius: 10px;">
-					<p class="qrcode_title">请在客服处扫码打印访客单</p>
-					<div class="qrcode_img_wrap">
-						<div id="code"></div>
-					</div>
-					<p class="qrcode_tip ">二维码当日有效,截止当日时间23:59:59</p>
-				</div>
-			</c:if>
 		</div>
 		<!-- face++ -->
 		<c:if test="${fn:contains(passType,'1')}">
@@ -227,4 +225,4 @@
 
 </script>
 
-</html>
+</html>

+ 89 - 80
src/main/webapp/WEB-INF/pages/wechat/visitorlist.jsp

@@ -21,6 +21,7 @@
 <input type="hidden" id="passType" value="${passType}" />
 <script type="text/javascript">
 	$(document).ready(function () {
+		$("#divContent").hide();
 		$(window).resize(infinite);
 		sessionStorage.setItem('passType', $("#passType").val())
 		let strOpenId = getUrlParam('openId');
@@ -29,6 +30,7 @@
 		let strDevelopId = getUrlParam('developId');
 		let strState = getUrlParam('state');
 		let strUserToken = getUrlParam('userToken');
+		let isForm = sessionStorage.getItem('isFrom') || 0
 
 		if (strOpenId) {
 			sessionStorage.setItem('openId',strOpenId)
@@ -77,6 +79,11 @@
 //			}
             $("#addVisitorform").submit();
 		});
+		if (isForm == 1) {
+			$("#addVisitorform").submit();
+		} else {
+			$("#divContent").show();
+		}
 	});
 
 	function getVisitorInfoList(val) {
@@ -88,90 +95,92 @@
 </script>
 
 <body>
-	<input type="hidden" id="ctx" value="${ctx }" />
-	<input type="hidden" id="status" value="${status }" />
-	<form:form action="${ctx}/wechat/appUser/choiceOrgAddress" method="get" id="renzhenform">
-		<input type="hidden" name="userId" value="${userId }" />
-		<input type="hidden" name="openId" value="${openId }" />
-		<input type="hidden" name="developId" value="${developId }" />
-		<input type="hidden" name="organizationId" value="${organizationId }" />
-		<input type="hidden" name="passType" value="${passType}">
-	</form:form>
-	<c:if test="${not empty reslutMap}">
-		<div class="sumit_item has-vositor">
-			<c:if test="${type == 2}" var="whiteType">
-				<input class="submit_img_f submit_add" type="button" name="" id="addvistor" value="">
-			</c:if>
-			<c:if test="${!whiteType}">
-				<input class="submit_img submit_add" type="button" name="" id="addvistor" value="">
-			</c:if>
-			<form:form action="${ctx}/wechat/visitor/addVisitor" method="get" id="addVisitorform" style="display:none">
-				<input type="hidden" name="openId" value="${openId }" />
-			</form:form>
-		</div>
-		<c:forEach items="${reslutMap }" var="model">
-			<div>
-				<p class="time_remark current_time">
-					<span>
-						<c:if test="${not empty model.week }">${model.week }</c:if>
-					</span> <span>${model.dateTime }</span> <span>${model.weekDay }</span>
-				</p>
-				<ul>
-					<c:forEach items="${model.orderList }" var="orderModel">
-						<li class="recode_item " onclick="getVisitorInfoList(${orderModel.visitorOrderId})">
-							<div class="top">
-								<span class="visited_name">${orderModel.visitorInfo.visitorName}</span>
-								<span class="visited_count">${orderModel.count }人</span>
-								<c:if test="${orderModel.visitorOrderStatus==0}">
-									<sapn class="visitor_state">未授权</sapn>
-								</c:if>
-								<c:if test="${orderModel.visitorOrderStatus==1 }">
-									<sapn class="visitor_state_ok">已授权</sapn>
-								</c:if>
-								<c:if test="${orderModel.visitorOrderStatus==2}">
-									<sapn class="visitor_state">未通过</sapn>
-								</c:if>
-							</div>
-							<div class="bottom">
-								<sapn class="visitor_time">${orderModel.visitorTime}</sapn>
-								<span class="visited_company">${orderModel.visitorInfo.visitorCompanyName }</span>
-							</div>
-						</li>
+	<div id="divContent">
+		<input type="hidden" id="ctx" value="${ctx }" />
+		<input type="hidden" id="status" value="${status }" />
+		<form:form action="${ctx}/wechat/appUser/choiceOrgAddress" method="get" id="renzhenform">
+			<input type="hidden" name="userId" value="${userId }" />
+			<input type="hidden" name="openId" value="${openId }" />
+			<input type="hidden" name="developId" value="${developId }" />
+			<input type="hidden" name="organizationId" value="${organizationId }" />
+			<input type="hidden" name="passType" value="${passType}">
+		</form:form>
+		<c:if test="${not empty reslutMap}">
+			<div class="sumit_item has-vositor">
+				<c:if test="${type == 2}" var="whiteType">
+					<input class="submit_img_f submit_add" type="button" name="" id="addvistor" value="">
+				</c:if>
+				<c:if test="${!whiteType}">
+					<input class="submit_img submit_add" type="button" name="" id="addvistor" value="">
+				</c:if>
+				<form:form action="${ctx}/wechat/visitor/addVisitor" method="get" id="addVisitorform" style="display:none">
+					<input type="hidden" name="openId" value="${openId }" />
+				</form:form>
+			</div>
+			<c:forEach items="${reslutMap }" var="model">
+				<div>
+					<p class="time_remark current_time">
+						<span>
+							<c:if test="${not empty model.week }">${model.week }</c:if>
+						</span> <span>${model.dateTime }</span> <span>${model.weekDay }</span>
+					</p>
+					<ul>
+						<c:forEach items="${model.orderList }" var="orderModel">
+							<li class="recode_item " onclick="getVisitorInfoList(${orderModel.visitorOrderId})">
+								<div class="top">
+									<span class="visited_name">${orderModel.visitorInfo.visitorName}</span>
+									<span class="visited_count">${orderModel.count }人</span>
+									<c:if test="${orderModel.visitorOrderStatus==0}">
+										<sapn class="visitor_state">未授权</sapn>
+									</c:if>
+									<c:if test="${orderModel.visitorOrderStatus==1 }">
+										<sapn class="visitor_state_ok">已授权</sapn>
+									</c:if>
+									<c:if test="${orderModel.visitorOrderStatus==2}">
+										<sapn class="visitor_state">未通过</sapn>
+									</c:if>
+								</div>
+								<div class="bottom">
+									<sapn class="visitor_time">${orderModel.visitorTime}</sapn>
+									<span class="visited_company">${orderModel.visitorInfo.visitorCompanyName }</span>
+								</div>
+							</li>
 
-					</c:forEach>
-					<form:form action="${ctx }/wechat/visitor/getVisitorInfoList" method="post" id="getVisitorInfoform">
-						<input type="hidden" name="visitorOrderId" id="visitorOrderId" />
-						<input type="hidden" name="type" value="${type }" />
-						<input type="hidden" name="passType" value="${passType}">
+						</c:forEach>
+						<form:form action="${ctx }/wechat/visitor/getVisitorInfoList" method="post" id="getVisitorInfoform">
+							<input type="hidden" name="visitorOrderId" id="visitorOrderId" />
+							<input type="hidden" name="type" value="${type }" />
+							<input type="hidden" name="passType" value="${passType}">
+						</form:form>
+					</ul>
+				</div>
+			</c:forEach>
+		</c:if>
+		<c:if test="${empty reslutMap }">
+			<div class="no-visitor-wp">
+				<div class="sumit_item">
+					<c:if test="${type == 2}" var="whiteType">
+						<input class="submit_img_f submit_add" type="button" name="" id="addvistor" value="">
+					</c:if>
+					<c:if test="${!whiteType}">
+						<input class="submit_img submit_add" type="button" name="" id="addvistor" value="">
+					</c:if>
+					<form:form action="${ctx}/wechat/visitor/addVisitor" method="get" id="addVisitorform" style="display:none">
+						<input type="hidden" name="openId" value="${openId }" />
 					</form:form>
-				</ul>
+				</div>
+				<div style="width:100%;height:100%;text-align: center;font-size: 1.5rem;font-weight: 600">
+					暂无预约,点击按钮添加预约
+						<%-- <img src="${ctx }/images/visitor/wujilu.png" style="width: 45%; margin: 2rem auto 0; "> --%>
+				</div>
 			</div>
-		</c:forEach>
-	</c:if>
-	<c:if test="${empty reslutMap }">
-		<div class="no-visitor-wp">
-			<div class="sumit_item">
-			<c:if test="${type == 2}" var="whiteType">
-				<input class="submit_img_f submit_add" type="button" name="" id="addvistor" value="">
-			</c:if>
-			<c:if test="${!whiteType}">
-				<input class="submit_img submit_add" type="button" name="" id="addvistor" value="">
-			</c:if>
-			<form:form action="${ctx}/wechat/visitor/addVisitor" method="get" id="addVisitorform" style="display:none">
-				<input type="hidden" name="openId" value="${openId }" />
-			</form:form>
-		</div>
-		<div style="width:100%;height:100%;text-align: center;font-size: 1.5rem;font-weight: 600">
-			暂无预约,点击按钮添加预约
-			<%-- <img src="${ctx }/images/visitor/wujilu.png" style="width: 45%; margin: 2rem auto 0; "> --%>
-		</div>
-		</div>
 
-	</c:if>
-	<div id="tcc" class="tcbj1" style="display:none;">
-		<div class="tcck1">
-			<div class="load-container load4">
-				<div class="loader">Loading...</div>
+		</c:if>
+		<div id="tcc" class="tcbj1" style="display:none;">
+			<div class="tcck1">
+				<div class="load-container load4">
+					<div class="loader">Loading...</div>
+				</div>
 			</div>
 		</div>
 	</div>

+ 8 - 0
src/main/webapp/scripts/visitor/visitor.js

@@ -14,6 +14,7 @@ var visitedCompType = $("#visitedCompType").val() // 被访人公司 1-必填;
 var visitedMobileType = $("#visitedMobileType").val() // 被访人手机号 1-必填;2-选填;3-不展示;
 var visitCompType = $("#visitCompType").val() // 访客公司 1-必填;2-选填;3-不展示;
 var visitNameType = $("#visitNameType").val() // 访客姓名 1-必填;2-选填;3-不展示;
+var orderAffirm = $("#orderAffirm").val() // 预约信息确认 1-需要确认; 0-不需要确认
 
 $(function () {
 	if (!passType) {
@@ -26,6 +27,8 @@ $(function () {
 	console.log('visitedMobileType == ', visitedMobileType);
 	console.log('visitCompType == ', visitCompType);
 	console.log('visitNameType == ', visitNameType);
+	console.log('orderAffirm == ', orderAffirm);
+
 	//initDate();
 	changeStyle()
 	isShare()
@@ -605,6 +608,11 @@ function saveInfo(strcount) {
 		}
 	}
 	$("#companycount").html(companyName + " &nbsp;&nbsp; 共有" + count + "位到访");
+
+	if (orderAffirm == 0) {
+		saveVisitorInfo();
+		return;
+	}
 	$(".outDiv").hide();
 	$("#div2").show();