From 39de0e7a6baafe452a4c8bed8fc95ae2de91b084 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 27 Feb 2018 11:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=A1=AE=E8=AE=A4=E6=A1=86=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/requestList.jsp  | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 08ad9d2b6..7d284aaf4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -117,12 +117,12 @@
 								      <!-- 审核未通过可修改 -->
 								        	<c:choose>
 									        	<c:when test="${requestInfo.isAudit eq '1'}">
-											        <li><a href="javascript:void(0);" onclick="return confirmx('requestCancelExamine', ${requestInfo.id})"><spring:message code="cancel"></spring:message></a></li>
+											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id="+${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:otherwise>
-											        <li><a href="javascript:void(0);" onclick="return confirmx('requestExamine', ${requestInfo.id})"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="javascript:void(0);" onclick="return confirmx('form', ${requestInfo.id})"><spring:message code="update_request"></spring:message></a></li>
-								        			<li><a href="javascript:void(0);" onclick="return confirmx('delete', ${requestInfo.id})"><spring:message code="delete"></spring:message></a></li>
+											        <li><a href="${ctx}/cfg/request/requestExamine?id="+${requestInfo.id} onclick="return confirmx('确定吗？', this.href)"><spring:message code="approved"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/request/form?id="+${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="update_request"></spring:message></a></li>
+								        			<li><a href="${ctx}/cfg/request/delete?id="+${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:otherwise>
 								        	</c:choose>
 									      </ul>
@@ -155,24 +155,6 @@
 		$("#searchForm").submit();
 		return false;
 	}
-	//确认框
-	function confirmx(m,id){
-		var submit = function (v, h, f) {
-		    if (v == 'ok'){
-		    	window.location='${ctx}/cfg/request/'+m+"?id="+id;
-		        jBox.tip(v, 'info');
-		    }
-		    else if (v == 'cancel')
-		        jBox.tip(v, 'info');
-		    return true; //close
-		};
-		
-		top.$.jBox.confirm("确定吗？", "提示", submit);
-		
-		top.$('.jbox-button-panel').css('height','auto'); 
-		top.$('.jbox-title-panel').css('height','32px'); 
-		top.$('.jbox-content').css('font-size','16px'); 
-	}
 	 
 </script>
 <style>