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

解决冲突

Browse Source 
页面信息提示修改
来函信息页面修改，新增，修改切换标题，修改回显bug
This commit is contained in:
zhanghongqing
2018-02-23 12:55:43 +08:00
parent e5f7cbca2d
commit bcd6f22bfe
5 changed files with 501 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/main/webapp/WEB-INF/views/cfg/requestForm.jsp Normal file
View File

@@ -0,0 +1,126 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title>来函信息</title>
</head>
<body>
<div class="page-content">
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="update_request"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add_request"/></c:if></div>
</div>
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form:form action="${ctx}/cfg/request/saveOrUpdate" class="form-horizontal" id="inputForm" method="post" >
<sys:message content="${message}"/>
<input type="hidden" name="id" value="${requestInfo.id}"/>
<div class="form-body">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="request_number"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="requestNumber" value="${requestInfo.requestNumber}">
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="request_organization"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="requestOrg" value="${requestInfo.requestOrg}">
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="request_time"></spring:message>:</label>
<div class="col-md-4">
<input id="requestTime" name="requestTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
value="<fmt:formatDate value="${requestInfo.requestTime}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="title"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}">
</div>
</div>
<div class="form-group last">
<label class="col-md-3 control-label"><th><spring:message code="content"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="requestContent" value="${requestInfo.requestContent}">
</div>
</div>
</div>
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<button type="submit" class="btn btn-circle green"><spring:message code="submit"></spring:message></button>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
</div>
</div>
</div>
</form:form>
<!-- END FORM-->
</div>
</div>
</div>
</div>
</div>
<style>
.input-medium {
width: 200px !important;
}
.Wdate {
border: #c2cad8 1px solid;
height: 34px;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$("#inputForm").validate({
rules: {
requestNumber: {
required: true,
},
requestOrg: {
required: true,
},
requestTime: {
required: true,
},
requestContent: {
required: true,
},
},
messages: {
requestNumber: {
required: "不能为空！",
},
requestOrg: {
required: "不能为空！",
},
requestTime: {
required: "不能为空！",
},
requestContent: {
required: "This field is required！",
},
},
submitHandler: function(form){
//loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",
});
});
</script>
</body>
</html>

174
src/main/webapp/WEB-INF/views/cfg/requestList.jsp Normal file
View File

@@ -0,0 +1,174 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title>来函信息</title>
</head>
<body>
<div class="page-content">
<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-primary"
onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add_request"></spring:message></button>
</div>
<h3 class="page-title">
来函管理
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="request_number"></spring:message>
</div>
</div>
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/cfg/request/list" method="post" class="form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
<spring:message code="state"/> : <form:select path="isAudit" class="select2">
<form:option value=""></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>
<select id="seltype">
<option value="requestTitle"><spring:message code="title"></spring:message></option>
<option value="requestNumber"><spring:message code="request_number"></spring:message></option>
<option value="requestContent"><spring:message code="task"></spring:message></option>
</select> <input id="intype">
<form:select id="timeType" name="timeType" path="timeType">
<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>
<spring:message code="begin_date"></spring:message> : <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});"/>
<spring:message code="end_date"></spring:message> : <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});"/>
<button type="button" class="btn btn-default btn-sm" onclick="return page()">
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
</button>
</div>
</form:form>
</div>
<!-- <div class="table-responsive"> -->
<sys:message content="${message}"/>
<table id="contentTable" class="table table-bordered">
<thead>
<tr>
<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>
<th><spring:message code="request_time"></spring:message></th>
<th><spring:message code="state"></spring:message></th>
<th><spring:message code="operator"></spring:message></th>
<th><spring:message code="operate_time"></spring:message></th>
<th><spring:message code="title"></spring:message></th>
<th><spring:message code="content"></spring:message></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list}" var="requestInfo">
<tr>
<td>${requestInfo.id }</td>
<td>${requestInfo.requestNumber }</td>
<td>${requestInfo.requestOrg }</td>
<td><fmt:formatDate value="${requestInfo.requestTime }" pattern="yyyy-MM-dd"/></td>
<td>
<c:choose>
<c:when test="${requestInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${requestInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${requestInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
</c:choose>
</td>
<td>${requestInfo.creatorName }</td>
<td>
<!-- 编辑时间为空则显示创建时间 -->
<c:choose>
<c:when test="${empty requestInfo.editTime}">
<fmt:formatDate value="${requestInfo.createTime }" pattern="yyyy-MM-dd"/>
</c:when>
<c:otherwise>
<fmt:formatDate value="${requestInfo.editTime }" pattern="yyyy-MM-dd"/>
</c:otherwise>
</c:choose>
</td>
<td>${requestInfo.requestTitle }</td>
<td>${requestInfo.requestContent }</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 confirm('sure？', this.href)"><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>
</c:otherwise>
</c:choose>
</ul>
</div>
</td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="page">${page}</div>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function() {
});
//查询
function page(n,s){
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/cfg/request/list");
$("#searchForm").submit();
return false;
}
</script>
<style>
.input-medium {
width: 200px !important;
}
.Wdate {
border: #c2cad8 1px solid;
height: 26px;
}
.dropdown-menu {
min-width: 50px;
}
</style>
</body>
</html>