Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
zhangwei
2018-07-11 17:55:44 +08:00

View File

@@ -192,9 +192,9 @@ var ajaxReport=function(url,target){
<div id="reportTypeDiv" class="input-group"> <div id="reportTypeDiv" class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<form:select path="reportType" class="selectpicker select2 input-small" > <form:select path="reportType" class="selectpicker select2 input-small" >
<form:option value="1"><spring:message code="小时报"/></form:option> <form:option value="1"><spring:message code="hour_of_day_report"/></form:option>
<form:option value="2"><spring:message code="日报"/></form:option> <form:option value="2"><spring:message code="day_of_month_report"/></form:option>
<form:option value="3"><spring:message code="月报"/></form:option> <form:option value="3"><spring:message code="month_report"/></form:option>
</form:select> </form:select>
</div> </div>
<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="${bean.reportTime }" readonly="readonly"> <input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="${bean.reportTime }" readonly="readonly">