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

成功后页面信息提示问题，来函信息页面显示样式修改，新增和修改时标题动态显示，修改时的回显bug

Browse Source
This commit is contained in:
zhanghongqing
2018-02-23 11:12:10 +08:00
parent 606bc2a0c9
commit 24edd11520
5 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -42,8 +42,8 @@ public class RequestInfoController extends BaseController{
*/
@RequestMapping(value={"form"})
public String form(RequestInfo requestInfo, Model model) {
if(StringUtils.isNotEmpty(requestInfo.getRequestNumber())){
requestInfo = requestInfoService.getRequestInfoByRequestNumber(requestInfo.getRequestNumber());
if(requestInfo.getId()!=null){
requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
model.addAttribute("requestInfo", requestInfo);
}
model.addAttribute("requestInfo", requestInfo);
@@ -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");

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

@@ -46,6 +46,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<!-- END CORE PLUGINS -->

2
src/main/webapp/WEB-INF/tags/sys/message.tag
View File

@@ -6,5 +6,5 @@
<c:if test="${not empty content}">
<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${fn:indexOf(content,'失败') eq -1?'success':'error'}"/></c:if>
<div id="messageBox" class="alert alert-${ctype} hide"><button data-dismiss="alert" class="close">×</button>${content}</div>
<script type="text/javascript">if(!top.$.jBox.tip.mess){top.$.jBox.tip.mess=1;top.$.jBox.tip("${content}","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();}</script>
<script type="text/javascript">if(top.$.jBox.tip.mess){top.$.jBox.tip.mess=1;top.$.jBox.tip("${content}","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();} </script>
</c:if>

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

@@ -13,7 +13,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><spring:message code="add_request"></spring:message></div>
<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">
@@ -87,15 +87,35 @@
rules: {
requestNumber: {
required: true,
}
},
requestOrg: {
required: true,
},
requestTime: {
required: true,
},
requestContent: {
required: true,
},
},
messages: {
requestNumber: {
required: "required",
}
required: "不能为空！",
},
requestOrg: {
required: "不能为空！",
},
requestTime: {
required: "不能为空！",
},
requestContent: {
required: "This field is required！",
},
},
submitHandler: function(form){
loading('正在提交，请稍等...');
//loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",

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

@@ -34,29 +34,28 @@
<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"></spring:message>&nbsp;:&nbsp;<select class="select2" name="isAudit">
<option value="${requestInfo.isAudit}"></option>
<option value="0"><spring:message code="created"></spring:message></option>
<option value="1"><spring:message code="approved"></spring:message></option>
</select>
<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> &nbsp; <input id="intype"> &nbsp;
</select> <input id="intype">
<select id="timeType" name="timeType">
<option value="${requestInfo.timeType}"></option>
<option value="requestTime"><spring:message code="request_time"></spring:message></option>
<option value="createTime"><spring:message code="operate_time"></spring:message></option>
</select> &nbsp;
<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>&nbsp;:&nbsp;<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
<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>&nbsp;:&nbsp;<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
<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>
@@ -68,7 +67,7 @@
<!-- <div class="table-responsive"> -->
<sys:message content="${message}"/>
<table class="table table-bordered">
<table id="contentTable" class="table table-bordered">
<thead>
<tr>
<th><spring:message code="seq"></spring:message></th>
@@ -122,7 +121,7 @@
</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?requestNumber=${requestInfo.requestNumber}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="update_request"></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>