Procházet zdrojové kódy

Merge branch 'master' of https://github.com/java110/MicroCommunity into shiyj01

shiyj před 6 roky
rodič
revize
613e4052bd

+ 1 - 1
WebService/src/main/resources/components/index-arrears/indexArrears.html

@@ -30,7 +30,7 @@
                             <th>费用ID </th>
                             <th>费用ID </th>
                             <th>业主名称 </th>
                             <th>业主名称 </th>
                             <th>联系电话 </th>
                             <th>联系电话 </th>
-                            <th>房屋编号 </th>
+                            <th>{{indexArrearsInfo.feeTypeCd == 888800010001? '房屋' : '车位'}}编号 </th>
                             <th>费用开始时间 </th>
                             <th>费用开始时间 </th>
                             <th>费用到期时间 </th>
                             <th>费用到期时间 </th>
                         </tr>
                         </tr>

+ 3 - 0
WebService/src/main/resources/components/index-arrears/indexArrears.js

@@ -17,6 +17,9 @@
             vc.on("indexArrears","_listArrearsData",function(){
             vc.on("indexArrears","_listArrearsData",function(){
                 vc.component._listArrearsData(DEFAULT_PAGE,DEFAULT_ROWS);
                 vc.component._listArrearsData(DEFAULT_PAGE,DEFAULT_ROWS);
             });
             });
+            vc.on('pagination','page_event',function(_currentPage){
+                vc.component._listArrearsData(_currentPage,DEFAULT_ROWS);
+            });
         },
         },
         methods:{
         methods:{
             _listArrearsData:function(_page,_row){
             _listArrearsData:function(_page,_row){

+ 2 - 2
docs/hc小区管理系统数据库模型v1.0.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{0769820D-50C2-43E8-9E22-B3D04BAFBB81}" Label="" LastModificationDate="1559750947" Name="hc小区管理系统数据库模型v1.0" Objects="992" Symbols="96" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.1.0.2850"?>
+<?PowerDesigner AppLocale="UTF16" ID="{0769820D-50C2-43E8-9E22-B3D04BAFBB81}" Label="" LastModificationDate="1560849601" Name="hc小区管理系统数据库模型v1.0" Objects="989" Symbols="95" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.1.0.2850"?>
 <!-- do not edit this file -->
 <!-- do not edit this file -->
 
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -25591,7 +25591,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>MYSQL50</a:Code>
 <a:Code>MYSQL50</a:Code>
 <a:CreationDate>1558582641</a:CreationDate>
 <a:CreationDate>1558582641</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1559746713</a:ModificationDate>
+<a:ModificationDate>1560849601</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Modifier>Administrator</a:Modifier>
 <a:TargetModelURL>file:///%_DBMS%/mysql50.xdb</a:TargetModelURL>
 <a:TargetModelURL>file:///%_DBMS%/mysql50.xdb</a:TargetModelURL>
 <a:TargetModelID>F4F16ECD-F2F1-4006-AF6F-638D5C65F35E</a:TargetModelID>
 <a:TargetModelID>F4F16ECD-F2F1-4006-AF6F-638D5C65F35E</a:TargetModelID>