Merge remote-tracking branch 'origin/upgrade' into upgrade
This commit is contained in:
commit
a32211f0df
@ -75,19 +75,43 @@
|
||||
<div class="layui-card">
|
||||
<div class="layui-card-body">
|
||||
<div class="test-table-reload-btn" style="margin-bottom: 10px;">
|
||||
<form class="layui-form layui-form-pane" lay-filter="dataForm">
|
||||
<div class="layui-inline">
|
||||
<input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
|
||||
<div class="layui-input-block layui-form" style="width: 120px;margin-left: 0px;">
|
||||
<select name="isSelf" id="isSelf" lay-filter="isSelf">
|
||||
<option value="">是否自住房</option>
|
||||
<option value="1">是</option>
|
||||
<option value="0">否</option>
|
||||
</select>
|
||||
</div>
|
||||
新增时间
|
||||
<div class="layui-inline">
|
||||
<input type="text" id="startTime" class="layui-input search-item search-item-width-100" placeholder="开始时间" readonly>
|
||||
</div>
|
||||
<div class="layui-inline">
|
||||
<input type="text" id="endTime" class="layui-input search-item search-item-width-100" placeholder="结束时间" readonly>
|
||||
<div class="layui-input-block layui-form" style="width: 120px;margin-left: 0px;">
|
||||
<select name="isVacant" id="isVacant" lay-filter="isVacant">
|
||||
<option value="">是否空置房</option>
|
||||
<option value="1">是</option>
|
||||
<option value="0">否</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-inline">
|
||||
<div class="layui-input-block layui-form" style="width: 120px;margin-left: 0px;">
|
||||
<select name="isRental" id="isRental" lay-filter="isRental">
|
||||
<option value="">是否出租房</option>
|
||||
<option value="1">是</option>
|
||||
<option value="0">否</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="button" id="search" class="layui-btn layui-btn-sm">
|
||||
<i class="fa fa-lg fa-search"></i> 搜索
|
||||
</button>
|
||||
|
||||
<button type="button" id="excel" class="layui-btn layui-btn-sm layui-btn-normal">
|
||||
<i class="fa fa-lg fa-download"></i> 导出
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
<table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
|
||||
<!-- 表头按钮组 -->
|
||||
@ -127,6 +151,34 @@
|
||||
var select = layui.select;
|
||||
var tableUrl = 'api/house/listpage?myself={myself}';
|
||||
|
||||
$(document).on('click', '#excel', function() {
|
||||
excel();
|
||||
});
|
||||
|
||||
function excel(){
|
||||
var street = selectedRelation.street;
|
||||
var community = selectedRelation.community;
|
||||
var residentialId = selectedRelation.housingEstate;
|
||||
var buildingId = selectedRelation.buildingId;
|
||||
var isSelf = $('#isSelf').val();
|
||||
var isVacant = $('#isVacant').val();
|
||||
var isRental = $('#isRental').val();
|
||||
|
||||
|
||||
|
||||
top.dialog.msg('确定要导出数据吗?', {
|
||||
time: 0,
|
||||
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
|
||||
shade: 0.3,
|
||||
yes: function (index) {
|
||||
top.dialog.close(index);
|
||||
window.open(top.restAjax.path('api/house/export?street={street}&community={community}&residentialId={residentialId}&' +
|
||||
'buildingId={buildingId}&isSelf={isSelf}&isVacant={isVacant}&isRental={isRental}',
|
||||
[street, community, residentialId, buildingId, isSelf, isVacant, isRental]));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
var event = function() {
|
||||
$(document).on('click', '#treeBody ul li', function () {
|
||||
var $lis = $('#treeBody ul li');
|
||||
@ -2032,6 +2084,7 @@
|
||||
initStreetSelect();
|
||||
initCommunitySelect();
|
||||
event();
|
||||
form.render();
|
||||
}
|
||||
init();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user