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-16 18:29:53 +08:00
parent 47287d58a7
commit 93d7f3a917
6 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,8 +66,8 @@
AND r.request_time between #{beginDate} and #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
</if>
AND r.edit_time between #{dobeginDate} and #{doendDate}
</if>
order by r.request_time desc
</select>
<!-- 根据来函号查询 -->

2
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
View File

@@ -62,7 +62,7 @@
AND r.task_time between #{beginDate} and #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
AND r.edit_time between #{dobeginDate} and #{doendDate}
</if>
order by r.task_time desc
</select>

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -106,7 +106,7 @@ desc=\u63cf\u8ff0\u4fe1\u606f
parent_id=\u7236ID
is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9
is_valid=\u6709\u6548\u6807\u5fd7
create_time=\u914d\u7f6e\u65f6\u95f4
create_time=\u521b\u5efa\u65f6\u95f4
edit_time=\u4fee\u6539\u65f6\u95f4
superior_config=\u4e0a\u7ea7\u914d\u7f6e
config_content=\u914d\u7f6e\u5185\u5bb9

22
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -116,7 +116,7 @@
<div class="col-md-6">
<div class="pull-left">
<label><spring:message code="operate_time"/>：</label>
<label><spring:message code="edit_time"/>：</label>
</div>
<div class="pull-left">
<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -160,8 +160,10 @@
<th><spring:message code="task_org"></spring:message></th>
<th><spring:message code="task_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="creator"></spring:message></th>
<th><spring:message code="create_time"></spring:message></th>
<th><spring:message code="editor"></spring:message></th>
<th><spring:message code="edit_time"></spring:message></th>
<th><spring:message code="auditor"></spring:message></th>
<th><spring:message code="audit_time"></spring:message></th>
</tr>
@@ -182,17 +184,9 @@
</c:choose>
</td>
<td>${taskInfo.creatorName }</td>
<td>
<!-- 编辑时间为空则显示创建时间 -->
<c:choose>
<c:when test="${empty taskInfo.editTime}">
<fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/>
</c:when>
<c:otherwise>
<fmt:formatDate value="${taskInfo.editTime }" pattern="yyyy-MM-dd"/>
</c:otherwise>
</c:choose>
</td>
<td><fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/></td>
<td>${taskInfo.editorName }</td>
<td><fmt:formatDate value="${taskInfo.editTime }" pattern="yyyy-MM-dd"/></td>
<td>${taskInfo.auditorName }</td>
<td><fmt:formatDate value="${taskInfo.auditTime }" pattern="yyyy-MM-dd"/></td>
</tr>

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

@@ -81,16 +81,6 @@
</div>
</div>
</div>
<style>
.input-medium {
width: 200px !important;
}
.Wdate {
border: #c2cad8 1px solid;
height: 34px;
}
</style>
<script type="text/javascript">
$(document).ready(function() {

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

@@ -126,7 +126,7 @@
<div class="col-md-6">
<div class="pull-left">
<label><spring:message code="operate_time"/>：</label>
<label><spring:message code="edit_time"/>：</label>
</div>
<div class="pull-left">
<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -175,11 +175,13 @@
<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="special_task"></spring:message></th>
<th><spring:message code="creator"/></th>
<th><spring:message code="create_time"/></th>
<th><spring:message code="editor"/></th>
<th><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"></spring:message></th>
<th><spring:message code="audit_time"></spring:message></th>
</tr>
@@ -199,21 +201,13 @@
<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>${requestInfo.taskName }</td>
<td>${requestInfo.creatorName }</td>
<td><fmt:formatDate value="${requestInfo.createTime }" pattern="yyyy-MM-dd"/></td>
<td>${requestInfo.editorName }</td>
<td><fmt:formatDate value="${requestInfo.editTime }" pattern="yyyy-MM-dd"/></td>
<td>${requestInfo.auditorName }</td>
<td><fmt:formatDate value="${requestInfo.auditTime }" pattern="yyyy-MM-dd"/></td>
</tr>
@@ -268,11 +262,20 @@
function resetx(){
// $("#searchForm").reset();
$(':input','#searchForm')
.not(':button,:submit,:reset,:hidden')
.val('')
.removeAttr('checked')
.removeAttr('selected');
// $(':input','#searchForm')
// .not(':button,:submit,:reset,:hidden')
// .val('')
// .removeAttr('checked')
// .removeAttr('selected');
$("select.selectpicker").each(function(){
$(this).selectpicker('val',$(this).find('option:first').val());
$(this).find("option").attr("selected",false);
$(this).find("option:first").attr("selected",true);
});
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
$("#intype").attr("placeholder","<spring:message code='input'/> "+"<spring:message code='title'/>");
}