report日期选择方式更改
This commit is contained in:
@@ -32,6 +32,9 @@ import com.nis.web.controller.BaseController;
|
|||||||
public class NtcTagReportController extends BaseController {
|
public class NtcTagReportController extends BaseController {
|
||||||
@RequestMapping("/ajaxNtcTagReport")
|
@RequestMapping("/ajaxNtcTagReport")
|
||||||
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
|
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
|
||||||
|
if (bean.getReportType() == null) {
|
||||||
|
bean.setReportType(1);
|
||||||
|
}
|
||||||
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
|
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
|
||||||
List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
|
List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
|
||||||
model.addAttribute("labels", labels);
|
model.addAttribute("labels", labels);
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ var ajaxGetLwhhReport=function(){
|
|||||||
</form:select>
|
</form:select>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<div class="btn-group" data-toggle="buttons">
|
<%-- <div class="btn-group" data-toggle="buttons">
|
||||||
<label class="btn btn-default">
|
<label class="btn btn-default">
|
||||||
<input type="radio" name="reportType" value="1"
|
<input type="radio" name="reportType" value="1"
|
||||||
<c:if test="${bean.reportType==1}">checked</c:if>
|
<c:if test="${bean.reportType==1}">checked</c:if>
|
||||||
@@ -158,7 +158,17 @@ var ajaxGetLwhhReport=function(){
|
|||||||
<c:if test="${bean.reportType==3}">checked</c:if>
|
<c:if test="${bean.reportType==3}">checked</c:if>
|
||||||
><spring:message code="月报"/>
|
><spring:message code="月报"/>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div> --%>
|
||||||
|
<div id="reportTypeDiv" class="input-group">
|
||||||
|
<div class="input-group-btn">
|
||||||
|
<form:select path="reportType" class="selectpicker select2 input-small" >
|
||||||
|
<form:option value="1"><spring:message code="小时报"/></form:option>
|
||||||
|
<form:option value="2"><spring:message code="日报"/></form:option>
|
||||||
|
<form:option value="3"><spring:message code="月报"/></form:option>
|
||||||
|
</form:select>
|
||||||
|
</div>
|
||||||
|
<input id="intype" class="form-control input-medium" type="text" value="" readonly="readonly">
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
||||||
|
|||||||
Reference in New Issue
Block a user