From 8198bca01ae5d0e2946c822c29086a715a545bcd Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Mon, 26 Feb 2018 16:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E5=87=BD=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=9D=A5=E5=87=BD=E6=97=B6=E9=97=B4=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9sql=20,=E4=BF=AE=E6=94=B9=E6=88=90=E5=8A=9F=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/RequestInfoController.java  |  2 +-
 .../web/dao/configuration/RequestInfoDao.xml  |  4 +--
 .../webapp/WEB-INF/views/cfg/requestList.jsp  | 31 +++++++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
index 0f357a37f..1aab4a8bd 100644
--- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
+++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
@@ -59,7 +59,7 @@ public class RequestInfoController extends BaseController{
 			if(requestInfo.getId()!=null){
 				// 保存用户信息
 				requestInfoService.saveOrUpdate(requestInfo);
-				addMessage(redirectAttributes, "保存success");
+				addMessage(redirectAttributes, "success");
 			}else{
 				if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
 					addMessage(model, "error");
diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index e00d97e6e..63390a446 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -57,10 +57,10 @@
 	<if test="isAudit != null">
 			AND r.is_audit=${isAudit}
 	</if>
-	<if test=" timeType = 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
+	<if test=" timeType == 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
 			AND r.request_time between #{beginDate} and #{endDate}
  	</if>
-	<if test="timeType = 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
+	<if test="timeType == 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
 			AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
 	</if> 
 	order by r.request_time desc
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 3fb796fc6..08ad9d2b6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -47,7 +47,7 @@
 							</select> <input id="intype">
 							 
 							<form:select id="timeType" name="timeType" path="timeType">
-								<form:option value=""></form:option>
+<%-- 								<form:option value=""></form:option> --%>
 								<form:option value="requestTime"><spring:message code="request_time"></spring:message></form:option>
 								<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
 							</form:select> 
@@ -67,7 +67,7 @@
 
 					<!-- <div class="table-responsive"> -->
 					<sys:message content="${message}"/>
-						<table id="contentTable" class="table table-bordered">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed">
 							<thead>
 								<tr>
 									<th><spring:message code="seq"></spring:message></th>
@@ -117,12 +117,12 @@
 								      <!-- 审核未通过可修改 -->
 								        	<c:choose>
 									        	<c:when test="${requestInfo.isAudit eq '1'}">
-											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
+											        <li><a href="javascript:void(0);" onclick="return confirmx('requestCancelExamine', ${requestInfo.id})"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="update_request"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
+											        <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>
 									        	</c:otherwise>
 								        	</c:choose>
 									      </ul>
@@ -155,6 +155,25 @@
 		$("#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>
 	.input-medium {