diff --git a/src/main/resources/templates/buildinghouse/list-check.html b/src/main/resources/templates/buildinghouse/list-check.html index 60a12f8..15d7615 100644 --- a/src/main/resources/templates/buildinghouse/list-check.html +++ b/src/main/resources/templates/buildinghouse/list-check.html @@ -117,7 +117,7 @@ return rowData; } }, - {field: 'houseStatus', fixed: 'right', width: 150, title: '租房记录', align:'center', + {field: 'rentalHis', fixed: 'right', width: 150, title: '租房记录', align:'center', templet: function(row) { var rowData = '租住记录'; return rowData; @@ -222,7 +222,7 @@ // 房屋租住记录 function rentalHis(data) { top.dialog.open({ - url: top.restAjax.path('route/houseuser/list?buildingHouseId={buildingHouseId}', [data.buildingHouseId]), + url: top.restAjax.path('route/houseuser/list?buildingHouseId={buildingHouseId}&keywords={keywords}', [data.buildingHouseId, keywords]), title: "房屋租住记录", width: '80%', height: '80%', diff --git a/src/main/resources/templates/buildinghouse/update.html b/src/main/resources/templates/buildinghouse/update.html index 8e3ba0b..d861ec1 100644 --- a/src/main/resources/templates/buildinghouse/update.html +++ b/src/main/resources/templates/buildinghouse/update.html @@ -37,7 +37,7 @@
- +
diff --git a/src/main/resources/templates/houseuser/list.html b/src/main/resources/templates/houseuser/list.html index 996e695..c1ece43 100644 --- a/src/main/resources/templates/houseuser/list.html +++ b/src/main/resources/templates/houseuser/list.html @@ -64,15 +64,16 @@ var admin = layui.admin; var laydate = layui.laydate; var resizeTimeout = null; - var tableUrl = 'api/houseuser/listpage?buildingHouseId={buildingHouseId}'; + var tableUrl = 'api/houseuser/listpage?buildingHouseId={buildingHouseId}&keywords={keywords}'; var buildingHouseId = top.restAjax.params(window.location.href).buildingHouseId; + var keywords = top.restAjax.params(window.location.href).keywords; // 初始化表格 function initTable() { table.render({ elem: '#dataTable', id: 'dataTable', - url: top.restAjax.path(tableUrl, [buildingHouseId]), + url: top.restAjax.path(tableUrl, [buildingHouseId, keywords]), width: admin.screen() > 1 ? '100%' : '', height: $win.height() - 90, limit: 20, @@ -162,7 +163,7 @@ // 重载表格 function reloadTable(currentPage) { table.reload('dataTable', { - url: top.restAjax.path(tableUrl, []), + url: top.restAjax.path(tableUrl, [buildingHouseId, keywords]), where: { keywords: $('#keywords').val(), startTime: $('#startTime').val(), @@ -234,7 +235,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/houseuser/save?buildingHouseId={buildingHouseId}', [buildingHouseId]), + content: top.restAjax.path('route/houseuser/save?buildingHouseId={buildingHouseId}&keywords={keywords}', [buildingHouseId, keywords]), end: function() { reloadTable(); }