gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

来函页面显示调整，来函时间倒序排列，滚动条问题

Browse Source
This commit is contained in:
zhanghongqing
2018-02-09 13:59:49 +08:00
parent 1febb8a107
commit 1c536222f7
3 changed files with 40 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@
<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}) AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
</if> </if>
order by r.request_time desc
</select> </select>
<!-- 根据来函号查询 --> <!-- 根据来函号查询 -->
<select id="getRequestInfoByRequestNumber" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="getRequestInfoByRequestNumber" parameterType="java.lang.String" resultMap="BaseResultMap">

51
src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
View File

@@ -8,23 +8,12 @@
<body> <body>
<div class="page-content"> <div class="page-content">
<h3 class="page-title">
Managed Datatables <small>managed datatable samples</small>
</h3>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-gift"></i>Form Actions On Bottom </div> <i class="fa fa-gift"></i><spring:message code="add_request"></spring:message></div>
<div class="tools">
<a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
<a href="javascript:;" class="reload"> </a>
<a href="javascript:;" class="remove"> </a>
</div>
</div> </div>
<div class="portlet-body form"> <div class="portlet-body form">
@@ -58,20 +47,6 @@
<input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}"> <input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}">
</div> </div>
</div> </div>
<!-- <div class="form-group">
<label class="col-md-3 control-label">专项:</label>
<div class="col-md-4">
<div class="input-icon right">
<input type="text" class="form-control">
</div>
</div>
</div> -->
<!-- <div class="form-group">
<label class="col-md-3 control-label">描述:</label>
<div class="col-md-4">
<input type="text" class="form-control">
</div>
</div> -->
<div class="form-group last"> <div class="form-group last">
<label class="col-md-3 control-label"><th><spring:message code="content"></spring:message>:</label> <label class="col-md-3 control-label"><th><spring:message code="content"></spring:message>:</label>
<div class="col-md-4"> <div class="col-md-4">
@@ -100,10 +75,32 @@
width: 200px !important; width: 200px !important;
} }
.Wdate { .Wdate {
border: #999 2px solid; border: #c2cad8 1px solid;
height: 34px; height: 34px;
} }
</style> </style>
<script type="text/javascript">
$(document).ready(function() {
$("#inputForm").validate({
rules: {
requestNumber: {
required: true,
}
},
messages: {
requestNumber: {
required: "required",
}
},
submitHandler: function(form){
loading('正在提交，请稍等...');
form.submit();
},
errorContainer: "#messageBox",
});
});
</script>
</body> </body>
</html> </html>

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

@@ -11,15 +11,10 @@
<div class="page-content"> <div class="page-content">
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button> <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add_request"></spring:message></button> onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add_request"></spring:message></button>
</div> </div>
<h3 class="page-title">
Managed Datatables <small>managed datatable samples</small>
</h3>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="portlet box blue"> <div class="portlet box blue">
@@ -27,25 +22,15 @@
<div class="caption"> <div class="caption">
<i class="fa fa-cogs"></i><spring:message code="request_number"></spring:message> <i class="fa fa-cogs"></i><spring:message code="request_number"></spring:message>
</div> </div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title=""
title=""> </a> <a href="#portlet-config" data-toggle="modal"
class="config" data-original-title="" title=""> </a> <a
href="javascript:;" class="reload" data-original-title=""
title=""> </a> <a href="javascript:;" class="remove"
data-original-title="" title=""> </a>
</div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="row" > <div class="row" >
<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/cfg/request/list" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/cfg/request/list" method="post" class="breadcrumb form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <div class="col-md-12">
<spring:message code="state"></spring:message>:<select class="select2" name="isAudit"> <spring:message code="state"></spring:message>&nbsp;:&nbsp;<select class="select2" name="isAudit">
<option value="0"><spring:message code="created"></spring:message></option> <option value="0"><spring:message code="created"></spring:message></option>
<option value="1"><spring:message code="approved"></spring:message></option> <option value="1"><spring:message code="approved"></spring:message></option>
</select> </select>
@@ -61,9 +46,9 @@
<option value="createTime"><spring:message code="operate_time"></spring:message></option> <option value="createTime"><spring:message code="operate_time"></spring:message></option>
</select> &nbsp; </select> &nbsp;
<spring:message code="begin_date"></spring:message>:<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate" <spring:message code="begin_date"></spring:message>&nbsp;:&nbsp;<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
<spring:message code="end_date"></spring:message>:<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate" <spring:message code="end_date"></spring:message>&nbsp;:&nbsp;<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
<button type="button" class="btn btn-default btn-sm" onclick="return page()"> <button type="button" class="btn btn-default btn-sm" onclick="return page()">
@@ -75,7 +60,7 @@
</div> </div>
<div class="table-responsive"> <!-- <div class="table-responsive"> -->
<sys:message content="${message}"/> <sys:message content="${message}"/>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
@@ -143,8 +128,7 @@
</tbody> </tbody>
</table> </table>
</div> <div class="pagination">${page}</div>
<div class="pager">${page}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -172,10 +156,14 @@
width: 200px !important; width: 200px !important;
} }
.Wdate { .Wdate {
border: #999 2px solid; border: #c2cad8 1px solid;
height: 26px; height: 26px;
} }
.dropdown-menu {
min-width: 50px;
}
</style> </style>
</body> </body>
</html> </html>