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-03-05 17:23:42 +08:00
parent 05ba52f8bf
commit 6dd3934dcc
15 changed files with 449 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/include/header.jsp
View File

@@ -60,4 +60,6 @@
<script src="${pageContext.request.contextPath}/static/layouts/layout/scripts/layout.js" type="text/javascript"></script>
<!-- END THEME LAYOUT SCRIPTS -->
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>

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

@@ -7,18 +7,18 @@
</head>
<body>
<div class="content">
<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>
<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="edit"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add"/></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" >
<form:form action="${ctx}/cfg/request/saveOrUpdate" modelAttribute="requestInfo" class="form-horizontal" id="inputForm" method="post" >
<sys:message content="${message}"/>
<input type="hidden" name="id" value="${requestInfo.id}"/>
<div class="form-body">
@@ -47,12 +47,23 @@
<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="form-group">
<label class="col-md-3 control-label"><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 class="form-group last">
<label class="col-md-3 control-label"><th><spring:message code="special_task"/>:</label>
<div class="col-md-4">
<form:select path="taskId" class="selectpicker select2">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${taskInfos}" var="taskInfo">
<form:option value="${taskInfo.id}">${taskInfo.taskName}</form:option>
</c:forEach>
</form:select>
</div>
</div>
</div>
<div class="form-actions">
<div class="row">

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

@@ -8,15 +8,15 @@
<body>
<div class="content">
<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>
onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add"></spring:message></button>
</div>
<h3 class="page-title">
来函管理
<spring:message code="requestInfo"></spring:message>
</h3>
<div class="row">
@@ -24,7 +24,7 @@
<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>
<i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div>
</div>
<div class="portlet-body">
@@ -35,19 +35,20 @@
<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=""><spring:message code="select"></spring:message></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=""><spring:message code="select"></spring:message></option>
<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>
<option value="requestContent"><spring:message code="content"></spring:message></option>
</select> <input id="intype">
<form:select id="timeType" name="timeType" path="timeType">
<%-- <form:option value=""></form:option> --%>
<form:select path="timeType">
<form:option value=""><spring:message code="select"></spring:message></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>
@@ -79,6 +80,7 @@
<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="special_task"></spring:message></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
@@ -110,6 +112,7 @@
</td>
<td>${requestInfo.requestTitle }</td>
<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>
@@ -117,12 +120,12 @@
<!-- 审核未通过可修改 -->
<c:choose>
<c:when test="${requestInfo.isAudit eq '1'}">
<li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="cancel"></spring:message></a></li>
<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:otherwise>
<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>
<li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="examine"></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>