diff --git a/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml b/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml index 1f2b9f3..7afe460 100644 --- a/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml +++ b/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml @@ -239,6 +239,10 @@ t1.owner_card LIKE CONCAT('%', #{keywords}, '%') OR t2.card_number LIKE CONCAT('%', #{keywords}, '%') + OR + t2.name LIKE CONCAT('%', #{keywords}, '%') + OR + t2.phone LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/static/route/buildinghouse/list-check.html b/src/main/resources/static/route/buildinghouse/list-check.html index 2a11b12..58e4d8c 100644 --- a/src/main/resources/static/route/buildinghouse/list-check.html +++ b/src/main/resources/static/route/buildinghouse/list-check.html @@ -57,7 +57,8 @@ pageName: 'page', limitName: 'rows' }, - cols: [ + text: {none: '此人员暂未与房屋进行关联'} + ,cols: [ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, @@ -140,9 +141,9 @@ return rowData; } }, - {field: 'houseStatus', fixed: 'right', width: 150, title: '租房记录', align:'center', + {field: 'houseStatus', fixed: 'right', width: 150, title: '入住人员', align:'center', templet: function(row) { - var rowData = '租住记录';; + var rowData = '入住人员';; return rowData; } } diff --git a/src/main/resources/static/route/buildinghouse/list-view.html b/src/main/resources/static/route/buildinghouse/list-view.html index dd5696a..4a7d476 100644 --- a/src/main/resources/static/route/buildinghouse/list-view.html +++ b/src/main/resources/static/route/buildinghouse/list-view.html @@ -145,9 +145,9 @@ return rowData; } }, - {field: 'houseStatus', fixed: 'right', width: 150, title: '租房记录', align:'center', + {field: 'houseStatus', fixed: 'right', width: 150, title: '入住人员', align:'center', templet: function(row) { - var rowData = '租住记录';; + var rowData = '入住人员';; return rowData; } } diff --git a/src/main/resources/static/route/buildinghouse/list.html b/src/main/resources/static/route/buildinghouse/list.html index e100a84..2c99d14 100644 --- a/src/main/resources/static/route/buildinghouse/list.html +++ b/src/main/resources/static/route/buildinghouse/list.html @@ -327,9 +327,9 @@ return rowData; } }, - {field: 'houseStatus', fixed: 'right', width: 150, title: '租住记录', align:'center', + {field: 'houseStatus', fixed: 'right', width: 150, title: '入住人员', align:'center', templet: function(row) { - var rowData = '租住记录';; + var rowData = '入住人员';; return rowData; } }, diff --git a/src/main/resources/static/route/buildinghouseuser/list-view.html b/src/main/resources/static/route/buildinghouseuser/list-view.html index a7c049e..deb4bac 100644 --- a/src/main/resources/static/route/buildinghouseuser/list-view.html +++ b/src/main/resources/static/route/buildinghouseuser/list-view.html @@ -27,7 +27,7 @@ -
请输入居民身份证号查询
+
请输入居民身份证号/姓名/手机号查询