Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/domain/configuration/RequestInfo.java

@@ -39,11 +39,13 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
     private String creatorName;
     private String editorName;
     private String auditorName;
-    private Date beginDate;//开始时间
+    private Date beginDate;//来函开始时间
-    private Date endDate;//结束时间
+    private Date endDate;//来函结束时间
     private String timeType;//时间类型
     private String taskName;//专项任务
-    
+    private String seltype;//选中类型
+    private Date dobeginDate;//操作开始时间
+    private Date doendDate;//操作结束时间
 
 	public Long getTaskId() {
 		return taskId;
@@ -213,4 +215,28 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
 		this.taskName = taskName;
 	}
 
+	public String getSeltype() {
+		return seltype;
+	}
+
+	public void setSeltype(String seltype) {
+		this.seltype = seltype;
+	}
+
+	public Date getDobeginDate() {
+		return dobeginDate;
+	}
+
+	public void setDobeginDate(Date dobeginDate) {
+		this.dobeginDate = dobeginDate;
+	}
+
+	public Date getDoendDate() {
+		return doendDate;
+	}
+
+	public void setDoendDate(Date doendDate) {
+		this.doendDate = doendDate;
+	}
+    
 }

src/main/java/com/nis/web/controller/configuration/RequestInfoController.java

@@ -101,8 +101,9 @@ public class RequestInfoController extends BaseController{
      * @return
      */
 	@RequestMapping(value = "requestExamine")
-    public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+    public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
-    	requestInfoService.requestExamine(requestInfo);
+		String[] exId = ids.split(",");
+    	requestInfoService.requestExamine(exId);
     	addMessage(redirectAttributes, "success");
     	return "redirect:" + adminPath + "/cfg/request/list?repage";
     	
@@ -114,8 +115,9 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "requestExamineNo")
-	public String requestExamineNo(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+	public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
-		requestInfoService.requestExamineNo(requestInfo);
+		String[] noId = ids.split(",");
+		requestInfoService.requestExamineNo(noId);
 		addMessage(redirectAttributes, "success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
@@ -127,8 +129,9 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "requestCancelExamine")
-	public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+	public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
-		requestInfoService.requestCancelExamine(requestInfo);
+		String[] canclelId = ids.split(",");
+		requestInfoService.requestCancelExamine(canclelId);
 		addMessage(redirectAttributes, "success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
@@ -140,8 +143,9 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "delete")
-	public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
-		requestInfoService.delete(requestInfo);
+		String[] delId = ids.split(",");
+		requestInfoService.delete(delId);
 		addMessage(redirectAttributes, "success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
@@ -156,4 +160,5 @@ public class RequestInfoController extends BaseController{
 		List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
 		model.addAttribute("taskInfos", taskInfos);
 	}
+	
 }

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java

@@ -23,6 +23,7 @@ public interface RequestInfoDao  extends CrudDao {
 
 	List<TaskInfo> showTask(TaskInfo taskInfo);
 
+	void delete(@Param("id") Long id);
 
 
 }

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -61,11 +61,11 @@
 	<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="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="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-			AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
+			AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
 	</if> 
 	order by r.request_time desc
   </select>
@@ -153,11 +153,11 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
   <!--删除  -->
-  <update id="delete" parameterType="com.nis.domain.configuration.RequestInfo">
+  <update id="delete" parameterType="long">
      update request_info
     <set>
-	    <if test="isValid != null and id != null">
+	    <if test="id != null and id != ''">
-	    	is_valid=#{isValid}
+	    	is_valid=-1
 	    </if>
     </set>
     where id = #{id,jdbcType=BIGINT} and is_audit !=1

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -62,24 +62,37 @@ public class RequestInfoService extends BaseService{
 		return requestInfoDao.getRequestInfoById(id);
 	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
-	public void requestExamine(RequestInfo requestInfo){
+	public void requestExamine(String[] exId){
+		RequestInfo requestInfo = new RequestInfo();
+		for (int i = 0; i < exId.length; i++) {
+			requestInfo.setId(Long.valueOf(exId[i]));
 			requestInfo.setIsAudit(1);//审核通过
 			requestInfoDao.update(requestInfo);
 		}
+	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
-	public void requestExamineNo(RequestInfo requestInfo){
+	public void requestExamineNo(String[] noId){
+		RequestInfo requestInfo = new RequestInfo();
+		for (int i = 0; i < noId.length; i++) {
+			requestInfo.setId(Long.valueOf(noId[i]));
 			requestInfo.setIsAudit(2);//审核未通过
 			requestInfoDao.update(requestInfo);
 		}
-	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
-	public void requestCancelExamine(RequestInfo requestInfo){
-		requestInfo.setIsAudit(3);//取消审核通过
-		int update = requestInfoDao.update(requestInfo);
 	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
-	public void delete(RequestInfo requestInfo){
+	public void requestCancelExamine(String[] cancelId){
-		requestInfo.setIsValid(-1);
+		RequestInfo requestInfo = new RequestInfo();
-		requestInfoDao.delete(requestInfo);//删除
+		for (int i = 0; i < cancelId.length; i++) {
+			requestInfo.setId(Long.valueOf(cancelId[i]));
+			requestInfo.setIsAudit(3);//取消审核通过
+			requestInfoDao.update(requestInfo);
+		}
+	}
+	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	public void delete(String[] delId){
+		for (int i = 0; i < delId.length; i++) {
+			requestInfoDao.delete(Long.valueOf(delId[i]));//删除
+		}
 	}
 	public List<RequestInfo> getValidRequestInfo(){
 		RequestInfo requestInfo=new RequestInfo();

src/main/resources/messages/message_en.properties

@@ -137,6 +137,7 @@ begin_date=begin date
 end_date=end date
 delete=delete
 special_task=special task
+cancel_approved=cancel approved
 #============laihan end======================
 
 
@@ -157,6 +158,17 @@ turning_page=It is turning to the page
 login_timeout=No login or login timeout,please login again,Thank you!
 captcha_error=captcha error
 enter_captcha=Please enter the captcha
+input=please input
+input_title=please input title
+all_states=all states
+filter=filter
+to=to
+reset=reset
+info=info
+has_approved=It has been approved and can not be operated on !
+hasnot_approved=It has not been approved and can not be operated on !
+check_one=choose one please !
+one_more=please choose at least one !
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================

src/main/resources/messages/message_zh_CN.properties

@@ -137,6 +137,7 @@ begin_date=\u5f00\u59cb\u65f6\u95f4
 end_date=\u7ed3\u675f\u65f6\u95f4
 delete=\u5220\u9664
 special_task=\u4e13\u9879\u4efb\u52a1
+cancel_approved=\u914d\u7f6e\u53d6\u6d88
 #==========laihan end=====================
 
 #==========message begin=====================
@@ -156,6 +157,17 @@ turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762
 login_timeout=\u672a\u767b\u5f55\u6216\u767b\u5f55\u8d85\u65f6,\u8bf7\u91cd\u65b0\u767b\u5f55,\u8c22\u8c22!
 captcha_error=\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e
 enter_captcha=\u8bf7\u8f93\u5165\u9a8c\u8bc1\u7801
+input=\u8bf7\u8f93\u5165
+input_title=\u8bf7\u8f93\u5165\u6807\u9898
+all_states=\u6240\u6709\u72b6\u6001
+filter=\u7b5b\u9009
+to=\u5230
+reset=\u91cd\u7f6e
+info=\u63d0\u793a
+has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
+hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
+check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01
+one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e!
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -0,0 +1,136 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true"%>
+<%@ attribute name="url" type="java.lang.String" required="true"%>
+<%@ attribute name="label" type="java.lang.String" required="false"%>
+<c:choose>
+	<c:when test="${label eq 'delete'}">
+		<button class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
+			<i class="fa fa-trash"> <spring:message code="delete"/></i>
+		</button>
+	</c:when>
+
+	<c:when test="${label eq 'approved'}">
+		<a href="javascript:void(0);" onclick="passOpt('${url}')"><i class="fa fa-check"></i> <spring:message code="approved"/></a>
+	</c:when>
+	<c:when test="${label eq 'unapproved'}">
+		<a href="javascript:void(0);" onclick="noPassOpt('${url}')"><i class="fa fa-remove"></i> <spring:message code="unapproved"/></a>
+	</c:when>
+	<c:when test="${label eq 'cancelPass'}">
+		<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
+	</c:when>
+</c:choose>
+<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
+<script type="text/javascript">
+$(document).ready(function() {
+    $('#${id} thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+    	  $('#${id} tbody tr td input.i-checks').iCheck('check');
+    	});
+
+    $('#${id} thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+    	  $('#${id} tbody tr td input.i-checks').iCheck('uncheck');
+    	});
+});
+//删除
+function del(url){
+	var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validatePass(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+			}else{
+					doAll(checkboxes,url);
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+//通过
+function passOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validatePass(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+			}else{
+					doAll(checkboxes,url);
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+//未通过
+function noPassOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validatePass(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+			}else{
+					doAll(checkboxes,url);
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+//配置取消
+function cancelPassOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validatePass(checkboxes)){
+			doAll(checkboxes,url);
+			}else{
+				top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
+				return;
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+	function doAll(checkboxes,url){
+		// var url = $(this).attr('data-url');
+		  var str="";
+		  var ids="";
+		  checkboxes.each(function(){
+		    if(true == $(this).is(':checked')){
+		      str+=$(this).attr("id")+",";
+		    }
+		  });
+		  if(str.substr(str.length-1)== ','){
+		    ids = str.substr(0,str.length-1);
+		  }
+		  if(ids == ""){
+			  //top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
+			  top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+			return;
+		  }
+			top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
+				
+				if(v=="ok"){
+					window.location = url+"?ids="+ids;
+					//$("#searchForm").submit();
+				}
+			},{buttonsFocus:1});
+			top.$('.jbox-body .jbox-icon').css('top','55px');
+
+	}
+	//验证选择的配置，是否有审核通过的
+	function validatePass(checkboxes){
+		var flag = false;
+		$(checkboxes).filter(":checked").each(function(){
+			if($(this).val()==1){
+				flag = true;
+				return;
+			}		 	
+		});
+		return flag;
+	}
+</script>

src/main/webapp/WEB-INF/views/cfg/requestList.jsp

@@ -13,7 +13,7 @@
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/request/form'">
 			<i class="fa fa-plus"></i>
-			<spring:message code="add"></spring:message><spring:message code="requestInfo"></spring:message></button>
+			<spring:message code="add"/></button>
 	</div>
 	
 	<h3 class="page-title">
@@ -41,7 +41,7 @@
 									
 									<div class="pull-left">
 										<form:select path="isAudit" class="selectpicker select2 input-small" >
-											<form:option value="">所有状态</form:option>
+											<form:option value=""><spring:message code="all_states"/></form:option>
 											<form:option value="0"><spring:message code="created"></spring:message></form:option>
 											<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										</form:select>
@@ -50,14 +50,14 @@
 									<div class="pull-left">	
 										<div class="input-group">
                                             <div class="input-group-btn">
-                                                <select id="seltype" class="selectpicker select2 input-small" >
+                                                <form:select path="seltype" class="selectpicker select2 input-small" >
-													<option value="requestTitle"><spring:message code="title"></spring:message></option>
+													<form:option value="requestTitle"><spring:message code="title"></spring:message></form:option>
-													<option value="requestNumber"><spring:message code="request_number"></spring:message></option>
+													<form:option value="requestNumber"><spring:message code="request_number"></spring:message></form:option>
-													<option value="requestContent"><spring:message code="content"></spring:message></option>
+													<form:option value="requestContent"><spring:message code="content"></spring:message></form:option>
-												</select>
+												</form:select>
                                             </div>
                                             
-                                            <input id="intype" class="form-control input-medium" placeholder="请输入标题" type="text">
+                                            <input id="intype" class="form-control input-medium" placeholder=<spring:message code="input_title"/> type="text" value="">
                                             
                                             <div class="input-group-btn">
                                               	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
@@ -67,26 +67,25 @@
 	                               </div>
 	                                
 	                               <div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 
 									<div class="pull-right">
 									
-                                        <button type="button" class="btn btn-default">
+                                        <button type="button" class="btn btn-default" onclick="edit()">
-                                            <i class="fa fa-edit"></i> 编辑</button>
+                                            <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
-                                        <button type="button" class="btn btn-default">
+                                            <sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
-                                            <i class="fa fa-trash"></i> 删除</button>
                                       <!--   <button type="button" class="btn btn-default">
                                             <i class="fa fa-download"></i> 导出</button> -->
                                         <div class="btn-group">
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                                <i class="fa fa-wrench"></i> 审核
+                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
                                                 <i class="fa fa-angle-down"></i>
                                             </button>
                                             <ul class="dropdown-menu pull-right">
-                                                <li><a href="javascript:void(0);" onclick="passOpt()"><i class="fa fa-check"></i> 通过</a></li>
+                                                <li><sys:delRow url="${ctx}/cfg/request/requestExamine" id="contentTable" label="approved"></sys:delRow></li>
-												<li><a href="javascript:void(0);" onclick="noPassOpt()"><i class="fa fa-remove"></i> 未通过</a></li>
+												<li><sys:delRow url="${ctx}/cfg/request/requestExamineNo" id="contentTable" label="unapproved"></sys:delRow></li>
-												<li><a href="javascript:void(0);" onclick="cancelPassOpt()"><i class="fa fa-undo"></i> 配置取消</a></li>            
+												<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                             </ul>
                                         </div>
                         
@@ -109,14 +108,14 @@
 								
 									<div class="col-md-6">
 											<div class="pull-left">
-												<label>来函时间：</label>
+												<label><spring:message code="request_time"/>：</label>
 											</div>
 											<div class="pull-left">
-												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate" data-options="buttons:buttons"
 												value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 											</div>
 											<div class="pull-left">
-												<label>到</label>
+												<label><spring:message code="to"/></label>
 											</div>
 											<div class="pull-left">
 												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -127,18 +126,18 @@
 							
 									<div class="col-md-6">
 										<div class="pull-left">
-											<label>操作时间：</label>
+											<label><spring:message code="operate_time"/>：</label>
 										</div>
 										<div class="pull-left">
-											<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											value="<fmt:formatDate value="${requestInfo.dobeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 										</div>
 										<div class="pull-left">
-											<label>到</label>
+											<label><spring:message code="to"/></label>
 										</div>
 										<div class="pull-left">
-											<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											<input id="doendDate" name="doendDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											value="<fmt:formatDate value="${requestInfo.doendDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 										</div>
 									</div>
 								</div>
@@ -147,8 +146,8 @@
 								<div class="row">
 									
 									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索  </button>
+										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-										<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+										<button type="button" class="btn btn-default" onclick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 									</div>
 							
 								</div>
@@ -170,7 +169,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed">
 							<thead>
 								<tr>
-									<th><input type="checkbox" class="ckboxs"></th>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th><spring:message code="seq"></spring:message></th>
 									<th><spring:message code="request_number"></spring:message></th>
 									<th><spring:message code="request_organization"></spring:message></th>
@@ -187,7 +186,7 @@
 							<tbody>
 							<c:forEach items="${page.list}" var="requestInfo">
 								<tr>
-									<td><input type="checkbox" class="ckbox"></td>
+									<td><input type="checkbox" class="i-checks" id="${requestInfo.id}" value="${requestInfo.isAudit}"></td>
 									<td>${requestInfo.id }</td>
 									<td>${requestInfo.requestNumber }</td>
 									<td>${requestInfo.requestOrg }</td>
@@ -215,28 +214,6 @@
 									<td>${requestInfo.requestContent }</td>
 									<td>${requestInfo.taskName }</td>
 									<td>
-										<%-- <div class="btn-group btn-xs">
-									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
-									      <ul class="dropdown-menu btn-xs">
-								      <!-- 审核未通过可修改 -->
-								        	<c:choose>
-									        	<c:when test="${requestInfo.isAudit eq '1'}">
-											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li>
-									        	</c:when>
-									        	<c:when test="${requestInfo.isAudit ne '2'}">
-											        <li><a href="${ctx}/cfg/request/requestExamineNo?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="unapproved"></spring:message></a></li>
-											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:when>
-									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:otherwise>
-								        	</c:choose>
-									      </ul>
-									    </div> --%>
 									</td>
 								</tr>
 							</c:forEach>
@@ -253,6 +230,18 @@
 <script>
  	$(document).ready(function() {
  		
+ 	    
+		if("${requestInfo.requestTitle}"){
+			$("#intype").val("${requestInfo.requestTitle}");
+		}
+		if("${requestInfo.requestNumber}"){
+			$("#intype").val("${requestInfo.requestNumber}");
+		}
+		if("${requestInfo.requestContent}"){
+			$("#intype").val("${requestInfo.requestContent}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/>"+$("#seltype").find("option:selected").text());
+		}
  		//筛选功能初始化
  		filterActionInit();
  		
@@ -261,14 +250,29 @@
 		});
 		
 		$("#seltype").change(function(){
-			$("#intype").attr("placeholder","请输入"+$(this).find("option:selected").text());
+			$("#intype").attr("placeholder","<spring:message code='input'/>"+$(this).find("option:selected").text());
 		});
+		//全选及取消
+		$("#checkAll").change(function(){
+			if($("#checkAll").prop("checked")){
+				$("input.i-checks").prop("checked",true);
+			}else{
+				$("input.i-checks").prop("checked",false);
+			}
+		});
+		
+	
 		
  	});
  	
  	
- 	function reset(){
+ 	function resetx(){
- 		$("#searchForm").reset();
+//  		$("#searchForm").reset();
+ 		$(':input','#searchForm')
+ 		.not(':button,:submit,:reset,:hidden')
+ 		.val('')
+ 		.removeAttr('checked')
+ 		.removeAttr('selected');
  	}
  	
  	
@@ -282,6 +286,20 @@
 		$("#searchForm").submit();
 		return false;
 	}
+	//编辑
+	function edit(){
+		var cked = $('tbody tr td input.i-checks:checkbox:checked');
+		if(cked.val()==1){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+		}
+		if(cked.length==1){
+			window.location = "${ctx}/cfg/request/form?id="+cked.attr("id");
+		}else{
+			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+			return;
+		}
+	}
 
 </script>
 

src/main/webapp/WEB-INF/views/login.jsp

@@ -139,8 +139,15 @@
                 
              // 如果在框架或在对话框中，则弹出提示并跳转到首页
         		if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
-        			alertx("<spring:message code='login_timeout'/>");
+        			top.$.jBox.confirm("<spring:message code='login_timeout'/>","<spring:message code='info'/>",function(v,h,f){
-        			window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000);
+    				
+    				if(v=="ok"){
+    					top.location = "${pageContext.request.contextPath }";
+    				}else{
+    					top.location = "${pageContext.request.contextPath }";
+        				}
+    			},{buttonsFocus:1});
+    			top.$('.jbox-body .jbox-icon').css('top','55px');
         		}