0000019:搜索按钮统一化,所有列表界面搜索条件区域重新调整布局;

This commit is contained in:
chiguangxu
2018-03-22 22:18:57 +08:00
parent b37e01481b
commit e6576da655
16 changed files with 900 additions and 798 deletions

View File

@@ -225,43 +225,50 @@
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12 filter-action-select-panle" style="background-color:transparent">
<div class="row">
<div class="col-md-3">
<div class="pull-left">
<label>模块名称:</label>
</div>
<div class="pull-left">
<input id="moduleName" name="moduleName" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.moduleName}"/>
</div>
</div>
<div class="col-md-3">
<div class="pull-left">
<label>字典标识:</label>
</div>
<div class="pull-left">
<input id="mark" name="mark" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.mark}"/>
</div>
</div>
<div class="col-md-6">
<div class="pull-left">
<label>创建时间:</label>
</div>
<div class="pull-left">
<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
<div class="pull-left">
<label><spring:message code="to"/></label>
</div>
<div class="pull-left">
<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
<div class="pull-left">
<button type="submit" class="btn blue""><i class="fa fa-search"></i><spring:message code="search" /></button>
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label>模块名称:</label>
<input id="moduleName" name="moduleName" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.moduleName}"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>字典标识:</label>
<input id="mark" name="mark" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.mark}"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>创建时间:</label>
<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>&nbsp;</label>
<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label>&nbsp;</label>
<button type="submit" class="btn blue form-control"><i class="fa fa-search"></i><spring:message code="search" /></button>
</div>
</div>
</div>
</div>
</div>
</div>
</form:form>
</div>

View File

@@ -21,9 +21,7 @@
<body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default">&nbsp;刷新&nbsp;</button>
<shiro:hasPermission name="sys:menu:edit"><button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/sys/menu/form'">&nbsp;新增菜单&nbsp;</button></shiro:hasPermission>
@@ -31,33 +29,21 @@
<h3 class="page-title">
菜单管理
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i>菜单列表
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title=""
title=""> </a> <a href="#portlet-config" data-toggle="modal"
class="config" data-original-title="" title=""> </a> <a
href="javascript:;" class="reload" data-original-title=""
title=""> </a> <a href="javascript:;" class="remove"
data-original-title="" title=""> </a>
</div>
</div>
<div class="portlet">
<div class="portlet-body">
<div class="row" >
<div class="col-md-12">
<sys:message content="${message}"/>
<form id="listForm" method="post">
<table id="treeTable" class="table table-striped table-bordered table-condensed">

View File

@@ -65,7 +65,6 @@
<shiro:hasPermission name="sys:user:edit">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/sys/user/list'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/sys/user/form'">
<i class="fa fa-plus"></i>
@@ -96,61 +95,65 @@
<div class="col-md-12 filter-action-select-panle"
style="background-color: transparent">
<div class="row">
<div class="col-md-3">
<div class="pull-left">
<div class="col-md-2">
<div class="form-group">
<label>归属公司:</label>
</div>
<div class="pull-left">
<sys:treeselect id="company" name="company.id"
value="${user.company.id}" labelName="company.name"
labelValue="${user.company.name}" title="公司"
url="/sys/office/treeData?type=1" cssClass="form-control"
allowClear="true"/>
</div>
</div>
<div class="col-md-3">
<div class="pull-left">
<label>登录名:</label>
</div>
<div class="pull-left">
<form:input path="loginId" htmlEscape="false" maxlength="50"
class="form-control" />
</div>
</div>
<div class="col-md-3">
<div class="pull-left">
<label>姓名:</label>
</div>
<div class="pull-left">
<form:input path="name" htmlEscape="false" maxlength="50"
class="form-control" />
</div>
</div>
<div class="col-md-3">
<div class="pull-left">
<div class="col-md-2">
<div class="form-group">
<label>归属部门:</label>
</div>
<div class="pull-left">
<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name"
labelValue="${user.office.name}" title="部门"
url="/sys/office/treeData?type=3" cssClass="form-control" allowClear="true"
notAllowSelectParent="true"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>登录名:</label>
<form:input path="loginId" htmlEscape="false" maxlength="50"
class="form-control" />
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>姓名:</label>
<form:input path="name" htmlEscape="false" maxlength="50"
class="form-control" />
</div>
</div>
<div class="row">
<div class="pull-left">
<button type="submit" class="btn blue" onclick="return page();">
<i class="fa fa-search"></i>
<spring:message code="search" />
</button>
<button type="reset" class="btn btn-default">
<i class="fa fa-refresh"></i>
<spring:message code="reset" />
</button>
<div class="col-md-1">
<div class="form-group">
<label>&nbsp;</label>
<button type="submit" class="btn blue form-control" onclick="return page();">
<i class="fa fa-search"></i>
<spring:message code="search" />
</button>
</div>
</div>
</div>
</div>