diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..264bc0564aee199db9512d6d5c00d697e03c7c83
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,5 @@
+from node:16.10.0
+
+copy . /data
+
+workdir /data
\ No newline at end of file
diff --git a/app.js b/app.js
index 137f520566e2704db40824a98ced16f471bf4fa2..81583b034a31f4e1f2e27aedee14493549b8baf4 100755
--- a/app.js
+++ b/app.js
@@ -40,10 +40,10 @@ let opts = {
 }
 
 
-app.use('/callComponent', proxy('http://192.168.100.108:8088', opts));
-app.use('/app', proxy('http://192.168.100.108:8088', opts));
+app.use('/callComponent', proxy('http://hc:8008', opts));
+app.use('/app', proxy('http://hc:8008', opts));
 app.use('/ws', createProxyMiddleware({
-    target: 'http://192.168.100.108:8008',
+    target: 'http://hc:8008',
     changeOrigin: true,
     ws: true
 }));
diff --git a/public/.DS_Store b/public/.DS_Store
index 982f3fda72555f5c356492cacd3ba5138f5fcb67..41f4eb79ec642cd355b77c0b4600e3d13636bdbd 100755
Binary files a/public/.DS_Store and b/public/.DS_Store differ
diff --git a/public/components/contract/contractDetailFee/contractDetailFee.html b/public/components/contract/contractDetailFee/contractDetailFee.html
index 407127e07fbcd69d931c8f934e4ee356961ba582..d6087001e550e82fd3ad2df43d127af7315a0172 100644
--- a/public/components/contract/contractDetailFee/contractDetailFee.html
+++ b/public/components/contract/contractDetailFee/contractDetailFee.html
@@ -7,16 +7,13 @@
 
         </div>
         <div class="col-lg-8 text-right">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                v-on:click="_openTempImportContractFeeModal()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openTempImportContractFeeModal()">
                 临时收费
             </button>
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                v-on:click="_openContractCreateFeeAddModal()" >
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openContractCreateFeeAddModal()">
                 创建费用
             </button>
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_toContractOwePayFee()"
-                >
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_toContractOwePayFee()">
                 欠费缴费
             </button>
         </div>
@@ -96,7 +93,9 @@
                             </span>{{_getContractAttrValue(fee.feeAttrs,'390003')}}</div>
                     </td>
                     <td class="text-center" width="150" v-else-if="fee.computingFormula == '4004'">
-                        <div><vc:i18n name="费用根据实际情况而定" namespace="contractDetailFee"></vc:i18n></div>
+                        <div>
+                            <vc:i18n name="费用根据实际情况而定" namespace="contractDetailFee"></vc:i18n>
+                        </div>
                     </td>
                     <td class="text-center" v-else>
                         <!-- <div><span><vc:i18n name="面积" namespace="contractDetailFee"></vc:i18n></span>：{{contractDetailFeeInfo.builtUpArea}}</div> -->
@@ -112,29 +111,22 @@
                     </td>
                     <td class="text-center">{{fee.stateName}}</td>
                     <td class="text-center">
-                        <button class="btn btn-link btn-xs"
-                            v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')"
-                            v-on:click="_payContractFee(fee)"><span>
+                        <button class="btn btn-link btn-xs" v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')" v-on:click="_payContractFee(fee)"><span>
                                 <vc:i18n name="缴费" namespace="contractDetailFee"></vc:i18n>
                             </span>
                         </button>
                         <button class="btn btn-link btn-xs" v-on:click="_payContractFeeHis(fee)"><span>
                                 <vc:i18n name="缴费历史" namespace="contractDetailFee"></vc:i18n>
                             </span></button>
-                        <button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')"
-                            v-on:click="_deleteContractFee(fee)"><span>
+                        <button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')" v-on:click="_deleteContractFee(fee)"><span>
                                 <vc:i18n name="取消" namespace="contractDetailFee"></vc:i18n>
                             </span>
                         </button>
-                        <button class="btn btn-link btn-xs"
-                            v-if="fee.state != '2009001' && vc.hasPrivilege('502021070488970005')"
-                            v-on:click="_finishContractFee(fee)"><span>
+                        <button class="btn btn-link btn-xs" v-if="fee.state != '2009001' && vc.hasPrivilege('502021070488970005')" v-on:click="_finishContractFee(fee)"><span>
                                 <vc:i18n name="结束" namespace="contractDetailFee"></vc:i18n>
                             </span>
                         </button>
-                        <button class="btn btn-link btn-xs"
-                            v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
-                            v-on:click="_editContractFee(fee)"><span>
+                        <button class="btn btn-link btn-xs" v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')" v-on:click="_editContractFee(fee)"><span>
                                 <vc:i18n name="变更" namespace="contractDetailFee"></vc:i18n>
                             </span>
                         </button>
@@ -152,7 +144,7 @@
                 <span>
                     <span>
                             <vc:i18n name="欠费小计：" namespace="contractDetailRoomFee"></vc:i18n>
-                    </span>{{contractDetailRoomFeeInfo.totalAmount}}
+                    </span>{{contractDetailFeeInfo.totalAmount}}
                 </span>
             </div>
             <div class="col-sm-6">
@@ -160,6 +152,6 @@
             </div>
         </div>
     </div>
-   
+
     <vc:create path="property/tempImportRoomFee"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/components/contract/contractDetailFile/contractDetailFile.js b/public/components/contract/contractDetailFile/contractDetailFile.js
index 21ad957fba452de5a0867768bee0fcf3d0beab09..000f67851670f60e5d118341ea8109429bbb5410 100644
--- a/public/components/contract/contractDetailFile/contractDetailFile.js
+++ b/public/components/contract/contractDetailFile/contractDetailFile.js
@@ -35,8 +35,8 @@
                 vc.http.apiGet('/contractFile/queryContractFile',
                     param,
                     function (json, res) {
-                        var _contractTFile = JSON.parse(json);
-                        vc.component.contractDetailInfo.files = _contractTFile.data;
+                        let _contractTFile = JSON.parse(json);
+                        $that.contractDetailFileInfo.files = _contractTFile.data;
                     },
                     function (errInfo, error) {
                         console.log('请求失败处理');
diff --git a/public/components/dev/addBusinessType/addBusinessType.html b/public/components/dev/addBusinessType/addBusinessType.html
index 7e3189437b43711761582dde0b845b6232afb726..81493b5c1372013edb806059007726bb41dee84e 100755
--- a/public/components/dev/addBusinessType/addBusinessType.html
+++ b/public/components/dev/addBusinessType/addBusinessType.html
@@ -22,7 +22,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="手机" namespace="addBusinessType"></vc:i18n></span></label>
-                                <div class="col-sm-10"><input v-model="addOwnerInfo.link" type="number" :placeholder="vc.i18n('必填，请填写联系方式','addBusinessType')" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="addOwnerInfo.link" :placeholder="vc.i18n('必填，请填写联系方式','addBusinessType')" class="form-control"></div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="备注" namespace="addBusinessType"></vc:i18n></span></label>
diff --git a/public/components/fee/downloadCollectionLetterOrder/downloadCollectionLetterOrder.html b/public/components/fee/downloadCollectionLetterOrder/downloadCollectionLetterOrder.html
new file mode 100644
index 0000000000000000000000000000000000000000..96587184c8f9e8d8d22dcf8832aec8c2244e3505
--- /dev/null
+++ b/public/components/fee/downloadCollectionLetterOrder/downloadCollectionLetterOrder.html
@@ -0,0 +1,46 @@
+<div id="downloadCollectionLetterOrderModel" class="modal fade" role="dialog" aria-labelledby="exampleModalLabel"
+    aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">
+                    <vc:i18n name="批量催缴单" namespace="downloadCollectionLetterOrder"></vc:i18n>
+                </h3>
+                <div class="ibox-content">
+                    <div>
+                        <div class="form-group row" v-if="downloadCollectionLetterOrderInfo.roomId">
+                            <tr align="center">
+                                <th>
+                                    <vc:i18n name="确认导出催缴单" namespace="deleteFee"></vc:i18n>
+                                </th>
+                            </tr>
+                        </div>
+                        <div class="form-group row" v-else>
+                            <label
+                                class="col-sm-2 col-form-label">{{vc.i18n('选择楼栋','downloadCollectionLetterOrder')}}</label>
+                            <div class="col-sm-10">
+                                <select class="custom-select" v-model="downloadCollectionLetterOrderInfo.floorId">
+                                    <option selected disabled value="">
+                                        {{vc.i18n('必填，请选择楼栋','downloadCollectionLetterOrder')}}
+                                    </option>
+                                    <option :value="item.floorId" v-for="(item,index) in downloadCollectionLetterOrderInfo.floors" :key="index">{{item.floorNum}}</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="ibox-content">
+                        <button class="btn btn-primary float-right" type="button" v-on:click="_exportCollectionLetterExcel()">
+                            <i class="fa fa-check"></i>&nbsp;导出
+                        </button>
+                        <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                            data-dismiss="modal">
+                            <i class="fa fa-times"></i>&nbsp;取消
+                        </button>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
\ No newline at end of file
diff --git a/public/components/fee/downloadCollectionLetterOrder/downloadCollectionLetterOrder.js b/public/components/fee/downloadCollectionLetterOrder/downloadCollectionLetterOrder.js
new file mode 100644
index 0000000000000000000000000000000000000000..d2bfa9fa233ab8b54ef2a80650504ab1b2479a8d
--- /dev/null
+++ b/public/components/fee/downloadCollectionLetterOrder/downloadCollectionLetterOrder.js
@@ -0,0 +1,76 @@
+(function(vc) {
+    vc.extends({
+        data: {
+            downloadCollectionLetterOrderInfo: {
+                floors: [],
+                floorId:'',
+                roomId:''
+            }
+        },
+        _initMethod: function() {
+           
+        },
+        _initEvent: function() {
+            vc.on('downloadCollectionLetterOrder', 'openExportExcel',
+                function(_room) {
+                    $that.clearRoomCreateFeeAddData();
+                    $that._loadDownloadCollectionLetterFloors();
+                    $that.downloadCollectionLetterOrderInfo.roomId = _room.roomId;
+                    $('#downloadCollectionLetterOrderModel').modal('show');
+                });
+        },
+        methods: {
+            _loadDownloadCollectionLetterFloors: function() {
+                let param = {
+                    params: {
+                        page: 1,
+                        row: 100,
+                        communityId: vc.getCurrentCommunity().communityId,
+                    }
+                }
+                vc.http.apiGet(
+                    '/floor.queryFloors',
+                    param,
+                    function (json, res) {
+                        let _json = JSON.parse(json);
+                        $that.downloadCollectionLetterOrderInfo.floors = _json.apiFloorDataVoList;
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                        vc.toast(errInfo);
+                    });
+            },
+            clearRoomCreateFeeAddData: function() {
+                $that.downloadCollectionLetterOrderInfo = {
+                    floors: [],
+                    floorId:'',
+                    roomId:''
+                };
+            },
+            _exportCollectionLetterExcel: function() {
+                $('#downloadCollectionLetterOrderModel').modal('hide');
+                let param = {
+                    params: {
+                        communityId:vc.getCurrentCommunity().communityId,
+                        pagePath:'dataFeeManualCollection',
+                        floorId:$that.downloadCollectionLetterOrderInfo.floorId,
+                        roomId:$that.downloadCollectionLetterOrderInfo.roomId
+
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/export.exportData', param,
+                    function(json, res) {
+                        let _json = JSON.parse(json);
+                        vc.toast(_json.msg);
+                        if (_json.code == 0) {
+                            vc.jumpToPage('/#/pages/property/downloadTempFile?tab=下载中心')
+                        }
+                    },
+                    function(errInfo, error) {
+                        console.log('请求失败处理');
+                    });
+            },
+        }
+    });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/frame/dataPrivilegeStaff/dataPrivilegeStaff.js b/public/components/frame/dataPrivilegeStaff/dataPrivilegeStaff.js
index a90d0918b841333cad6723461a421a6d38d9c4a6..33808ab402f814985c8598fc1626f74d13236a26 100644
--- a/public/components/frame/dataPrivilegeStaff/dataPrivilegeStaff.js
+++ b/public/components/frame/dataPrivilegeStaff/dataPrivilegeStaff.js
@@ -73,7 +73,7 @@
                 vc.component._listDataPrivilegeStaffs(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _toStaffDetail: function (_dataPrivilegeStaff) {
-                vc.jumpToPage('/#/pages/frame/staffDetail?staffId=' + _dataPrivilegeStaff.staffId)
+                vc.jumpToPage('/#/pages/staff/staffDetail?staffId=' + _dataPrivilegeStaff.staffId)
             }
         }
     });
diff --git a/public/components/frame/roleStaff/roleStaff.js b/public/components/frame/roleStaff/roleStaff.js
index c87826d1d1e7b109e4b3350b57b060f8238ba952..62f299efdb948bd4993920f2618d9a42ccd99a94 100644
--- a/public/components/frame/roleStaff/roleStaff.js
+++ b/public/components/frame/roleStaff/roleStaff.js
@@ -74,7 +74,7 @@
                 vc.component._listRoleStaffs(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _toStaffDetail: function (_roleStaff) {
-                vc.jumpToPage('/#/pages/frame/staffDetail?staffId=' + _roleStaff.userId)
+                vc.jumpToPage('/#/pages/staff/staffDetail?staffId=' + _roleStaff.userId)
             }
         }
     });
diff --git a/public/components/property/addFeeConfig/addFeeConfig.html b/public/components/property/addFeeConfig/addFeeConfig.html
index 4ba854583057ab79efb69f36880d315b4e8b76c2..1fe68ce48b98456028763696e3539a5e4909c2f5 100755
--- a/public/components/property/addFeeConfig/addFeeConfig.html
+++ b/public/components/property/addFeeConfig/addFeeConfig.html
@@ -82,16 +82,17 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label text-right"><span>
-                                        <vc:i18n name="催缴类型" namespace="addFeeConfig"></vc:i18n>
+                                        <vc:i18n name="催缴类型(每月X日)" namespace="addFeeConfig"></vc:i18n>
                                     </span></label>
                                 <div class="col-sm-4">
-                                    <select class="custom-select" v-model="addFeeConfigInfo.billType">
-                                        <option selected disabled value="">{{vc.i18n('必填，请选择催缴类型','addFeeConfig')}}
-                                        </option>
-                                        <option v-for="(item,index) in addFeeConfigInfo.billTypes" :key="index"
-                                            :value="item.statusCd">{{item.name}}
-                                        </option>
-                                    </select>
+<!--                                    <select class="custom-select" v-model="addFeeConfigInfo.billType">-->
+<!--                                        <option selected disabled value="">{{vc.i18n('必填，请选择催缴类型','addFeeConfig')}}-->
+<!--                                        </option>-->
+<!--                                        <option v-for="(item,index) in addFeeConfigInfo.billTypes" :key="index"-->
+<!--                                            :value="item.statusCd">{{item.name}}-->
+<!--                                        </option>-->
+<!--                                    </select>-->
+                                    <input class="form-control" value="1" v-model="editFeeConfigInfo.billType" type="number" />
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right"><span>
                                         <vc:i18n name="账户抵扣" namespace="addFeeConfig"></vc:i18n>
diff --git a/public/components/property/addOwner/addOwner.html b/public/components/property/addOwner/addOwner.html
index a86ff6e4a2d58469e173cb865e08fe940821dae5..df59c402d39f532e80f90312534cf4b8395cc809 100755
--- a/public/components/property/addOwner/addOwner.html
+++ b/public/components/property/addOwner/addOwner.html
@@ -23,7 +23,7 @@
                                     <span><vc:i18n name="手机" namespace="addOwner"></vc:i18n></span>
                                 </label>
                                 <div class="col-sm-10">
-                                    <input v-model.trim="addOwnerInfo.link" type="number" :placeholder="vc.i18n('必填，请填写联系方式','addOwner')" class="form-control">
+                                    <input v-model.trim="addOwnerInfo.link" :placeholder="vc.i18n('必填，请填写联系方式','addOwner')" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
diff --git a/public/components/property/addOwner/addOwner.js b/public/components/property/addOwner/addOwner.js
index 508aa7683898172d01fded5d5271da3852783a7e..78bc17badedf4b9ad6cedf4a1194cf795557e14e 100755
--- a/public/components/property/addOwner/addOwner.js
+++ b/public/components/property/addOwner/addOwner.js
@@ -87,6 +87,7 @@
                 });
             },
             saveOwnerInfo: function() {
+                let _url = "/owner.saveOwner";
                 if (!vc.component.addOwnerValidate()) {
                     vc.toast(vc.validate.errInfo);
                     return;
@@ -98,8 +99,11 @@
                 if (vc.component.addOwnerInfo.componentTitle == '业主') {
                     vc.component.addOwnerInfo.ownerTypeCd = '1001';
                 }
+                if($that.addOwnerInfo.ownerTypeCd && $that.addOwnerInfo.ownerTypeCd != '1001'){
+                    _url = "/owner.saveOwnerMember"
+                }
                 vc.component.addOwnerInfo.communityId = vc.getCurrentCommunity().communityId;
-                vc.http.apiPost('/owner.saveOwner',
+                vc.http.apiPost(_url,
                     JSON.stringify(vc.component.addOwnerInfo), {
                         emulateJSON: true
                     },
diff --git a/public/components/property/addOwnerRepair/addOwnerRepair.html b/public/components/property/addOwnerRepair/addOwnerRepair.html
index d796c5e92ffd9ea24432c03fda80fd2cfb2599b4..7820475d60f4c6f7f1a2f9a8d3bab8f48fa44f0b 100755
--- a/public/components/property/addOwnerRepair/addOwnerRepair.html
+++ b/public/components/property/addOwnerRepair/addOwnerRepair.html
@@ -78,7 +78,7 @@
                                     <span><vc:i18n name="联系方式" namespace="addOwnerRepair"></vc:i18n></span>
                                 </label>
                                 <div class="col-sm-10">
-                                    <input v-model="addOwnerRepairInfo.tel" type="number" :placeholder="vc.i18n('必填，请填写联系方式','addOwnerRepair')" class="form-control">
+                                    <input v-model="addOwnerRepairInfo.tel" :placeholder="vc.i18n('必填，请填写联系方式','addOwnerRepair')" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
diff --git a/public/components/property/bindOwnerShops/bindOwnerShops.html b/public/components/property/bindOwnerShops/bindOwnerShops.html
index 28a2a866b7820c8db4857464c5625050a8338d3a..cd868a788777522a84910967fe5459e8d7bad483 100755
--- a/public/components/property/bindOwnerShops/bindOwnerShops.html
+++ b/public/components/property/bindOwnerShops/bindOwnerShops.html
@@ -10,7 +10,7 @@
                         <div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="商铺编号" namespace="bindOwnerShops"></vc:i18n></span>
+                                    <vc:i18n name="商铺编号" namespace="bindOwnerShops"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="bindOwnerShopsInfo.shopsName" disabled="disabled"
@@ -20,7 +20,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="租户手机号" namespace="bindOwnerShops"></vc:i18n></span>
+                                    <vc:i18n name="租户手机号" namespace="bindOwnerShops"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="bindOwnerShopsInfo.tel" @blur="_shopsLoadOwnerInfo" type="number"
@@ -29,25 +29,25 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="租户姓名" namespace="bindOwnerShops"></vc:i18n></span>
+                                    <vc:i18n name="租户姓名" namespace="bindOwnerShops"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="bindOwnerShopsInfo.ownerName" type="text"
                                            :placeholder="vc.i18n('必填，请填写租户姓名','bindOwnerShops')" class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row" v-if="bindOwnerShopsInfo.shopsState == '2006'">
+                            <div class="form-group row" v-show="bindOwnerShopsInfo.shopsState == '2006'">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="起租时间" namespace="bindOwnerShops"></vc:i18n></span>
+                                    <vc:i18n name="起租时间" namespace="bindOwnerShops"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input type="text" :placeholder="vc.i18n('必填，请填写起租时间','bindOwnerShops')"
                                            class="form-control hireStartTime">
                                 </div>
                             </div>
-                            <div class="form-group row" v-if="bindOwnerShopsInfo.shopsState == '2006'">
+                            <div class="form-group row" v-show="bindOwnerShopsInfo.shopsState == '2006'">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="截租时间" namespace="bindOwnerShops"></vc:i18n></span>
+                                    <vc:i18n name="截租时间" namespace="bindOwnerShops"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input type="text" :placeholder="vc.i18n('必填，请填写截租时间','bindOwnerShops')"
@@ -56,7 +56,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="备注" namespace="bindOwnerShops"></vc:i18n></span>
+                                    <vc:i18n name="备注" namespace="bindOwnerShops"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <textarea v-model="bindOwnerShopsInfo.remark"
diff --git a/public/components/property/bindOwnerShops/bindOwnerShops.js b/public/components/property/bindOwnerShops/bindOwnerShops.js
index 50b35e0197086b34d2ac1090db394d0c24a6891f..2f44aa4d6e2fafcd8addccd6cd7341d110b667bb 100755
--- a/public/components/property/bindOwnerShops/bindOwnerShops.js
+++ b/public/components/property/bindOwnerShops/bindOwnerShops.js
@@ -31,7 +31,7 @@
         },
         _initEvent: function () {
             vc.on('bindOwnerShops', 'bindOwnerShopsModel', function (_params) {
-                vc.component.refreshAddShopsInfo();
+                $that.refreshAddShopsInfo();
                 $that.bindOwnerShopsInfo.roomId = _params.roomId;
                 $that.bindOwnerShopsInfo.shopsState = _params.shopsState;
                 if (_params.shopsState == '2007') {
@@ -40,13 +40,13 @@
                 }
                 $that.bindOwnerShopsInfo.shopsName = _params.floorNum + '-' + _params.roomNum;
                 $('#bindOwnerShopsModel').modal('show');
-                vc.component.bindOwnerShopsInfo.communityId = vc.getCurrentCommunity().communityId;
+                $that.bindOwnerShopsInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
         methods: {
             bindOwnerShopsValidate: function () {
                 return vc.validate.validate({
-                    bindOwnerShopsInfo: vc.component.bindOwnerShopsInfo
+                    bindOwnerShopsInfo: $that.bindOwnerShopsInfo
                 }, {
                     'bindOwnerShopsInfo.roomId': [
                         {
@@ -98,13 +98,13 @@
                 });
             },
             bindOwnerShops: function () {
-                if (!vc.component.bindOwnerShopsValidate()) {
+                if (!$that.bindOwnerShopsValidate()) {
                     vc.toast(vc.validate.errInfo);
                     return;
                 }
                 vc.http.apiPost(
                     '/room.saveOwnerShops',
-                    JSON.stringify(vc.component.bindOwnerShopsInfo), {
+                    JSON.stringify($that.bindOwnerShopsInfo), {
                         emulateJSON: true
                     },
                     function (json, res) {
@@ -158,7 +158,7 @@
                 );
             },
             refreshAddShopsInfo: function () {
-                vc.component.bindOwnerShopsInfo = {
+                $that.bindOwnerShopsInfo = {
                     roomId: '',
                     roomNum: '',
                     shopsName: '',
@@ -174,4 +174,4 @@
             }
         }
     });
-})(window.vc, window.vc.component);
\ No newline at end of file
+})(window.vc, window.$that);
\ No newline at end of file
diff --git a/public/components/property/deleteCommunitySpacePerson/deleteCommunitySpacePerson.html b/public/components/property/deleteCommunitySpacePerson/deleteCommunitySpacePerson.html
index 65dfe454b5ce7190228155b19d62881de2661cec..75976c8d0448ba27ce9280835b634ad3b0ae23a5 100644
--- a/public/components/property/deleteCommunitySpacePerson/deleteCommunitySpacePerson.html
+++ b/public/components/property/deleteCommunitySpacePerson/deleteCommunitySpacePerson.html
@@ -1,20 +1,30 @@
-<div class="modal fade" id="deleteCommunitySpacePersonModel" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+<div class="modal fade" id="deleteCommunitySpacePersonModel" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="exampleModalLabel"> <span><vc:i18n name="请确认您的操作!"></vc:i18n></span></h5>
+                <h5 class="modal-title" id="exampleModalLabel">
+                    <vc:i18n name="请确认您的操作!"></vc:i18n>
+                </h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
                 <tr align="center">
-                    <th><span><vc:i18n name="确定删除场地预约人" namespace="deleteCommunitySpacePerson"></vc:i18n></span></th>
+                    <th>
+                        <vc:i18n name="确定取消场地预约人，如果是线上预约，自动会退款到预约人账户" namespace="deleteCommunitySpacePerson"></vc:i18n>
+                    </th>
                 </tr>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDeleteCommunitySpacePersonModel()"><span><vc:i18n name="点错了"></vc:i18n></span></button>
-                <button type="button" class="btn btn-primary" v-on:click="deleteCommunitySpacePerson()"><span><vc:i18n name="确认删除!"></vc:i18n></span></button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal"
+                        v-on:click="closeDeleteCommunitySpacePersonModel()">
+                    <vc:i18n name="点错了"></vc:i18n>
+                </button>
+                <button type="button" class="btn btn-primary" v-on:click="deleteCommunitySpacePerson()">
+                    <vc:i18n name="确认取消!"></vc:i18n>
+                </button>
             </div>
         </div>
     </div>
diff --git a/public/components/property/editFeeConfig/editFeeConfig.html b/public/components/property/editFeeConfig/editFeeConfig.html
index 2bd35ee1a4c5c4ebbe15c4be32e0f5a1b1c4a68e..365ae5eedc1236e1ae65ad4d666bf2977e565d4c 100755
--- a/public/components/property/editFeeConfig/editFeeConfig.html
+++ b/public/components/property/editFeeConfig/editFeeConfig.html
@@ -60,16 +60,17 @@
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label text-right"><span><vc:i18n name="催缴类型" namespace="editFeeConfig"></vc:i18n></span></label>
+                                <label class="col-sm-2 col-form-label text-right"><span><vc:i18n name="催缴类型(每月X日)" namespace="editFeeConfig"></vc:i18n></span></label>
                                 <div class="col-sm-4">
-                                    <select class="custom-select" v-model="editFeeConfigInfo.billType">
-                                        <option selected disabled value="">
-                                            {{vc.i18n('必填，请选择催缴类型','editFeeConfig')}}
-                                        </option>
-                                        <option v-for="(item,index) in editFeeConfigInfo.billTypes" :key="index"
-                                                :value="item.statusCd">{{item.name}}
-                                        </option>
-                                    </select>
+<!--                                    <select class="custom-select" v-model="editFeeConfigInfo.billType">-->
+<!--                                        <option selected disabled value="">-->
+<!--                                            {{vc.i18n('必填，请选择催缴类型','editFeeConfig')}}-->
+<!--                                        </option>-->
+<!--                                        <option v-for="(item,index) in editFeeConfigInfo.billTypes" :key="index"-->
+<!--                                                :value="item.statusCd">{{item.name}}-->
+<!--                                        </option>-->
+<!--                                    </select>-->
+                                    <input class="form-control" value="1" v-model="editFeeConfigInfo.billType" type="number" />
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right"><span><vc:i18n name="是否抵扣" namespace="editFeeConfig"></vc:i18n></span></label>
                                 <div class="col-sm-4">
diff --git a/public/components/property/editOwner/editOwner.html b/public/components/property/editOwner/editOwner.html
index 3d32bc1a5e11e52d3f3274a978a4f565e9e6835d..cb6f11705145ba8506253675010d9f634bdeee57 100755
--- a/public/components/property/editOwner/editOwner.html
+++ b/public/components/property/editOwner/editOwner.html
@@ -107,7 +107,7 @@
                                     <span><vc:i18n name="手机" namespace="editOwner"></vc:i18n></span>
                                 </label>
                                 <div class="col-sm-10">
-                                    <input v-model.trim="editOwnerInfo.link" :placeholder="vc.i18n('必填，请填写联系方式','editOwner')" class="form-control" maxLength="11">
+                                    <input v-model.trim="editOwnerInfo.link" :placeholder="vc.i18n('必填，请填写联系方式','editOwner')" class="form-control">
                                 </div>
                             </div>
                         </div>
diff --git a/public/components/property/editOwner/editOwner.js b/public/components/property/editOwner/editOwner.js
index ce16c056b1b49ec788f1853a50db10ebed69266a..f015aa388d88447ea815b11e4249ae6b731de6b1 100755
--- a/public/components/property/editOwner/editOwner.js
+++ b/public/components/property/editOwner/editOwner.js
@@ -36,6 +36,10 @@
                 if (_owner.address == null || _owner.address == undefined || _owner.address == '') {
                     vc.component.editOwnerInfo.address = "";
                 }
+
+                //清理 上次数据
+                $that.clearEditOwnerInfo();
+
                 vc.copyObject(_owner, vc.component.editOwnerInfo);
                 //根据memberId 查询 照片信息
                 vc.component.editOwnerInfo.ownerPhoto = _owner.urls && _owner.urls.length > 0 ? _owner.urls[0] : '';
@@ -116,7 +120,7 @@
                         if (_json.code == 0) {
                             //关闭model
                             $('#editOwnerModel').modal('hide');
-                            vc.component.clearEditOwnerInfo();
+
                             vc.emit($props.notifyLoadDataComponentName, 'listOwnerData', {});
                             vc.toast("修改成功");
                             return;
@@ -132,6 +136,9 @@
             clearEditOwnerInfo: function() {
                 let _componentTitle = $that.editOwnerInfo.componentTitle;
                 let _attrs = $that.editOwnerInfo.attrs;
+                _attrs.forEach(item => {
+                    item.value = '';
+                })
                 vc.component.editOwnerInfo = {
                     componentTitle: _componentTitle,
                     ownerId: '',
diff --git a/public/components/property/editOwnerRepair/editOwnerRepair.html b/public/components/property/editOwnerRepair/editOwnerRepair.html
index 0e56387bfb9b66341c81860b11c699f9bcd54b27..90e13cc54ba4f8be7b5f2a5e70e44e8309c9f473 100755
--- a/public/components/property/editOwnerRepair/editOwnerRepair.html
+++ b/public/components/property/editOwnerRepair/editOwnerRepair.html
@@ -29,7 +29,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="联系方式" namespace="editOwnerRepair"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="editOwnerRepairInfo.tel" type="number" :placeholder="vc.i18n('必填，请填写联系方式','editOwnerRepair')"
+                                    <input v-model="editOwnerRepairInfo.tel" :placeholder="vc.i18n('必填，请填写联系方式','editOwnerRepair')"
                                            class="form-control">
                                 </div>
                             </div>
diff --git a/public/components/property/editRoom/editRoom.html b/public/components/property/editRoom/editRoom.html
index 9ffadeda388643e17130dd53ca4a247dc45d3b8f..e8b97916d47551ba30db7e3aa8ad6939529db853 100755
--- a/public/components/property/editRoom/editRoom.html
+++ b/public/components/property/editRoom/editRoom.html
@@ -170,6 +170,14 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">
+                                    <span><vc:i18n name="入住时间" namespace="editRoom"></vc:i18n></span>
+                                </label>
+                                <div class="col-sm-4">
+                                    <input v-model="editRoomInfo.startTime" type="text" class="form-control updateRoomCreateTime" name="startTime">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
                                     <span><vc:i18n name="备注" namespace="editRoom"></vc:i18n></span>
diff --git a/public/components/property/editRoom/editRoom.js b/public/components/property/editRoom/editRoom.js
index 5b73ee6dea82eb7f738268b5efc8ae1a614b136d..c4101ae75926d50590535e1027caa9a5b1f91c4f 100755
--- a/public/components/property/editRoom/editRoom.js
+++ b/public/components/property/editRoom/editRoom.js
@@ -15,6 +15,7 @@
                 feeCoefficient: '1.00',
                 state: '',
                 remark: '',
+                startTime: '',
                 communityId: '',
                 attrs: [],
                 roomSubType: '110',
@@ -25,6 +26,7 @@
         },
         _initMethod: function () {
             $that._loadRoomAttrSpec();
+            vc.component._initUpdateCreateTimeInfo();
         },
         _initEvent: function () {
             vc.on('editRoom', 'openEditRoomModal', function (_room) {
@@ -52,6 +54,35 @@
             });
         },
         methods: {
+            _initUpdateCreateTimeInfo: function () {
+                $('.updateRoomCreateTime').datetimepicker({
+                    language: 'zh-CN',
+                    fontAwesome: 'fa',
+                    format: 'yyyy-mm-dd hh:ii:ss',
+                    minView: 2,
+                    startView: 2,
+                    maxView: 1,
+                    keyboardNavigation: true,
+                    todayHighlight: true,
+                    initTime: true,
+                    initialDate: new Date(),
+                    autoClose: true,
+                    todayBtn: true
+                });
+
+                $('.updateRoomCreateTime').datetimepicker()
+                    .on('changeDate', function(ev) {
+                        var value = $(".updateRoomCreateTime").val();
+                        vc.component.editRoomInfo.startTime = value;
+                    });
+
+                //防止多次点击时间插件失去焦点
+                document.getElementsByName('startTime')[0].addEventListener('click', myfunc)
+
+                function myfunc(e) {
+                    e.currentTarget.blur();
+                }
+            },
             /**
              根据楼ID加载房屋
              **/
@@ -224,12 +255,14 @@
                 if ('' == vc.component.editRoomInfo.unitPrice || null == vc.component.editRoomInfo.unitPrice) {
                     vc.component.editRoomInfo.unitPrice = '0';
                 }
+                console.log('room.updateRoom(vc.component.editRoomInfo): ' + JSON.stringify(vc.component.editRoomInfo))
                 vc.http.apiPost(
                     '/room.updateRoom',
                     JSON.stringify(vc.component.editRoomInfo), {
                         emulateJSON: true
                     },
                     function (json, res) {
+                        console.log('room.updateRoom: '+ json)
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                         let _json = JSON.parse(json);
                         if (_json.code == 0) {
@@ -238,7 +271,7 @@
                             vc.emit('room', 'loadData', {
                                 floorId: vc.component.editRoomInfo.floorId
                             });
-                            vc.emit('ownerDetailRoom','notify',{});
+                            vc.emit('ownerDetailRoom', 'notify', {});
 
                             vc.toast("修改成功");
                             return;
@@ -270,6 +303,7 @@
                     feeCoefficient: '1.00',
                     state: '',
                     remark: '',
+                    startTime: '',
                     communityId: '',
                     attrs: _attrs,
                     roomSubType: '110',
diff --git a/public/components/property/notepadOwnerRepair/notepadOwnerRepair.html b/public/components/property/notepadOwnerRepair/notepadOwnerRepair.html
index 526b8e7f4a5ab2d21e9532197b6d0100e232ed47..564425445b985e2fb960b862509a361176451275 100644
--- a/public/components/property/notepadOwnerRepair/notepadOwnerRepair.html
+++ b/public/components/property/notepadOwnerRepair/notepadOwnerRepair.html
@@ -48,7 +48,7 @@
                                     <span><vc:i18n name="联系方式" namespace="notepadOwnerRepair"></vc:i18n></span>
                                 </label>
                                 <div class="col-sm-10">
-                                    <input v-model="notepadOwnerRepairInfo.tel" type="number"
+                                    <input v-model="notepadOwnerRepairInfo.tel"
                                            :placeholder="vc.i18n('必填，请填写联系方式','notepadOwnerRepair')"
                                            class="form-control">
                                 </div>
diff --git a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js
index 27458814e26fa00edf0199f85dbc3d77430d9b82..ba646c72ec4ccfaeda8bb8b1daa1855f9b6b3399 100644
--- a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js
+++ b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js
@@ -212,7 +212,7 @@
                         vc.toast(errInfo);
                     });
             },
-            _carInTempCarPayFee: function (car) {
+            _carInTempCarPayFee: function (carIn) {
                 vc.emit('parkingAreaControlCustomCarInout', 'open', {
                     type: "1102", //1101 手动入场 1102 手动出场
                     carNum: carIn.carNum,
diff --git a/public/components/property/reportHuaningOweFee/reportHuaningOweFee.html b/public/components/property/reportHuaningOweFee/reportHuaningOweFee.html
index f8bd14acf0fe1f270e4181abe84d3e60aba30055..a6085bae52e5b840635a7bbf4ae84752df418373 100644
--- a/public/components/property/reportHuaningOweFee/reportHuaningOweFee.html
+++ b/public/components/property/reportHuaningOweFee/reportHuaningOweFee.html
@@ -23,8 +23,7 @@
                             <td class="text-center ">{{fee.floorNum}}</td>
                             <td class="text-center ">{{fee.oweAmount}}</td>
                             <td class="text-center ">{{fee.curOweAmount}}</td>
-                            <td class="text-center">{{_getPreAmount(fee)}}</td>
-
+                            <td class="text-center">{{fee.preOweAmount}}</td>
                         </tr>
                     </tbody>
                     <tfoot>
@@ -35,8 +34,6 @@
                         </tr>
                     </tfoot>
                 </table>
-                <!-- 分页 -->
-                <vc:create path="frame/pagination"></vc:create>
             </div>
         </div>
         <div class="row">
diff --git a/public/components/property/reportHuaningOweFee/reportHuaningOweFee.js b/public/components/property/reportHuaningOweFee/reportHuaningOweFee.js
index 3b06b1a921a6a2a016f34720b123bb1a3a913281..0e744d7e5eb41be55a978bcaa0781b958094d1fe 100644
--- a/public/components/property/reportHuaningOweFee/reportHuaningOweFee.js
+++ b/public/components/property/reportHuaningOweFee/reportHuaningOweFee.js
@@ -50,11 +50,6 @@
                         vc.component.reportHuaningOweFeeInfo.total = _feeConfigInfo.total;
                         vc.component.reportHuaningOweFeeInfo.records = _feeConfigInfo.records;
                         vc.component.reportHuaningOweFeeInfo.fees = _feeConfigInfo.data;
-                        vc.emit('reportHuaningOweFee', 'paginationPlus', 'init', {
-                            total: _feeConfigInfo.records,
-                            dataCount: vc.component.reportHuaningOweFeeInfo.total,
-                            currentPage: _page
-                        });
                         //取 属性列
                         if (_feeConfigInfo.total < 1) {
                             return;
@@ -112,12 +107,6 @@
                 let year = date.getFullYear();
                 return year + "年前未收金额";
             },
-            _getPreAmount: function(_fee) {
-                return (parseFloat(_fee.oweAmount) - parseFloat(_fee.curOweAmount)).toFixed(2);
-            },
-            _toHuaningOweFeeDetail: function(_fee) {
-                vc.jumpToPage('/#/pages/property/reportHuaningOweFeeDetail2?floorNum=' + _fee.floorNum)
-            }
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/components/property/reportHuaningOweFeeDetail/reportHuaningOweFeeDetail.html b/public/components/property/reportHuaningOweFeeDetail/reportHuaningOweFeeDetail.html
index ffe9781a48e32a21a0bb80664df0e01462c00ef5..ddceb24b96f3ac065172c308ce9fede015549acf 100644
--- a/public/components/property/reportHuaningOweFeeDetail/reportHuaningOweFeeDetail.html
+++ b/public/components/property/reportHuaningOweFeeDetail/reportHuaningOweFeeDetail.html
@@ -5,28 +5,26 @@
                 <table class="footable table table-stripped " style="margin-top:10px" data-page-size="10">
                     <thead>
                         <tr>
-                            <th class="text-center " style="border-bottom: none;"><span><vc:i18n name="房号" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
-                            <th class="text-center" style="border-bottom: none;"><span><vc:i18n name="面积" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
-                            <th class="text-center " style="border-bottom: none;"><span><vc:i18n name="单价" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
-                            <th class="text-center " style="border-bottom: none;"><span><vc:i18n name="月收费" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
-                            <th class="text-center " style="border-bottom: none;"><span><vc:i18n name="费用开始时间" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
-                            <th class="text-center " style="border-bottom: none;"><span><vc:i18n name="费用截止时间" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
-                            <th class="text-center " style="border-bottom: none;"><span><vc:i18n name="总未收金额" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
+                            <th class="text-center " style="border-bottom: none;"><vc:i18n name="房号" namespace="reportHuaningOweFeeDetail"></vc:i18n></th>
+                            <th class="text-center" style="border-bottom: none;"><vc:i18n name="面积" namespace="reportHuaningOweFeeDetail"></vc:i18n></th>
+                            <th class="text-center " style="border-bottom: none;"><vc:i18n name="费用" namespace="reportHuaningOweFeeDetail"></vc:i18n></th>
+                            <th class="text-center " style="border-bottom: none;"><vc:i18n name="费用开始时间" namespace="reportHuaningOweFeeDetail"></vc:i18n></th>
+                            <th class="text-center " style="border-bottom: none;"><vc:i18n name="费用截止时间" namespace="reportHuaningOweFeeDetail"></vc:i18n></th>
+                            <th class="text-center " style="border-bottom: none;"><vc:i18n name="总未收金额" namespace="reportHuaningOweFeeDetail"></vc:i18n></th>
                             <th class="text-center " style="border-bottom: none;">{{reportHuaningOweFeeDetailInfo.conditions.year}}<span><vc:i18n name="年" namespace="reportHuaningOweFeeDetail"></vc:i18n></span>1-{{reportHuaningOweFeeDetailInfo.conditions.month}}<span><vc:i18n name="月未收金额" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
                             <th class="text-center " style="border-bottom: none;">{{reportHuaningOweFeeDetailInfo.conditions.year}}<span><vc:i18n name="年前未收金额" namespace="reportHuaningOweFeeDetail"></vc:i18n></span></th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr v-for="fee in reportHuaningOweFeeDetailInfo.fees">
-                            <td class="text-center ">{{fee.payerObjName}}</td>
+                            <td class="text-center ">{{fee.roomName}}</td>
                             <td class="text-center ">{{fee.builtUpArea}}</td>
-                            <td class="text-center ">{{fee.squarePrice}}</td>
-                            <td class="text-center">{{_getMonthFee(fee)}}</td>
-                            <td class="text-center">{{fee.startTime}}</td>
+                            <td class="text-center ">{{fee.feeName}}</td>
                             <td class="text-center">{{fee.endTime}}</td>
+                            <td class="text-center">{{fee.deadlineTime}}</td>
                             <td class="text-center">{{fee.oweAmount}}</td>
-                            <td class="text-center">{{fee.btAmount}}</td>
-                            <td class="text-center">{{fee.bfAmount}}</td>
+                            <td class="text-center">{{fee.curOweAmount}}</td>
+                            <td class="text-center">{{fee.preOweAmount}}</td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/public/components/property/reportHuaningPayFee/reportHuaningPayFee.js b/public/components/property/reportHuaningPayFee/reportHuaningPayFee.js
index 313c6605ca862d010f539c3cbb5d1dfcb5f2db39..2fb9e372c5684a284853c10be9a896f1c997c9fa 100644
--- a/public/components/property/reportHuaningPayFee/reportHuaningPayFee.js
+++ b/public/components/property/reportHuaningPayFee/reportHuaningPayFee.js
@@ -53,11 +53,7 @@
                         vc.component.reportHuaningPayFeeInfo.total = _feeConfigInfo.total;
                         vc.component.reportHuaningPayFeeInfo.records = _feeConfigInfo.records;
                         vc.component.reportHuaningPayFeeInfo.fees = _feeConfigInfo.data;
-                        vc.emit('reportHuaningPayFee', 'paginationPlus', 'init', {
-                            total: _feeConfigInfo.records,
-                            dataCount: vc.component.reportHuaningPayFeeInfo.total,
-                            currentPage: _page
-                        });
+                        
                     }, function () {
                         console.log('请求失败处理');
                     }
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
index 423da1be663a0adb99d83ee8cd064a4e64fbe284..7365a7d530cff4f3d390d5fe40977b238fcda0cf 100755
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
@@ -202,9 +202,9 @@
                                            class="form-control roomCreateFeeStartTime">
                                 </div>
                             </div>
-                            <!-- 显示条件：1.不是押金 2.不是其他费用 3.不是周期性费用 -->
+                            <!-- 显示条件：1.不是押金roomCreateFeeAddInfo.feeTypeCd != '888800010006' && 2.不是其他费用 3.不是周期性费用 -->
                             <div class="form-group row"
-                                 v-show="roomCreateFeeAddInfo.feeTypeCd != '888800010006' && roomCreateFeeAddInfo.feeFlag != '1003006'">
+                                 v-show=" roomCreateFeeAddInfo.feeFlag != '1003006'">
                                 <label class="col-sm-2 col-form-label">
                                     <span><vc:i18n name="计费结束时间" namespace="roomCreateFeeAdd"></vc:i18n></span>
                                 </label>
diff --git a/public/components/report/dataMonthOweStatistics/dataMonthOweStatistics.html b/public/components/report/dataMonthOweStatistics/dataMonthOweStatistics.html
new file mode 100644
index 0000000000000000000000000000000000000000..71f10be059d28a173638ca82c2091eb7e788eb43
--- /dev/null
+++ b/public/components/report/dataMonthOweStatistics/dataMonthOweStatistics.html
@@ -0,0 +1,99 @@
+<div class="margin-top">
+    <div class="row">
+        <div class="col-md-1 padding-r-0">
+            <div class=" border-radius ">
+                <div class="margin-xs-r  treeview attendance-staff" style="height: 650px;">
+                    <ul class="list-group text-center border-radius">
+                        <li class="list-group-item node-orgTree "
+                            v-for="(item,index) in dataMonthOweStatisticsInfo.feeTypeCds" :key="index"
+                            @click="_switchMonthOweStatisticsFeeTypeCd(item.statusCd)"
+                            :class="{'vc-node-selected':dataMonthOweStatisticsInfo.feeTypeCd == item.statusCd}">
+                            {{item.name}}
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-11">
+            <div class="row ">
+                <div class="col-lg-2 padding-right-xs padding-left-xl">
+                    <select class="custom-select" v-model="dataMonthOweStatisticsInfo.floorId">
+                        <option value="">请选择楼栋</option>
+                        <option :value="item.floorId" v-for="(item,index) in dataMonthOweStatisticsInfo.floors">
+                            {{item.floorNum}}</option>
+                    </select>
+                </div>
+                <div class="col-lg-2 padding-right-xs padding-left-xl">
+                    <input v-model="dataMonthOweStatisticsInfo.feeStartDate" type="text"
+                        :placeholder="vc.i18n('请填写费用开始时间','dataMonthOweStatistics')"
+                        class="form-control feeOweStartDate">
+                </div>
+                <div class="col-lg-2 padding-right-xs padding-left-xl">
+                    <input v-model="dataMonthOweStatisticsInfo.feeEndDate" type="text"
+                        :placeholder="vc.i18n('请填写费用结束时间','dataMonthOweStatistics')"
+                        class="form-control feeOweEndDate">
+                </div>
+                <div class="col-lg-2 padding-right-xs padding-right-xl">
+                    <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                        v-on:click="_qureyDataMonthOweStatistics()">
+                        <i class="fa fa-search"></i>查询
+                    </button>
+                </div>
+                <div class="col-lg-4 text-right">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportReportMonthOweFeeExcel()">
+                        <vc:i18n name="导出" namespace="dataMonthOweStatistics"></vc:i18n>
+                    </button>
+                </div>
+            </div>
+            <div class="margin-top">
+                <table class="table table-bordered" data-page-size="15">
+                    <thead>
+                        <tr>
+                            <th class="text-center">
+                                <vc:i18n name="房屋" namespace="dataMonthOweStatistics"></vc:i18n>
+                            </th>
+                            <th class="text-center">
+                                <vc:i18n name="业主" namespace="dataMonthOweStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="费用名称" namespace="dataMonthOweStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="欠费时间段" namespace="dataMonthOweStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="欠费金额" namespace="dataMonthOweStatistics"></vc:i18n>
+                            </th>
+                           
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr v-for="fee in dataMonthOweStatisticsInfo.fees">
+                            <td class="text-center">{{fee.objName}}</td>
+                            <td class="text-center">{{fee.ownerName}}({{fee.link}})</td>
+                            <td class="text-center">
+                                {{fee.feeName}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.curYearMonth}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.receivableAmount || 0}}
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+                <!-- 分页 -->
+                <div class="row">
+
+                    <div class="col-sm-4">
+                        <span><vc:i18n name="总欠费：" namespace="dataMonthOweStatistics"></vc:i18n> </span><span>{{dataMonthOweStatisticsInfo.feeAmount}}</span>
+                    </div>
+                    <div class="col-sm-8">
+                        <vc:create namespace="dataMonthOweStatistics" path="frame/paginationPlus"></vc:create>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/components/report/dataMonthOweStatistics/dataMonthOweStatistics.js b/public/components/report/dataMonthOweStatistics/dataMonthOweStatistics.js
new file mode 100644
index 0000000000000000000000000000000000000000..42cb9fcac7c389a327c7b172d034f73b839be391
--- /dev/null
+++ b/public/components/report/dataMonthOweStatistics/dataMonthOweStatistics.js
@@ -0,0 +1,146 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data: {
+            dataMonthOweStatisticsInfo: {
+                fees: [],
+                feeTypeCds: [],
+                floors: [],
+                floorId: '',
+                ownerId: '',
+                roomNum: '',
+                feeStartDate: '',
+                feeEndDate: '',
+                feeTypeCd: '',
+                feeAmount: '0'
+            }
+        },
+        _initMethod: function () {
+            vc.getDict('pay_fee_config', "fee_type_cd_show", function (_data) {
+                $that.dataMonthOweStatisticsInfo.feeTypeCds = _data;
+                $that.dataMonthOweStatisticsInfo.feeTypeCd = _data[0].statusCd;
+            });
+            $that._loadMonthOweFloors();
+        },
+        _initEvent: function () {
+            vc.on('dataMonthOweStatistics', 'switch', function (_data) {
+                 $that.dataMonthOweStatisticsInfo.feeStartDate = _data.startDate;
+                 $that.dataMonthOweStatisticsInfo.feeEndDate = _data.endDate;
+                setTimeout(function(){
+                    $that._initMonthOweDate();
+                 },1000);
+                $that._qureyDataMonthOweStatistics(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            });
+            vc.on('dataMonthOweStatistics', 'paginationPlus', 'page_event',
+                function (_currentPage) {
+                    $that._loadDataMonthOweStatisticsData(_currentPage, DEFAULT_ROWS);
+                });
+            vc.on('dataMonthOweStatistics', 'notify', function (_data) {
+                $that._loadDataMonthOweStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+            })
+        },
+        methods: {
+            _initMonthOweDate: function () {
+                vc.initDate('feeOweStartDate', function (_value) {
+                    $that.dataMonthOweStatisticsInfo.feeStartDate = _value;
+                });
+                vc.initDate('feeOweEndDate', function (_value) {
+                    $that.dataMonthOweStatisticsInfo.feeEndDate = _value;
+                });
+            },
+            _loadDataMonthOweStatisticsData: function (_page,_row) {
+                let param = {
+                    params: {
+                        page:_page,
+                        row:_row,
+                        communityId: vc.getCurrentCommunity().communityId,
+                        feeStartDate: $that.dataMonthOweStatisticsInfo.feeStartDate,
+                        feeEndDate: $that.dataMonthOweStatisticsInfo.feeEndDate,
+                        feeTypeCd: $that.dataMonthOweStatisticsInfo.feeTypeCd,
+                        floorId: $that.dataMonthOweStatisticsInfo.floorId,
+                    }
+                };
+
+                //发送get请求
+                vc.http.apiGet('/dataReport.queryMonthOweDetail',
+                    param,
+                    function (json) {
+                        let _json = JSON.parse(json);
+                        $that.dataMonthOweStatisticsInfo.fees =  _json.data;
+                        $that.dataMonthOweStatisticsInfo.feeAmount = _json.sumTotal;
+                        vc.emit('dataMonthOweStatistics', 'paginationPlus', 'init', {
+                            total: _json.records,
+                            dataCount: _json.total,
+                            currentPage: _page
+                        });
+                    },
+                    function () {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _loadMonthOweFloors: function () {
+                let param = {
+                    params: {
+                        page: 1,
+                        row: 100,
+                        communityId: vc.getCurrentCommunity().communityId
+                    }
+                };
+                $that.dataMonthOweStatisticsInfo.fees = [];
+                //发送get请求
+                vc.http.apiGet('/floor.queryFloors',
+                    param,
+                    function (json, res) {
+                        let listFloorData = JSON.parse(json);
+
+                        let _floors = listFloorData.apiFloorDataVoList;
+                        $that.dataMonthOweStatisticsInfo.floors = _floors;
+
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            //查询
+            _qureyDataMonthOweStatistics: function () {
+                $that._loadDataMonthOweStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+            },
+            _exportReportMonthOweFeeExcel: function () {
+                
+                let param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        feeStartDate: $that.dataMonthOweStatisticsInfo.feeStartDate,
+                        feeEndDate: $that.dataMonthOweStatisticsInfo.feeEndDate,
+                        feeTypeCd: $that.dataMonthOweStatisticsInfo.feeTypeCd,
+                        floorId: $that.dataMonthOweStatisticsInfo.floorId,
+                        pagePath: 'dataMonthOweStatistics'
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/export.exportData', param,
+                    function (json, res) {
+                        let _json = JSON.parse(json);
+                        vc.toast(_json.msg);
+                        if (_json.code == 0) {
+                            vc.jumpToPage('/#/pages/property/downloadTempFile?tab=下载中心')
+                        }
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                    });
+            },
+            _switchMonthOweStatisticsFeeTypeCd: function (_feeTypeCd) {
+                $that.dataMonthOweStatisticsInfo.feeTypeCd = _feeTypeCd;
+                $that._loadDataMonthOweStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+            }
+        }
+    });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/report/dataMonthReceivedStatistics/dataMonthReceivedStatistics.html b/public/components/report/dataMonthReceivedStatistics/dataMonthReceivedStatistics.html
new file mode 100644
index 0000000000000000000000000000000000000000..75cc4f80fd6dcae4193d52f9469c9aefee52eaaf
--- /dev/null
+++ b/public/components/report/dataMonthReceivedStatistics/dataMonthReceivedStatistics.html
@@ -0,0 +1,110 @@
+<div class="margin-top">
+    <div class="row">
+        <div class="col-md-1 padding-r-0">
+            <div class=" border-radius ">
+                <div class="margin-xs-r  treeview attendance-staff" style="height: 650px;">
+                    <ul class="list-group text-center border-radius">
+                        <li class="list-group-item node-orgTree "
+                            v-for="(item,index) in dataMonthReceivedStatisticsInfo.feeTypeCds" :key="index"
+                            @click="switchMonthReceivedStatisticsFeeTypeCd(item.statusCd)"
+                            :class="{'vc-node-selected':dataMonthReceivedStatisticsInfo.feeTypeCd == item.statusCd}">
+                            {{item.name}}
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-11">
+            <div class="row ">
+                <div class="col-lg-2 padding-right-xs padding-left-xl">
+                    <select class="custom-select" v-model="dataMonthReceivedStatisticsInfo.floorId">
+                        <option value="">请选择楼栋</option>
+                        <option :value="item.floorId" v-for="(item,index) in dataMonthReceivedStatisticsInfo.floors">
+                            {{item.floorNum}}</option>
+                    </select>
+                </div>
+                <div class="col-lg-2 padding-right-xs padding-left-xl">
+                    <input v-model="dataMonthReceivedStatisticsInfo.feeStartDate" type="text"
+                        :placeholder="vc.i18n('请填写费用开始时间','dataMonthReceivedStatistics')"
+                        class="form-control feeStartDate">
+                </div>
+                <div class="col-lg-2 padding-right-xs padding-left-xl">
+                    <input v-model="dataMonthReceivedStatisticsInfo.feeEndDate" type="text"
+                        :placeholder="vc.i18n('请填写费用结束时间','dataMonthReceivedStatistics')"
+                        class="form-control feeEndDate">
+                </div>
+                <div class="col-lg-2 padding-right-xs padding-right-xl">
+                    <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                        v-on:click="_qureyDataMonthReceivedStatistics()">
+                        <i class="fa fa-search"></i>查询
+                    </button>
+                </div>
+                <div class="col-lg-4 text-right">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportReportMonthReceivedFeeExcel()">
+                        <vc:i18n name="导出" namespace="dataMonthReceivedStatistics"></vc:i18n>
+                    </button>
+                </div>
+            </div>
+            <div class="margin-top">
+                <table class="table table-bordered" data-page-size="15">
+                    <thead>
+                        <tr>
+                            <th class="text-center">
+                                <vc:i18n name="房屋" namespace="dataMonthReceivedStatistics"></vc:i18n>
+                            </th>
+                            <th class="text-center">
+                                <vc:i18n name="业主" namespace="dataMonthReceivedStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="实收" namespace="dataMonthReceivedStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="费用名称" namespace="dataMonthReceivedStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="实收时间段" namespace="dataMonthReceivedStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="收银员" namespace="dataMonthReceivedStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="交费时间" namespace="dataMonthReceivedStatistics"></vc:i18n>
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr v-for="fee in dataMonthReceivedStatisticsInfo.fees">
+                            <td class="text-center">{{fee.objName}}</td>
+                            <td class="text-center">{{fee.ownerName}}({{fee.link}})</td>
+                            <td class="text-center">
+                                {{fee.receivedAmount || 0}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.feeName}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.curYearMonth}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.cashierName}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.createTime}}
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+                <!-- 分页 -->
+                <div class="row">
+
+                    <div class="col-sm-4">
+                        <span><vc:i18n name="总欠费：" namespace="dataMonthReceivedStatistics"></vc:i18n> </span><span>{{dataMonthReceivedStatisticsInfo.feeAmount}}</span>
+                    </div>
+                    <div class="col-sm-8">
+                        <vc:create namespace="dataMonthReceivedStatistics" path="frame/paginationPlus"></vc:create>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/components/report/dataMonthReceivedStatistics/dataMonthReceivedStatistics.js b/public/components/report/dataMonthReceivedStatistics/dataMonthReceivedStatistics.js
new file mode 100644
index 0000000000000000000000000000000000000000..b474c392ac2ac374e4dc7f0445329d3a3425628a
--- /dev/null
+++ b/public/components/report/dataMonthReceivedStatistics/dataMonthReceivedStatistics.js
@@ -0,0 +1,147 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data: {
+            dataMonthReceivedStatisticsInfo: {
+                fees: [],
+                feeTypeCds: [],
+                floors: [],
+                floorId: '',
+                ownerId: '',
+                roomNum: '',
+                feeStartDate: '',
+                feeEndDate: '',
+                feeTypeCd: '',
+                feeAmount: '0'
+            }
+        },
+        _initMethod: function () {
+            vc.getDict('pay_fee_config', "fee_type_cd_show", function (_data) {
+                $that.dataMonthReceivedStatisticsInfo.feeTypeCds = _data;
+                $that.dataMonthReceivedStatisticsInfo.feeTypeCd = _data[0].statusCd;
+            });
+            $that._loadMonthReceivedFloors();
+        },
+        _initEvent: function () {
+            vc.on('dataMonthReceivedStatistics', 'switch', function (_data) {
+                 $that.dataMonthReceivedStatisticsInfo.feeStartDate = _data.startDate;
+                 $that.dataMonthReceivedStatisticsInfo.feeEndDate = _data.endDate;
+                 setTimeout(function(){
+                    $that._initMonthReceivedDate();
+                 },1000);
+               
+                $that._qureyDataMonthReceivedStatistics(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            });
+            vc.on('dataMonthReceivedStatistics', 'paginationPlus', 'page_event',
+                function (_currentPage) {
+                    $that._loadDataMonthReceivedStatisticsData(_currentPage, DEFAULT_ROWS);
+                });
+            vc.on('dataMonthReceivedStatistics', 'notify', function (_data) {
+                $that._loadDataMonthReceivedStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+            })
+        },
+        methods: {
+            _initMonthReceivedDate: function () {
+                vc.initDate('feeStartDate', function (_value) {
+                    $that.dataMonthReceivedStatisticsInfo.feeStartDate = _value;
+                });
+                vc.initDate('feeEndDate', function (_value) {
+                    $that.dataMonthReceivedStatisticsInfo.feeEndDate = _value;
+                });
+            },
+            _loadDataMonthReceivedStatisticsData: function (_page,_row) {
+                let param = {
+                    params: {
+                        page:_page,
+                        row:_row,
+                        communityId: vc.getCurrentCommunity().communityId,
+                        feeStartDate: $that.dataMonthReceivedStatisticsInfo.feeStartDate,
+                        feeEndDate: $that.dataMonthReceivedStatisticsInfo.feeEndDate,
+                        feeTypeCd: $that.dataMonthReceivedStatisticsInfo.feeTypeCd,
+                        floorId: $that.dataMonthReceivedStatisticsInfo.floorId,
+                    }
+                };
+
+                //发送get请求
+                vc.http.apiGet('/dataReport.queryMonthReceivedDetail',
+                    param,
+                    function (json) {
+                        let _json = JSON.parse(json);
+                        $that.dataMonthReceivedStatisticsInfo.fees =  _json.data;
+                        $that.dataMonthReceivedStatisticsInfo.feeAmount = _json.sumTotal;
+                        vc.emit('dataMonthReceivedStatistics', 'paginationPlus', 'init', {
+                            total: _json.records,
+                            dataCount: _json.total,
+                            currentPage: _page
+                        });
+                    },
+                    function () {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _loadMonthReceivedFloors: function () {
+                let param = {
+                    params: {
+                        page: 1,
+                        row: 100,
+                        communityId: vc.getCurrentCommunity().communityId
+                    }
+                };
+                $that.dataMonthReceivedStatisticsInfo.fees = [];
+                //发送get请求
+                vc.http.apiGet('/floor.queryFloors',
+                    param,
+                    function (json, res) {
+                        let listFloorData = JSON.parse(json);
+
+                        let _floors = listFloorData.apiFloorDataVoList;
+                        $that.dataMonthReceivedStatisticsInfo.floors = _floors;
+
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            //查询
+            _qureyDataMonthReceivedStatistics: function () {
+                $that._loadDataMonthReceivedStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+            },
+            _exportReportMonthReceivedFeeExcel: function () {
+               
+                let param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        feeStartDate: $that.dataMonthReceivedStatisticsInfo.feeStartDate,
+                        feeEndDate: $that.dataMonthReceivedStatisticsInfo.feeEndDate,
+                        feeTypeCd: $that.dataMonthReceivedStatisticsInfo.feeTypeCd,
+                        floorId: $that.dataMonthReceivedStatisticsInfo.floorId,
+                        pagePath: 'dataMonthReceivedStatistics'
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/export.exportData', param,
+                    function (json, res) {
+                        let _json = JSON.parse(json);
+                        vc.toast(_json.msg);
+                        if (_json.code == 0) {
+                            vc.jumpToPage('/#/pages/property/downloadTempFile?tab=下载中心')
+                        }
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                    });
+            },
+            switchMonthReceivedStatisticsFeeTypeCd: function (_feeTypeCd) {
+                $that.dataMonthReceivedStatisticsInfo.feeTypeCd = _feeTypeCd;
+                $that._loadDataMonthReceivedStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+            }
+        }
+    });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
index 48b20da8e7ab706048a1be105a528a57047e1cc7..a81b9792774e098b64fcd94535590a4cf46daa69 100644
--- a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
+++ b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
@@ -49,7 +49,7 @@
                     <td class="text-center">{{fee.roomName}}</td>
                     <td class="text-center">{{fee.ownerName}}({{fee.link}})</td>
                     <td class="text-center">
-                        {{fee.receivedFee}}
+                        {{fee.receivedFee || 0}}
                     </td>
                     <template v-for="(item,index) in dataReportEarnedDetailStatisticsInfo.feeTypeCds">
                         <!-- <td class="text-center" >
@@ -68,13 +68,13 @@
             </tbody>
         </table>
         <!-- 分页 -->
-        <!-- <div class="row">
+       <div class="row">
             <div class="col-sm-4">
-                <span><vc:i18n name="总实收：" namespace="dataReportEarnedDetailStatistics"></vc:i18n> </span><span>{{dataReportEarnedDetailStatisticsInfo.feeAmount}}</span>
+                <!--  <span><vc:i18n name="总实收：" namespace="dataReportEarnedDetailStatistics"></vc:i18n> </span><span>{{dataReportEarnedDetailStatisticsInfo.feeAmount}}</span>-->
             </div>
             <div class="col-sm-8">
                 <vc:create namespace="dataReportEarnedDetailStatistics" path="frame/paginationPlus"></vc:create>
             </div>
-        </div> -->
+        </div> 
     </div>
 </div>
\ No newline at end of file
diff --git a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js
index fcf11141d4c5b25f280c9debfa73f3a0d7e56597..3dd9c959ac0159b681e2923f8d92cfce57d552a8 100644
--- a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js
+++ b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js
@@ -64,14 +64,7 @@
                             dataCount: _json.total,
                             currentPage: _page
                         });
-                        let _feeAmount = 0.0;
-                        if (_json.data && _json.data.length > 0) {
-                            _json.data.forEach(item => {
-                                _feeAmount += parseFloat(item.receivedFee);
-                            });
-                        }
-
-                        $that.dataReportEarnedDetailStatisticsInfo.feeAmount = _feeAmount.toFixed(2);
+                        
                     },
                     function() {
                         console.log('请求失败处理');
diff --git a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.html b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.html
index 6f0c06c4b988de3593bb5f9e343a5df0f6844fa6..81401cd0d8beb4d9af30d184adfd475601eb55f5 100644
--- a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.html
+++ b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.html
@@ -1,132 +1,133 @@
 <div class="margin-top">
-    <div class="row margin-top-lg">
-        <div class="col-lg-2 padding-right-xs padding-left-xl">
-            <select class="form-control-md form-control input-s-sm inline" v-model="dataReportFeeStatisticsInfo.feeTypeCd">
-                <option selected value="">{{vc.i18n('请选择费用大类','dataReportFeeStatistics')}}</option>
-                <option v-for="(item,index) in dataReportFeeStatisticsInfo.feeTypeCds" :key="index"
-                        v-bind:value="item.statusCd">
-                    {{item.name}}
-                </option>
-            </select>
-        </div>
-
-        <div class="col-lg-2 padding-right-xs padding-right-xl">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_qureyDataReportFeeStatistics()">
-                <i class="fa fa-search"></i>查询
-            </button>
-        </div>
-
-        <div class="col-lg-8 text-right">
-            <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportReportFeeExcel()">
-                <vc:i18n name="导出" namespace="dataReportOweDetailStatistics"></vc:i18n>
-        </button>
-
+    <div class="row">
+        <div class="col-md-1 padding-r-0">
+            <div class=" border-radius ">
+                <div class="margin-xs-r  treeview attendance-staff" style="height: 650px;">
+                    <ul class="list-group text-center border-radius">
+                        <li class="list-group-item node-orgTree " v-for="(item,index) in dataReportFeeStatisticsInfo.feeTypeCds" :key="index" @click="swatchFeeStatisticsFeeTypeCd(item.statusCd)" :class="{'vc-node-selected':dataReportFeeStatisticsInfo.feeTypeCd == item.statusCd}">
+                            {{item.name}}
+                        </li>
+                    </ul>
+                </div>
+            </div>
         </div>
-    </div>
-    <div class="margin-top">
-        <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
-            <thead>
-                <tr>
-                    <th class="text-center">
-                        <vc:i18n name="楼栋" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="户数" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="空置户数" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="历史欠费" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="总欠费" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="本日已交户数" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="本日已交金额" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="历史欠费清缴户" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="历史欠费清缴金额" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="本月已收户数" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="剩余户数" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="已收户占比" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="当月已收金额" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="当月剩余未收" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                    <th data-hide="phone" class="text-center">
-                        <vc:i18n name="收费率" namespace="dataReportFeeStatistics"></vc:i18n>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr v-for="fee in dataReportFeeStatisticsInfo.fees">
-                    <td class="text-center">
-                        {{fee.floorNum}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.roomCount}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.freeCount}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.hisMonthOweFee}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.oweFee}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.todayReceivedRoomCount}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.todayReceivedRoomAmount}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.hisOweReceivedRoomCount}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.hisOweReceivedRoomAmount}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.monthReceivedRoomCount}}
-                    </td>
-                    <td class="text-center">
-                        {{(fee.roomCount-fee.freeCount-fee.monthReceivedRoomCount).toFixed(0)}}
-                    </td>
-                    <td class="text-center">
-                        {{(fee.monthReceivedRoomCount/(fee.roomCount-fee.freeCount)*100).toFixed(2)}}%
-                    </td>
-
-                    <td class="text-center">
-                        {{fee.monthReceivedRoomAmount}}
-                    </td>
-                    <td class="text-center">
-                        {{fee.curMonthOweFee}}
-                    </td>
-                    <td class="text-center">
-                        {{(fee.monthReceivedRoomAmount/(fee.monthReceivedRoomAmount+fee.curMonthOweFee)*100).toFixed(2)}}%
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        <!-- 分页 -->
-        <!-- <div class="row">
+        <div class="col-md-11">
+            <div class="row ">
+                <div class="col-lg-12 text-right">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportReportFeeExcel()">
+                        <vc:i18n name="导出" namespace="dataReportOweDetailStatistics"></vc:i18n>
+                    </button>
+                </div>
+            </div>
+            <div class="margin-top">
+                <table class="table table-bordered" data-page-size="15">
+                    <thead>
+                        <tr>
+                            <th class="text-center">
+                                <vc:i18n name="楼栋" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="户数" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="收费户" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="历史欠费" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="总欠费" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="本日已交户数" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="本日已交金额" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="历史欠费清缴户" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="历史欠费清缴金额" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="本月已收户数" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="剩余户数" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="已收户占比" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="当月已收金额" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="当月剩余未收" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                            <th data-hide="phone" class="text-center">
+                                <vc:i18n name="收费率" namespace="dataReportFeeStatistics"></vc:i18n>
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr v-for="fee in dataReportFeeStatisticsInfo.fees">
+                            <td class="text-center">
+                                {{fee.floorNum}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.roomCount}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.feeRoomCount}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.hisMonthOweFee}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.oweFee}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.todayReceivedRoomCount}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.todayReceivedRoomAmount}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.hisOweReceivedRoomCount}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.hisOweReceivedRoomAmount}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.monthReceivedRoomCount}}
+                            </td>
+                            <td class="text-center">
+                                {{(fee.feeRoomCount-fee.monthReceivedRoomCount).toFixed(0)}}
+                            </td>
+                            <td class="text-center" v-if="(fee.feeRoomCount)>0">
+                                {{((fee.monthReceivedRoomCount)/(fee.feeRoomCount)*100).toFixed(2)}}%
+                            </td>
+                            <td class="text-center" v-else>
+                                0%
+                            </td>
+                            <td class="text-center">
+                                {{fee.monthReceivedRoomAmount}}
+                            </td>
+                            <td class="text-center">
+                                {{fee.curMonthOweFee}}
+                            </td>
+                            <td class="text-center" v-if="(fee.curReceivableFee)>0">
+                                {{((fee.monthReceivedRoomAmount)/(fee.curReceivableFee)*100).toFixed(2)}}%
+                            </td>
+                            <td class="text-center" v-else>
+                                0%
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+                <!-- 分页 -->
+                <!-- <div class="row">
             <div class="col-sm-4">
                 <span><vc:i18n name="总欠费：" namespace="dataReportFeeStatistics"></vc:i18n> </span><span>{{dataReportFeeStatisticsInfo.feeAmount}}</span>
             </div>
@@ -134,5 +135,7 @@
                 <vc:create namespace="dataReportFeeStatistics" path="frame/paginationPlus"></vc:create>
             </div>
         </div> -->
+            </div>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js
index 83288db9af5d2ba49ca3b2f663aad3e41d474720..ed1a4cee7d0c3f040375dba0924295ccbfe3fe7f 100644
--- a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js
+++ b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js
@@ -20,7 +20,8 @@
         },
         _initMethod: function() {
             vc.getDict('pay_fee_config', "fee_type_cd_show", function(_data) {
-                $that.dataReportFeeStatisticsInfo.feeTypeCds = _data
+                $that.dataReportFeeStatisticsInfo.feeTypeCds = _data;
+                $that.dataReportFeeStatisticsInfo.feeTypeCd = _data[0].statusCd;
             });
         },
         _initEvent: function() {
@@ -58,16 +59,6 @@
                         _json.data.forEach(item => {
                             $that.dataReportFeeStatisticsInfo.fees.push(item);
                         });
-
-
-                        // let _feeAmount = 0.0;
-                        // if (_json.data && _json.data.length > 0) {
-                        //     _json.data.forEach(item => {
-                        //         _feeAmount += parseFloat(item.receivedFee);
-                        //     });
-                        // }
-
-                        // $that.dataReportFeeStatisticsInfo.feeAmount = _feeAmount.toFixed(2);
                     },
                     function() {
                         console.log('请求失败处理');
@@ -147,6 +138,10 @@
                         console.log('请求失败处理');
                     });
             },
+            swatchFeeStatisticsFeeTypeCd:function(_feeTypeCd){
+                $that.dataReportFeeStatisticsInfo.feeTypeCd = _feeTypeCd;
+                $that._loadFloors();
+            }
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/components/report/dataReportOweDetailStatistics/dataReportOweDetailStatistics.html b/public/components/report/dataReportOweDetailStatistics/dataReportOweDetailStatistics.html
index 7064aaf00227e2a86981249e67a979cdaa3514a9..c97be3d17b11cd213e5294ae527268b0fede9abc 100644
--- a/public/components/report/dataReportOweDetailStatistics/dataReportOweDetailStatistics.html
+++ b/public/components/report/dataReportOweDetailStatistics/dataReportOweDetailStatistics.html
@@ -10,7 +10,7 @@
             <input v-model="dataReportOweDetailStatisticsInfo.link" type="text" :placeholder="vc.i18n('请填写手机号','dataReportOweDetailStatistics')" class="form-control">
         </div>
         <div class="col-lg-2 padding-right-xs padding-right-xl">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_qureyDataReportEarnedDetailStatistics()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_qureyDataReportOweDetailStatistics()">
                 <i class="fa fa-search"></i>查询
             </button>
         </div>
@@ -64,13 +64,13 @@
             </tbody>
         </table>
         <!-- 分页 -->
-        <!-- <div class="row">
+        <div class="row">
             <div class="col-sm-4">
-                <span><vc:i18n name="总欠费：" namespace="dataReportOweDetailStatistics"></vc:i18n> </span><span>{{dataReportOweDetailStatisticsInfo.feeAmount}}</span>
+                <!--  <span><vc:i18n name="总欠费：" namespace="dataReportOweDetailStatistics"></vc:i18n> </span><span>{{dataReportOweDetailStatisticsInfo.feeAmount}}</span>-->
             </div>
             <div class="col-sm-8">
                 <vc:create namespace="dataReportOweDetailStatistics" path="frame/paginationPlus"></vc:create>
             </div>
-        </div> -->
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/img/.DS_Store b/public/img/.DS_Store
index 4391be47a2ee291964362e13f60c046fa8e82f6d..e714f3c5d9308f236fffceff2ff04b07e8fcc1fd 100755
Binary files a/public/img/.DS_Store and b/public/img/.DS_Store differ
diff --git a/public/img/logo.png b/public/img/logo.png
old mode 100755
new mode 100644
index 9fa7f817367d929a3bd43f98ba1ba11ef6269d9c..a4441e091e4007a88ca1af2487b80d9565c478d3
Binary files a/public/img/logo.png and b/public/img/logo.png differ
diff --git a/public/img/logo_hc.png b/public/img/logo_hc.png
index f90ec30f6003cd76d1acc1e0b6091eda8ee1df97..a4441e091e4007a88ca1af2487b80d9565c478d3 100644
Binary files a/public/img/logo_hc.png and b/public/img/logo_hc.png differ
diff --git a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html
index 16d2e56a2788fbb0feb20e35b551326086604247..365b4ecf5b91efff59a736eab967fc9d7a5387c2 100644
--- a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html
+++ b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html
@@ -40,7 +40,7 @@
                             <td class="text-center">{{auditOrder.stateName}}</td>
                             <td class="text-center">{{auditOrder.createTime}}</td>
                             <td class="text-center">
-                                <div v-if="allocationStorehouseAuditOrdersInfo.procure == false">
+                                <div v-if="auditOrder.storeManager == 'N'">
                                     <div class="btn-group"
                                          v-if="(auditOrder.state == 1200 || auditOrder.state == 1201)">
                                         <button class="btn-white btn btn-xs"
diff --git a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js
index 911af3d419b5fdc6eead4521c191ffc75b7e2aa9..6dafe7e873c9dfc7abc1469e8dd73923d5892d78 100644
--- a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js
+++ b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js
@@ -82,9 +82,14 @@
             },
             //提交审核信息
             _auditOrderInfo: function (_auditInfo) {
-                _auditInfo.taskId = vc.component.allocationStorehouseAuditOrdersInfo.orderInfo.taskId;
-                _auditInfo.applyId = vc.component.allocationStorehouseAuditOrdersInfo.orderInfo.applyId;
-                _auditInfo.procure = vc.component.allocationStorehouseAuditOrdersInfo.procure;
+                let _orderInfo = $that.allocationStorehouseAuditOrdersInfo.orderInfo;
+                _auditInfo.taskId = _orderInfo.taskId;
+                _auditInfo.applyId = _orderInfo.applyId;
+                if (_orderInfo.storeManager == 'N') {
+                    _auditInfo.procure = false;
+                } else {
+                    _auditInfo.procure = true;
+                }
                 // 新增通知状态字段，区别是否为仓管及对应状态
                 if (_auditInfo.state == '1200') {
                     _auditInfo.noticeState = '1203';
diff --git a/public/pages/attendance/attendanceClassesStaffManage/attendanceClassesStaffManage.js b/public/pages/attendance/attendanceClassesStaffManage/attendanceClassesStaffManage.js
index 195cc88e0b73b71ccbd46be96a99e3430aa04719..6ddd3923402191032c9c915455a67232dcf5c8d4 100644
--- a/public/pages/attendance/attendanceClassesStaffManage/attendanceClassesStaffManage.js
+++ b/public/pages/attendance/attendanceClassesStaffManage/attendanceClassesStaffManage.js
@@ -108,7 +108,7 @@
                 vc.emit('viewImage', 'showImage', { url: e });
             },
             openStaffDetail: function(_staff) {
-                vc.jumpToPage('/#/pages/frame/staffDetail?staffId=' + _staff.staffId)
+                vc.jumpToPage('/#/pages/staff/staffDetail?staffId=' + _staff.staffId)
             }
 
 
diff --git a/public/pages/car/carDetail/carDetail.html b/public/pages/car/carDetail/carDetail.html
index 160fddd66146b9d06c6976ef4a6fe5b06eafd762..d67e3520556fb1fd99cfd65df4e131f3fa26daae 100644
--- a/public/pages/car/carDetail/carDetail.html
+++ b/public/pages/car/carDetail/carDetail.html
@@ -6,7 +6,7 @@
             </div>
             <div>
                 <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                    v-if="vc.hasPrivilege('502023032804261679')" v-on:click="_openEditOwnerCar()">
+                    v-if="vc.hasPrivilege('502023032804261679')" v-on:click="_openEditDetailOwnerCar()">
                     修改
                 </button>
             </div>
diff --git a/public/pages/car/carDetail/carDetail.js b/public/pages/car/carDetail/carDetail.js
index 2f0cce44d7df506c33bce2839d97188e84a3d44b..629ba453ee9686a6d02887126cbb89d1ca1af7ed 100644
--- a/public/pages/car/carDetail/carDetail.js
+++ b/public/pages/car/carDetail/carDetail.js
@@ -79,7 +79,7 @@
                     paId:$that.carDetailInfo.paId
                 })
             },
-            _openEditOwnerCar: function () {
+            _openEditDetailOwnerCar: function () {
                 vc.emit('editCar', 'openEditCar', $that.carDetailInfo);
             },
         }
diff --git a/public/pages/common/addRoomRepair/addRoomRepair.html b/public/pages/common/addRoomRepair/addRoomRepair.html
index bfe9b8cc195e36146935e18fb26a1ce708075502..3df41678a7479a8101a5861be34174fee317085e 100755
--- a/public/pages/common/addRoomRepair/addRoomRepair.html
+++ b/public/pages/common/addRoomRepair/addRoomRepair.html
@@ -29,7 +29,7 @@
                     <div class="form-group row">
                         <label class="col-sm-2 col-form-label"><span><vc:i18n name="联系方式" namespace="addRoomRepair"></vc:i18n></span></label>
                         <div class="col-sm-10">
-                            <input v-model="addRoomRepairInfo.tel" type="number" :placeholder="vc.i18n('必填，请填写联系方式','addRoomRepair')" class="form-control">
+                            <input v-model="addRoomRepairInfo.tel" :placeholder="vc.i18n('必填，请填写联系方式','addRoomRepair')" class="form-control">
                         </div>
                     </div>
                     <div class="form-group row">
diff --git a/public/pages/frame/orgManage/orgManage.js b/public/pages/frame/orgManage/orgManage.js
index 0e464b05b2b9fc9f41c26fb7bea55d249207954b..d11a8a91627309b8382247080a263cb2b0e61bb5 100755
--- a/public/pages/frame/orgManage/orgManage.js
+++ b/public/pages/frame/orgManage/orgManage.js
@@ -89,7 +89,7 @@
                 vc.emit('deleteOrgRelStaff', 'openDeleteOrgModal', _rel)
             },
             _toStaffDetail: function (_staff) {
-                vc.jumpToPage('/#/pages/frame/staffDetail?staffId=' + _staff.userId)
+                vc.jumpToPage('/#/pages/staff/staffDetail?staffId=' + _staff.userId)
             }
         }
     });
diff --git a/public/pages/machine/meterMachineManage/meterMachineManage.html b/public/pages/machine/meterMachineManage/meterMachineManage.html
index 336714b6f2c34c7d12cda79625a5c273351ca68e..b5dd4570b32a6d56168df89d06f5fd110340c72f 100644
--- a/public/pages/machine/meterMachineManage/meterMachineManage.html
+++ b/public/pages/machine/meterMachineManage/meterMachineManage.html
@@ -148,7 +148,7 @@
                                 <td class="text-center">{{meterMachine.roomName}}</td>
                                 <td class="text-center">{{meterMachine.feeConfigName}}</td>
                                 <td class="text-center">{{meterMachine.implBeanName}}</td>
-                                <td class="text-center" v-if="meterMachine.machineModel == '1001'">{{meterMachine.degree?meterMachine.degree:meterMachine.prestoreDegrees}}</td>
+                                <td class="text-center" v-if="meterMachine.machineModel == '1001'">{{meterMachine.prestoreDegrees}}</td>
                                 <td class="text-center" v-else>-</td>
                                 <td class="text-center" v-if="meterMachine.machineModel == '1001'">-</td>
                                 <td class="text-center" v-else>{{meterMachine.curDegrees}}(每月{{meterMachine.readDay}}日{{meterMachine.readHours}}时抄表)</td>
diff --git a/public/pages/property/addEquipmentAccount/addEquipmentAccount.html b/public/pages/property/addEquipmentAccount/addEquipmentAccount.html
index 6f76d4c1d09b8a9a45c6e83a5720e5c61cd98a22..c14d5087088eff18d5900ff1bb8f2bdbea6127be 100644
--- a/public/pages/property/addEquipmentAccount/addEquipmentAccount.html
+++ b/public/pages/property/addEquipmentAccount/addEquipmentAccount.html
@@ -1,169 +1,137 @@
 <div class="row">
-  <div class="col-lg-12">
-    <div class="ibox">
-      <div class="ibox-title">
-        <h5>
-          <span>
-            <vc:i18n name="添加设备" namespace="addStaff"></vc:i18n>
-          </span>
-        </h5>
-        <div class="ibox-tools" style="top:10px;">
-        </div>
-      </div>
-      <div class="ibox-content">
-        <div>
-          <div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='设备名称' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.machineName" type="text"
-                  :placeholder="vc.i18n('必填，请填写设备名称','addEquipmentAccount')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='设备编码' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.machineCode" type="text"
-                  :placeholder="vc.i18n('必填，请填写设备编码','addEquipmentAccount')" class="form-control">
-              </div>
+    <div class="col-lg-12">
+        <div class="ibox">
+            <div class="ibox-title">
+                <h5>
+                    <vc:i18n name="添加设备" namespace="addStaff"></vc:i18n>
+                </h5>
+                <div class="ibox-tools" style="top:10px;">
+                </div>
             </div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='重要等级' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <select class="custom-select" v-model="addEquipmentAccountInfo.importanceLevel">
+            <div class="ibox-content">
+                <div>
+                    <div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right">
+                                <vc:i18n name='设备名称' namespace='addEquipmentAccount'></vc:i18n>
+                            </label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.machineName" type="text" :placeholder="vc.i18n('必填，请填写设备名称','addEquipmentAccount')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right">
+                              <vc:i18n name='设备编码' namespace='addEquipmentAccount'></vc:i18n>
+                            </label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.machineCode" type="text" :placeholder="vc.i18n('必填，请填写设备编码','addEquipmentAccount')" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='重要等级' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <select class="custom-select" v-model="addEquipmentAccountInfo.importanceLevel">
                   <option selected disabled value="">{{vc.i18n('必填，请选择重要等级' ,'editEquipmentAccount')}}</option>
                   <option v-for="(item,index) in addEquipmentAccountInfo.importanceLevels" :key="index"
                     :value="item.statusCd">{{item.name}}</option>
                 </select>
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='使用状态' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <select class="custom-select" v-model="addEquipmentAccountInfo.state">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='使用状态' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <select class="custom-select" v-model="addEquipmentAccountInfo.state">
                   <option selected disabled value="">{{vc.i18n('必填，请选择使用状态' ,'editEquipmentAccount')}}</option>
                   <option v-for="(item,index) in addEquipmentAccountInfo.useStatus" :key="index" :value="item.statusCd">
                     {{item.name}}</option>
                 </select>
-              </div>
-            </div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='设备品牌' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.brand" type="text"
-                  :placeholder="vc.i18n('选填，请填写设备品牌','addEquipmentAccount')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='设备型号' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.model" type="text"
-                  :placeholder="vc.i18n('选填，请填写设备型号','addEquipmentAccount')" class="form-control">
-              </div>
-            </div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='资产净值' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.netWorth" type="text"
-                  :placeholder="vc.i18n('选填，请填写资产净值','addEquipmentAccount')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='位置详情' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.locationDetail" type="text"
-                  :placeholder="vc.i18n('选填，请填写位置详情','addEquipmentAccount')" class="form-control">
-              </div>
-            </div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='首次启用时间' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.firstEnableTime" type="text"
-                  :placeholder="vc.i18n('选填，请填写首次启用时间','addEquipmentAccount')" class="form-control addFirstEnableTime">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='保修截止日期' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.warrantyDeadline" type="text"
-                  :placeholder="vc.i18n('选填，请填写保修截止日期','addEquipmentAccount')"
-                  class="form-control addWarrantyDeadlineE">
-              </div>
-            </div>
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='设备品牌' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.brand" type="text" :placeholder="vc.i18n('选填，请填写设备品牌','addEquipmentAccount')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='设备型号' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.model" type="text" :placeholder="vc.i18n('选填，请填写设备型号','addEquipmentAccount')" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='资产净值' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.netWorth" type="text" :placeholder="vc.i18n('选填，请填写资产净值','addEquipmentAccount')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='位置详情' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.locationDetail" type="text" :placeholder="vc.i18n('选填，请填写位置详情','addEquipmentAccount')" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='首次启用时间' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.firstEnableTime" type="text" :placeholder="vc.i18n('选填，请填写首次启用时间','addEquipmentAccount')" class="form-control addFirstEnableTime">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='保修截止日期' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.warrantyDeadline" type="text" :placeholder="vc.i18n('选填，请填写保修截止日期','addEquipmentAccount')" class="form-control addWarrantyDeadlineE">
+                            </div>
+                        </div>
 
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='使用年限（年）' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.usefulLife" type="text"
-                  :placeholder="vc.i18n('选填，请填写使用年限（年）','addEquipmentAccount')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='采购价格' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.purchasePrice" type="text"
-                  :placeholder="vc.i18n('选填，请填写采购价格','addEquipmentAccount')" class="form-control">
-              </div>
-            </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='使用年限（年）' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.usefulLife" type="text" :placeholder="vc.i18n('选填，请填写使用年限（年）','addEquipmentAccount')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='采购价格' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.purchasePrice" type="text" :placeholder="vc.i18n('选填，请填写采购价格','addEquipmentAccount')" class="form-control">
+                            </div>
+                        </div>
 
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name="使用人" namespace="addEquipmentAccount"></vc:i18n>
-                </span></label>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name="使用人" namespace="addEquipmentAccount"></vc:i18n></label>
 
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.useUserName" type="text"
-                  :placeholder="vc.i18n('必填，请选择责任人','useUserName')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right">
-                <span>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.useUserName" type="text" :placeholder="vc.i18n('必填，请选择使用人','useUserName')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right">
                   <vc:i18n name="责任人" namespace="addEquipmentAccount"></vc:i18n>
-                </span>
               </label>
-              <div class="col-sm-4">
-                <input v-model="addEquipmentAccountInfo.chargeUseName" type="text"
-                  :placeholder="vc.i18n('必填，请选择使用人','chargeUseName')" class="form-control">
-              </div>
-            </div>
+                            <div class="col-sm-4">
+                                <input v-model="addEquipmentAccountInfo.chargeUseName" type="text" :placeholder="vc.i18n('必填，请选择责任人','chargeUseName')" class="form-control">
+                            </div>
+                        </div>
 
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
-                  <vc:i18n name='备注' namespace='addEquipmentAccount'></vc:i18n>
-                </span></label>
-              <div class="col-sm-10">
-                <textarea v-model="addEquipmentAccountInfo.remark" type="text"
-                  :placeholder="vc.i18n('选填，请填写备注','addEquipmentAccount')" class="form-control"></textarea>
-              </div>
-            </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right">
+                  <vc:i18n name='备注' namespace='addEquipmentAccount'></vc:i18n></label>
+                            <div class="col-sm-10">
+                                <textarea v-model="addEquipmentAccountInfo.remark" type="text" :placeholder="vc.i18n('选填，请填写备注','addEquipmentAccount')" class="form-control"></textarea>
+                            </div>
+                        </div>
 
-            <div class="ibox-content">
-              <button class="btn btn-primary float-right" type="button" v-on:click="saveEquipmentAccountInfo()"><i
+                        <div class="ibox-content">
+                            <button class="btn btn-primary float-right" type="button" v-on:click="saveEquipmentAccountInfo()"><i
                   class="fa fa-check"></i>&nbsp;
                 <span>
                   <vc:i18n name="保存"></vc:i18n>
                 </span>
               </button>
-              <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">
-                <span>
+                            <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">
                   <vc:i18n name="取消"></vc:i18n>
-                </span>
               </button>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/editEquipmentAccount/editEquipmentAccount.html b/public/pages/property/editEquipmentAccount/editEquipmentAccount.html
index 890f5aee49bc0670460de3ea9b1e54595f7fb9c5..62fda46eccd97810f38846c484bb5a1d3ba85b5d 100644
--- a/public/pages/property/editEquipmentAccount/editEquipmentAccount.html
+++ b/public/pages/property/editEquipmentAccount/editEquipmentAccount.html
@@ -1,169 +1,151 @@
 <div class="row">
-  <div class="col-lg-12">
-    <div class="ibox">
-      <div class="ibox-title">
-        <h5>
-          <span>
-            <vc:i18n name="修改设备" namespace="editEquipmentAccount"></vc:i18n>
-          </span>
-        </h5>
-        <div class="ibox-tools" style="top:10px;">
-        </div>
-      </div>
-      <div class="ibox-content">
-        <div>
-          <div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
+    <div class="col-lg-12">
+        <div class="ibox">
+            <div class="ibox-title">
+                <h5>
+                    <vc:i18n name="修改设备" namespace="editEquipmentAccount"></vc:i18n>
+                </h5>
+                <div class="ibox-tools" style="top:10px;">
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div>
+                    <div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='设备名称' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.machineName" type="text"
-                  :placeholder="vc.i18n('必填，请填写设备名称','editEquipmentAccount')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.machineName" type="text" :placeholder="vc.i18n('必填，请填写设备名称','editEquipmentAccount')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='设备编码' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.machineCode" type="text"
-                  :placeholder="vc.i18n('必填，请填写设备编码','editEquipmentAccount')" class="form-control">
-              </div>
-            </div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.machineCode" type="text" :placeholder="vc.i18n('必填，请填写设备编码','editEquipmentAccount')" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='重要等级' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <select class="custom-select" v-model="editEquipmentAccountInfo.importanceLevel">
+                            <div class="col-sm-4">
+                                <select class="custom-select" v-model="editEquipmentAccountInfo.importanceLevel">
                   <option selected disabled value="">{{vc.i18n('必填，请选择重要等级' ,'editEquipmentAccount')}}</option>
                   <option v-for="(item,index) in editEquipmentAccountInfo.importanceLevels" :key="index"
                     :value="item.statusCd">{{item.name}}</option>
                 </select>
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='使用状态' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <select class="custom-select" v-model="editEquipmentAccountInfo.state">
+                            <div class="col-sm-4">
+                                <select class="custom-select" v-model="editEquipmentAccountInfo.state">
                   <option selected disabled value="">{{vc.i18n('必填，请选择使用状态' ,'editEquipmentAccount')}}</option>
                   <option v-for="(item,index) in editEquipmentAccountInfo.useStatus" :key="index" :value="item.statusCd">
                     {{item.name}}</option>
                 </select>
-              </div>
-            </div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='设备品牌' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.brand" type="text"
-                  :placeholder="vc.i18n('选填，请填写设备品牌','editEquipmentAccount')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.brand" type="text" :placeholder="vc.i18n('选填，请填写设备品牌','editEquipmentAccount')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='设备型号' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.model" type="text"
-                  :placeholder="vc.i18n('选填，请填写设备型号','editEquipmentAccount')" class="form-control">
-              </div>
-            </div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.model" type="text" :placeholder="vc.i18n('选填，请填写设备型号','editEquipmentAccount')" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='资产净值' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.netWorth" type="text"
-                  :placeholder="vc.i18n('选填，请填写资产净值','editEquipmentAccount')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.netWorth" type="text" :placeholder="vc.i18n('选填，请填写资产净值','editEquipmentAccount')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='位置详情' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.locationDetail" type="text"
-                  :placeholder="vc.i18n('选填，请填写位置详情','editEquipmentAccount')" class="form-control">
-              </div>
-            </div>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.locationDetail" type="text" :placeholder="vc.i18n('选填，请填写位置详情','editEquipmentAccount')" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='首次启用时间' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.firstEnableTime" type="text"
-                  :placeholder="vc.i18n('选填，请填写首次启用时间','editEquipmentAccount')" class="form-control addFirstEnableTime">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.firstEnableTime" type="text" :placeholder="vc.i18n('选填，请填写首次启用时间','editEquipmentAccount')" class="form-control addFirstEnableTime">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='保修截止日期' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.warrantyDeadline" type="text"
-                  :placeholder="vc.i18n('选填，请填写保修截止日期','editEquipmentAccount')"
-                  class="form-control addWarrantyDeadlineE">
-              </div>
-            </div>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.warrantyDeadline" type="text" :placeholder="vc.i18n('选填，请填写保修截止日期','editEquipmentAccount')" class="form-control addWarrantyDeadlineE">
+                            </div>
+                        </div>
 
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='使用年限（年）' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.usefulLife" type="text"
-                  :placeholder="vc.i18n('选填，请填写使用年限（年）','editEquipmentAccount')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right"><span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.usefulLife" type="text" :placeholder="vc.i18n('选填，请填写使用年限（年）','editEquipmentAccount')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='采购价格' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.purchasePrice" type="text"
-                  :placeholder="vc.i18n('选填，请填写采购价格','editEquipmentAccount')" class="form-control">
-              </div>
-            </div>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.purchasePrice" type="text" :placeholder="vc.i18n('选填，请填写采购价格','editEquipmentAccount')" class="form-control">
+                            </div>
+                        </div>
 
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name="使用人" namespace="editEquipmentAccount"></vc:i18n>
                 </span></label>
 
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.useUserName" type="text"
-                  :placeholder="vc.i18n('必填，请选择责任人','useUserName')" class="form-control">
-              </div>
-              <label class="col-sm-2 col-form-label text-right">
-                <span>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.useUserName" type="text" :placeholder="vc.i18n('必填，请选择使用人','useUserName')" class="form-control">
+                            </div>
+                            <label class="col-sm-2 col-form-label text-right">
                   <vc:i18n name="责任人" namespace="editEquipmentAccount"></vc:i18n>
-                </span>
               </label>
-              <div class="col-sm-4">
-                <input v-model="editEquipmentAccountInfo.chargeUseName" type="text"
-                  :placeholder="vc.i18n('必填，请选择使用人','chargeUseName')" class="form-control">
-              </div>
-            </div>
+                            <div class="col-sm-4">
+                                <input v-model="editEquipmentAccountInfo.chargeUseName" type="text" :placeholder="vc.i18n('必填，请选择责任人','chargeUseName')" class="form-control">
+                            </div>
+                        </div>
 
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label text-right"><span>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label text-right"><span>
                   <vc:i18n name='备注' namespace='editEquipmentAccount'></vc:i18n>
                 </span></label>
-              <div class="col-sm-10">
-                <textarea v-model="editEquipmentAccountInfo.remark" type="text"
-                  :placeholder="vc.i18n('选填，请填写备注','editEquipmentAccount')" class="form-control"></textarea>
-              </div>
-            </div>
+                            <div class="col-sm-10">
+                                <textarea v-model="editEquipmentAccountInfo.remark" type="text" :placeholder="vc.i18n('选填，请填写备注','editEquipmentAccount')" class="form-control"></textarea>
+                            </div>
+                        </div>
 
-            <div class="ibox-content">
-              <button class="btn btn-primary float-right" type="button" v-on:click="saveEquipmentAccountInfo()"><i
+                        <div class="ibox-content">
+                            <button class="btn btn-primary float-right" type="button" v-on:click="saveEquipmentAccountInfo()"><i
                   class="fa fa-check"></i>&nbsp;
                 <span>
                   <vc:i18n name="保存"></vc:i18n>
                 </span>
               </button>
-              <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">
+                            <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">
                 <span>
                   <vc:i18n name="取消"></vc:i18n>
                 </span>
               </button>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/handover/handover.html b/public/pages/property/handover/handover.html
index fb942e6ae694a4c5520c7e25c46ee275b0f73e18..420ddf94eb701a6b5b244be6eb7b7e49bef0153f 100644
--- a/public/pages/property/handover/handover.html
+++ b/public/pages/property/handover/handover.html
@@ -59,7 +59,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="手机" namespace="handover"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="handoverInfo.link" type="number" :placeholder="vc.i18n('必填，请填写联系方式','handover')" class="form-control">
+                                    <input v-model="handoverInfo.link" :placeholder="vc.i18n('必填，请填写联系方式','handover')" class="form-control">
                                 </div>
                             </div>
                         </div>
diff --git a/public/pages/property/inspectionTaskManage/inspectionTaskManage.js b/public/pages/property/inspectionTaskManage/inspectionTaskManage.js
index de4f1e3e7076da127886d2a945af1a87d43e0fc5..71145e34c914b2b73c289f26c2140de563c81c93 100755
--- a/public/pages/property/inspectionTaskManage/inspectionTaskManage.js
+++ b/public/pages/property/inspectionTaskManage/inspectionTaskManage.js
@@ -20,7 +20,8 @@
                     actInsTime: '',
                     startTime: '',
                     endTime: '',
-                    state: ''
+                    state: '',
+                    orderByDesc: 'desc'
                 }
             }
         },
diff --git a/public/pages/property/owePayFeeOrder/owePayFeeOrder.js b/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
index 08d564e57aa4b795a055d1c5539fda1fc14a72d5..5a89781060f72a8326621a682876fb4bcd5ec759 100755
--- a/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
+++ b/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
@@ -293,7 +293,7 @@
                 $that._closeDoOwePayFeeModal();
                 let _data = _json.data;
                 let receiptIds = '';
-                _data.forEach(item => {
+                _data.receipts.forEach(item => {
                     receiptIds += (item.receiptId + ',');
                 })
                 $that.owePayFeeOrderInfo.receiptIds = receiptIds;
diff --git a/public/pages/property/printOweFee/printOweFee.html b/public/pages/property/printOweFee/printOweFee.html
index 271ac07dbf04523e7ae331fc45ca076408d85952..22d8e2eee95504f7844532de002e681571817d4a 100755
--- a/public/pages/property/printOweFee/printOweFee.html
+++ b/public/pages/property/printOweFee/printOweFee.html
@@ -18,13 +18,27 @@
             <table class="table vc-table-border margin-top" style="color:#000;font-size:14px">
                 <thead>
                     <tr>
-                        <th scope="col" class="text-center"><vc:i18n name="收费对象" namespace="printOweFee"></vc:i18n></th>
-                        <th scope="col" class="text-center"><vc:i18n name="项目名称" namespace="printOweFee"></vc:i18n></th>
-                        <th scope="col" class="text-center"><vc:i18n name="费用期间" namespace="printOweFee"></vc:i18n></th>
-                        <th scope="col" class="text-center"><vc:i18n name="单位" namespace="printOweFee"></vc:i18n></th>
-                        <th scope="col" class="text-center"><vc:i18n name="面积/用量" namespace="printOweFee"></vc:i18n></th>
-                        <th scope="col" class="text-center"><vc:i18n name="单价" namespace="printOweFee"></vc:i18n></th>
-                        <th scope="col" class="text-center"><vc:i18n name="金额" namespace="printOweFee"></vc:i18n></th>
+                        <th scope="col" class="text-center">
+                            <vc:i18n name="收费对象" namespace="printOweFee"></vc:i18n>
+                        </th>
+                        <th scope="col" class="text-center">
+                            <vc:i18n name="项目名称" namespace="printOweFee"></vc:i18n>
+                        </th>
+                        <th scope="col" class="text-center">
+                            <vc:i18n name="费用期间" namespace="printOweFee"></vc:i18n>
+                        </th>
+                        <th scope="col" class="text-center">
+                            <vc:i18n name="单位" namespace="printOweFee"></vc:i18n>
+                        </th>
+                        <th scope="col" class="text-center">
+                            <vc:i18n name="面积/用量" namespace="printOweFee"></vc:i18n>
+                        </th>
+                        <th scope="col" class="text-center">
+                            <vc:i18n name="单价" namespace="printOweFee"></vc:i18n>
+                        </th>
+                        <th scope="col" class="text-center">
+                            <vc:i18n name="金额" namespace="printOweFee"></vc:i18n>
+                        </th>
                     </tr>
                 </thead>
                 <tbody>
@@ -32,8 +46,7 @@
                         <td class="text-center">{{item.payerObjName}}</td>
                         <td class="text-center">{{item.feeName}}</td>
                         <td class="text-center" v-if="item.preDegrees">
-                            {{vc.dateFormat(item.endTime)}}<span>
-                                <vc:i18n name="至" namespace="printOweFee"></vc:i18n></span> {{_getDeadlineTime(item)}}
+                            {{vc.dateFormat(item.endTime)}}至{{_getDeadlineTime(item)}}
                             </br>
                             {{item.preDegrees}} 至 {{item.curDegrees}}
                         </td>
@@ -43,7 +56,7 @@
                         <td class="text-center"><span><vc:i18n name="元" namespace="printOweFee"></vc:i18n></span></td>
                         <td class="text-center" v-if="item.preDegrees">{{(item.curDegrees-item.preDegrees).toFixed(2)}}</td>
                         <td class="text-center" v-else>{{printPayFeeInfo.builtUpArea}}</td>
-                        <td class="text-center" v-if="item.preDegrees">{{item.mwPrice}}</td>
+                        <td class="text-center" v-if="item.preDegrees && item.mwPrice > 0">{{item.mwPrice}}</td>
                         <td class="text-center" v-else>{{item.squarePrice}}/{{item.additionalAmount}}</td>
                         <td class="text-center">{{item.feeTotalPrice}}</td>
                     </tr>
diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html
index 3f57247a3fb35b18767d5899751a35ac7143049e..fa939ee586dff98e6a955a40495ccfc1d9a70feb 100755
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.html
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html
@@ -120,13 +120,22 @@
                                             <vc:i18n name="历史欠费+当期欠费=欠费" namespace="reportFeeSummary"></vc:i18n>
                                         </th>
                                         <th class="text-center" colspan="4">
-                                            <vc:i18n name="欠费追回+当期实收+预交=实收" namespace="reportFeeSummary"></vc:i18n>
+                                            <vc:i18n name="欠费追回+当期部分+预交=实缴" namespace="reportFeeSummary"></vc:i18n>
+                                        </th>
+                                        <th class="text-center">
+                                            <vc:i18n name="当期应收" namespace="reportFeeSummary"></vc:i18n>
+                                        </th>
+                                        <th class="text-center">
+                                            <vc:i18n name="当期实收" namespace="reportFeeSummary"></vc:i18n>
                                         </th>
                                         <th class="text-center">
                                             <vc:i18n name="已交户/收费户=户收费率" namespace="reportFeeSummary"></vc:i18n>
                                         </th>
                                         <th class="text-center">
-                                            <vc:i18n name="(实收-预交)/(历史欠费+当期应收)=收费率" namespace="reportFeeSummary"></vc:i18n>
+                                            <vc:i18n name="当期实收/当期应收=收费率" namespace="reportFeeSummary"></vc:i18n>
+                                        </th>
+                                        <th class="text-center">
+                                            <vc:i18n name="欠费追回/(欠费追回+历史欠费)=清缴率" namespace="reportFeeSummary"></vc:i18n>
                                         </th>
                                     </tr>
                                 </thead>
@@ -146,10 +155,25 @@
                                             {{fee.receivedFee}}
                                         </td>
                                         <td class="text-center">
+                                            {{fee.curReceivableFee}}
+                                        </td>
+                                        <td class="text-center">
+                                            {{(fee.curReceivableFee-fee.curOweFee).toFixed(2)}}
+                                        </td>
+                                        <td class="text-center" v-if="fee.feeRoomCount>0">
                                             {{((fee.feeRoomCount-fee.oweRoomCount)/fee.feeRoomCount*100).toFixed(2)}}%
                                         </td>
-                                        <td class="text-center" v-if="(fee.hisOweFee+fee.curReceivableFee)>0">
-                                            {{((fee.receivedFee-fee.preReceivedFee)/(fee.hisOweFee+fee.curReceivableFee)*100).toFixed(2)}}%
+                                        <td class="text-center" v-else>
+                                            0%
+                                        </td>
+                                        <td class="text-center" v-if="(fee.curReceivableFee)>0">
+                                            {{((fee.curReceivableFee-fee.curOweFee)/(fee.curReceivableFee)*100).toFixed(2)}}%
+                                        </td>
+                                        <td class="text-center" v-else>
+                                            0%
+                                        </td>
+                                        <td class="text-center" v-if="(fee.hisReceivedFee+fee.hisOweFee)>0">
+                                            {{((fee.hisReceivedFee)/(fee.hisReceivedFee+fee.hisOweFee)*100).toFixed(2)}}%
                                         </td>
                                         <td class="text-center" v-else>
                                             0%
diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.js b/public/pages/property/reportFeeSummary/reportFeeSummary.js
index 30117cb3feb5824b5b486a68990e35943489bdbf..42b57acc9afeec70d34e95e1e0a6a6dbc1d20d22 100755
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.js
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.js
@@ -56,11 +56,12 @@
                 }
                 $that.reportFeeSummaryInfo.conditions.startDate = _newDate;
                 _data.setMonth(_data.getMonth() + 1);
+                _data.setDate(0);
                 _month = _data.getMonth() + 1;
                 if (_month < 10) {
-                    _newDate = _data.getFullYear() + "-0" + _month + "-01";
+                    _newDate = _data.getFullYear() + "-0" + _month + '-' + _data.getDate();
                 } else {
-                    _newDate = _data.getFullYear() + "-" + _month + "-01";
+                    _newDate = _data.getFullYear() + "-" + _month + '-'+ _data.getDate();
                 }
                 $that.reportFeeSummaryInfo.conditions.endDate = _newDate;
             },
diff --git a/public/pages/property/reportHuaning/reportHuaning.html b/public/pages/property/reportHuaning/reportHuaning.html
index c4d97a6969adbc0c93b96fdaa2a6fad70f3b9fa4..1e74daea03ea4ba25b71e90a717677419bf51319 100644
--- a/public/pages/property/reportHuaning/reportHuaning.html
+++ b/public/pages/property/reportHuaning/reportHuaning.html
@@ -1,19 +1,16 @@
 <div>
-    <!-- <div class="row">
+   <div class="row">
         <div class="col-lg-12">
             <div class="ibox ">
                 <div class="ibox-title">
-                    <h5><span><vc:i18n name="查询条件" namespace="reportHuaning"></vc:i18n></span></h5>
+                    <h5><vc:i18n name="查询条件" namespace="reportHuaning"></vc:i18n></h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                v-on:click="_moreCondition()">
-                            {{reportHuaningInfo.moreCondition == true?'隐藏':'更多'}}
-                        </button>
+                        
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-                        <!--费用类型->
+                        <!--费用类型-->
                         <div class="col-sm-3">
                             <select class="custom-select" v-model="reportHuaningInfo.conditions.feeTypeCd"
                                     @click="_changeReporficientFeeTypeCd()">
@@ -23,9 +20,9 @@
                                 </option>
                             </select>
                         </div>
-                        <div class="col-sm-3">
+                        <!-- <div class="col-sm-3">
                             <div class="form-group">
-                                <!-- @click="_changeReporficientConfigId()"->
+                               
                                 <select class="form-control-md form-control input-s-sm inline"
                                         v-model="reportHuaningInfo.conditions.configId">
                                     <option selected value="">{{vc.i18n('请选择收费项','reportHuaning')}}</option>
@@ -34,7 +31,7 @@
                                     </option>
                                 </select>
                             </div>
-                        </div>
+                        </div> -->
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <select class="form-control-md form-control input-s-sm inline"
@@ -58,41 +55,26 @@
                             </button>
                         </div>
                     </div>
-                    <div class="row" v-show="reportHuaningInfo.moreCondition == true">
-                        <!--费用类型->
-                        <div class="col-sm-3" v-if="reportHuaningInfo._currentTab == 'reportHuaningPayFee'">
-                            <input type="text" :placeholder="vc.i18n('请填写年份','reportHuaning')"
-                                   class="form-control form-control-md"
-                                   v-model="reportHuaningInfo.conditions.year">
-                        </div>
-                        <div class="col-sm-3" v-if="reportHuaningInfo._currentTab == 'reportHuaningPayFee'">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请填写月份','reportHuaning')"
-                                       class="form-control form-control-md"
-                                       v-model="reportHuaningInfo.conditions.month">
-                            </div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
-    </div>  margin-top-->
+    </div>  
     <div class="white-bg padding-lg">
         <div class="">
             <ul class="nav nav-tabs">
                 <li class="nav-item">
                     <a class="nav-link" v-bind:class="{active:reportHuaningInfo._currentTab == 'reportHuaningOweFee'}" v-on:click="changeTab('reportHuaningOweFee')">
-                        <span><vc:i18n name="未收情况表" namespace="reportHuaning"></vc:i18n></span>
+                        <vc:i18n name="未收情况表" namespace="reportHuaning"></vc:i18n>
                     </a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" v-bind:class="{active:reportHuaningInfo._currentTab == 'reportHuaningOweFeeDetail'}" v-on:click="changeTab('reportHuaningOweFeeDetail')">
-                        <span><vc:i18n name="未收明细表" namespace="reportHuaning"></vc:i18n></span>
+                        <vc:i18n name="未收明细表" namespace="reportHuaning"></vc:i18n>
                     </a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" v-bind:class="{active:reportHuaningInfo._currentTab == 'reportHuaningPayFee'}" v-on:click="changeTab('reportHuaningPayFee')">
-                        <span><vc:i18n name="当月收费情况表" namespace="reportHuaning"></vc:i18n></span>
+                        <vc:i18n name="当月收费情况表" namespace="reportHuaning"></vc:i18n>
                     </a>
                 </li>
 
diff --git a/public/pages/property/reportHuaning/reportHuaning.js b/public/pages/property/reportHuaning/reportHuaning.js
index c335f37a44e8f6e96a140f9849e1584dde1569ce..0cf57113ae44f4cb9ff02a0dabd243ab818aea54 100644
--- a/public/pages/property/reportHuaning/reportHuaning.js
+++ b/public/pages/property/reportHuaning/reportHuaning.js
@@ -43,31 +43,32 @@
                 vc.emit(_tab, 'switch', $that.reportHuaningInfo.conditions)
             },
             _changeReporficientFeeTypeCd: function() {
-                let param = {
-                    params: {
-                        page: 1,
-                        row: 100,
-                        communityId: vc.getCurrentCommunity().communityId,
-                        feeTypeCd: $that.reportHuaningInfo.conditions.feeTypeCd,
-                        isDefault: '',
-                        feeFlag: '',
-                        valid: '1'
-                    }
-                };
-                //发送get请求
-                vc.http.apiGet('/feeConfig.listFeeConfigs', param,
-                    function(json, res) {
-                        var _feeConfigManageInfo = JSON.parse(json);
-                        let _feeConfigs = _feeConfigManageInfo.feeConfigs
-                        vc.component.reportHuaningInfo.feeConfigDtos = _feeConfigs;
-                        /*if (_feeConfigs.length > 0) {
-                            $that.reportHuaningInfo.conditions.configId = _feeConfigs[0].configId;
-                            //$that.changeTab($that.reportHuaningInfo._currentTab)
-                        }*/
-                    },
-                    function(errInfo, error) {
-                        console.log('请求失败处理');
-                    });
+                
+                // let param = {
+                //     params: {
+                //         page: 1,
+                //         row: 100,
+                //         communityId: vc.getCurrentCommunity().communityId,
+                //         feeTypeCd: $that.reportHuaningInfo.conditions.feeTypeCd,
+                //         isDefault: '',
+                //         feeFlag: '',
+                //         valid: '1'
+                //     }
+                // };
+                // //发送get请求
+                // vc.http.apiGet('/feeConfig.listFeeConfigs', param,
+                //     function(json, res) {
+                //         var _feeConfigManageInfo = JSON.parse(json);
+                //         let _feeConfigs = _feeConfigManageInfo.feeConfigs
+                //         vc.component.reportHuaningInfo.feeConfigDtos = _feeConfigs;
+                //         /*if (_feeConfigs.length > 0) {
+                //             $that.reportHuaningInfo.conditions.configId = _feeConfigs[0].configId;
+                //             //$that.changeTab($that.reportHuaningInfo._currentTab)
+                //         }*/
+                //     },
+                //     function(errInfo, error) {
+                //         console.log('请求失败处理');
+                //     });
             },
             _changeReporficientConfigId: function() {
                 $that.changeTab($that.reportHuaningInfo._currentTab)
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html
index fbdd85af0ff9596e90cca5aa94299f091045a838..86d706628f6ae7f006a0e2cb4f7239016cbdac96 100755
--- a/public/pages/property/roomCreateFee/roomCreateFee.html
+++ b/public/pages/property/roomCreateFee/roomCreateFee.html
@@ -31,9 +31,7 @@
                     <div class="ibox ">
                         <div class="ibox-title">
                             <h5>
-                                <span>
-                                    <vc:i18n name="查询条件" namespace="room"></vc:i18n>
-                                </span>
+                                <vc:i18n name="查询条件" namespace="room"></vc:i18n>
                             </h5>
                             <div class="ibox-tools" style="top:10px;"></div>
                         </div>
@@ -50,7 +48,7 @@
                                 <div class="col-sm-3">
                                     <select class="custom-select" v-model="roomCreateFeeInfo.conditions.state">
                                         <option selected value="">{{vc.i18n('请选择状态','roomCreateFee')}}</option>
-                                        <option value="2008001">{{vc.i18n('收费中','roomCreateFee')}}</option>
+                                        <option value="2008001">{{vc.i18n('有效','roomCreateFee')}}</option>
                                         <option value="2009001">{{vc.i18n('收费结束','roomCreateFee')}}</option>
                                     </select>
                                 </div>
@@ -95,7 +93,7 @@
                             </h5>
                             <div class="ibox-tools" style="top:10px;">
                                 <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                                    v-on:click="_toSimplifyAcceptance()" v-if="roomCreateFeeInfo.ownerName">
+                                    v-on:click="_roomCreateFeetoSimplifyAcceptance()" v-if="roomCreateFeeInfo.ownerName">
                                     业务受理
                                 </button>
                                 <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
@@ -347,10 +345,9 @@
                                             <button class="btn btn-link btn-xs"
                                                 v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
                                                 v-on:click="_editFee(fee)">
-                                                        <vc:i18n name="变更" namespace="listRoomFee"></vc:i18n>
+                                                <vc:i18n name="变更" namespace="listRoomFee"></vc:i18n>
                                             </button>
-                                            <a target="_blank"
-                                                :href="'/#/pages/fee/feeDetail?feeId='+fee.feeId">
+                                            <a target="_blank" :href="'/#/pages/fee/feeDetail?feeId='+fee.feeId">
                                                 <vc:i18n name="详情" namespace="listRoomFee"></vc:i18n>
                                             </a>
 
@@ -388,4 +385,5 @@
     <vc:create path="property/addProxyFee" callBackListener="" callBackFunction=""></vc:create>
     <vc:create path="property/exportFeeImportExcel"></vc:create>
     <vc:create path="property/doImportCreateFee"></vc:create>
+    <vc:create path="fee/downloadCollectionLetterOrder"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js
index 24e0bbb7abf8f2f1e1a219f0621c3c32e349c207..b28e3f52463eeb02bbfbddff6a19e0a3459f1525 100755
--- a/public/pages/property/roomCreateFee/roomCreateFee.js
+++ b/public/pages/property/roomCreateFee/roomCreateFee.js
@@ -183,10 +183,15 @@
                 });
             },
             _downloadCollectionLetterOrder: function () {
-                vc.jumpToPage('/callComponent/feeManualCollection/downloadCollectionLetterOrder?communityId=' + vc.getCurrentCommunity().communityId);
+                //vc.jumpToPage('/callComponent/feeManualCollection/downloadCollectionLetterOrder?communityId=' + vc.getCurrentCommunity().communityId);
+                vc.emit('downloadCollectionLetterOrder', 'openExportExcel',{})
             },
             _downloadRoomCollectionLetterOrder: function (_room) {
-                vc.jumpToPage('/callComponent/feeManualCollection/downloadCollectionLetterOrder?communityId=' + vc.getCurrentCommunity().communityId + "&roomId=" + _room.roomId);
+                //vc.jumpToPage('/callComponent/feeManualCollection/downloadCollectionLetterOrder?communityId=' + vc.getCurrentCommunity().communityId + "&roomId=" + _room.roomId);
+                vc.emit('downloadCollectionLetterOrder', 'openExportExcel',{
+                    roomId:_room.roomId
+                })
+
             },
             _toPrintReminderFee: function (_room) {
             },
@@ -418,7 +423,7 @@
                     roomId: $that.roomCreateFeeInfo.roomId
                 })
             },
-            _toSimplifyAcceptance: function (_room) {
+            _roomCreateFeetoSimplifyAcceptance: function () {
                 let _date = new Date();
                 vc.saveData("JAVA110_IS_BACK", _date.getTime());
                 vc.saveData('simplifyAcceptanceSearch', {
diff --git a/public/pages/report/dataReport/dataReport.html b/public/pages/report/dataReport/dataReport.html
index 868f3c84f8551bd10a7cd49eddc7e3d7b71ef87e..6e6ba111f84cabeef11a5a5b7531382213ecd518 100644
--- a/public/pages/report/dataReport/dataReport.html
+++ b/public/pages/report/dataReport/dataReport.html
@@ -87,12 +87,22 @@
                             <vc:i18n name="欠费明细" namespace="dataReport"></vc:i18n>
                         </a>
                     </li>
-                 
+
                     <li class="nav-item">
                         <a class="nav-link" v-bind:class="{active:dataReportInfo._currentTab == 'dataReportFeeStatistics'}" v-on:click="changeTab('dataReportFeeStatistics')">
                             <vc:i18n name="收缴情况" namespace="dataReport"></vc:i18n>
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link" v-bind:class="{active:dataReportInfo._currentTab == 'dataMonthReceivedStatistics'}" v-on:click="changeTab('dataMonthReceivedStatistics')">
+                            <vc:i18n name="月实收明细" namespace="dataReport"></vc:i18n>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" v-bind:class="{active:dataReportInfo._currentTab == 'dataMonthOweStatistics'}" v-on:click="changeTab('dataMonthOweStatistics')">
+                            <vc:i18n name="月欠费明细" namespace="dataReport"></vc:i18n>
+                        </a>
+                    </li>
                 </ul>
             </div>
             <div v-if="dataReportInfo._currentTab == 'dataReportEarnedStatistics'">
@@ -113,6 +123,13 @@
             <div v-if="dataReportInfo._currentTab == 'dataReportFeeStatistics'">
                 <vc:create path="report/dataReportFeeStatistics"></vc:create>
             </div>
+            <div v-if="dataReportInfo._currentTab == 'dataMonthReceivedStatistics'">
+                <vc:create path="report/dataMonthReceivedStatistics"></vc:create>
+            </div>
+            <div v-if="dataReportInfo._currentTab == 'dataMonthOweStatistics'">
+                <vc:create path="report/dataMonthOweStatistics"></vc:create>
+            </div>
+            
         </div>
     </div>
 
diff --git a/public/pages/report/dataReport/dataReport.js b/public/pages/report/dataReport/dataReport.js
index 30b8305a3a2407735fd2ac21f37eebf307db4bef..d002057abeca820afdeed748c806b59bd1e7f35b 100644
--- a/public/pages/report/dataReport/dataReport.js
+++ b/public/pages/report/dataReport/dataReport.js
@@ -40,7 +40,10 @@
                     $that._changeDate();
                 });
                 vc.initDate('endDate', function(_value) {
+                    console.log(_value)
                     $that.dataReportInfo.conditions.endDate = _value;
+                    console.log($that.dataReportInfo.conditions.endDate)
+
                     $that._changeDate();
                 });
                 let _data = new Date();
@@ -64,17 +67,19 @@
             _changeDate: function(_day) {
                 $that.dataReportInfo.curDay = _day;
                 let _endDate = new Date();
-                $that.dataReportInfo.conditions.endDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                 if (_day == 'today') {
+                    $that.dataReportInfo.conditions.endDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                     $that.dataReportInfo.conditions.startDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                 } else if (_day == 'yesterday') {
                     _endDate.setDate(_endDate.getDate() - 1);
                     $that.dataReportInfo.conditions.endDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                     $that.dataReportInfo.conditions.startDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                 } else if (_day == 'seven') {
+                    $that.dataReportInfo.conditions.endDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                     _endDate.setDate(_endDate.getDate() - 7);
                     $that.dataReportInfo.conditions.startDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                 } else if (_day == 'thirty') {
+                    $that.dataReportInfo.conditions.endDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                     _endDate.setDate(_endDate.getDate() - 30);
                     $that.dataReportInfo.conditions.startDate = _endDate.getFullYear() + "-" + (_endDate.getMonth() + 1) + "-" + _endDate.getDate();
                 }
@@ -82,6 +87,7 @@
                 $that._loadDataReportOrder();
                 $that._loadDataReportInout();
                 $that._loadDataReportOthers();
+                $that.changeTab($that.dataReportInfo._currentTab);
 
             },
             _loadDataReportFee: function() {
diff --git a/public/pages/scm/couponPropertyUserManage/couponPropertyUserManage.html b/public/pages/scm/couponPropertyUserManage/couponPropertyUserManage.html
index dd2dc51a31ef28540b4f7381259d700fae85a2b5..3f2228ab32f367028763f68c042c14b9390b205f 100644
--- a/public/pages/scm/couponPropertyUserManage/couponPropertyUserManage.html
+++ b/public/pages/scm/couponPropertyUserManage/couponPropertyUserManage.html
@@ -7,32 +7,28 @@
                             <vc:i18n name="查询条件"></vc:i18n>
                         </span></h5>
                     <div class="ibox-tools" style="top:10px;">
-                     
+
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请填写优惠券编号','couponPropertyUserManage')"
-                                    v-model="couponPropertyUserManageInfo.conditions.couponId" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请填写优惠券编号','couponPropertyUserManage')" v-model="couponPropertyUserManageInfo.conditions.couponId" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请填写优惠券名称','couponPropertyUserManage')"
-                                    v-model="couponPropertyUserManageInfo.conditions.couponName" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请填写优惠券名称','couponPropertyUserManage')" v-model="couponPropertyUserManageInfo.conditions.couponName" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请填写有效期','couponPropertyUserManage')"
-                                    v-model="couponPropertyUserManageInfo.conditions.validityDay" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请填写有效期','couponPropertyUserManage')" v-model="couponPropertyUserManageInfo.conditions.validityDay" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm"
-                                v-on:click="_queryCouponPropertyUserMethod()">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryCouponPropertyUserMethod()">
                                 <i class="glyphicon glyphicon-search"></i> <span>
                                     <vc:i18n name="查询"></vc:i18n>
                                 </span>
@@ -40,19 +36,17 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-sm-4" >
+                        <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请填写用户名称','couponPropertyUserManage')"
-                                    v-model="couponPropertyUserManageInfo.conditions.userName" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请填写用户名称','couponPropertyUserManage')" v-model="couponPropertyUserManageInfo.conditions.userName" class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-4" >
+                        <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请填写手机号','couponPropertyUserManage')"
-                                    v-model="couponPropertyUserManageInfo.conditions.tel" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请填写手机号','couponPropertyUserManage')" v-model="couponPropertyUserManageInfo.conditions.tel" class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-3" >
+                        <div class="col-sm-3">
                             <select class="custom-select" v-model="couponPropertyUserManageInfo.conditions.toType">
                                 <option selected value="">{{vc.i18n('选择用途','couponPropertyUserManage')}}
                                 </option>
@@ -70,7 +64,7 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-sm-4" >
+                        <div class="col-sm-4">
                             <select class="custom-select" v-model="couponPropertyUserManageInfo.conditions.state">
                                 <option selected value="">
                                     {{vc.i18n('请选择状态','couponPropertyUserManage')}}
@@ -96,7 +90,7 @@
                             <vc:i18n name="业主优惠券" namespace="couponPropertyUserManage"></vc:i18n>
                         </span></h5>
                     <div class="ibox-tools" style="top:10px;">
-                        
+
                     </div>
                 </div>
                 <div class="ibox-content">
@@ -131,12 +125,12 @@
                                 <th class="text-center"><span>
                                         <vc:i18n name='状态' namespace='couponPropertyUserManage'></vc:i18n>
                                     </span></th>
-                                    <th class="text-center"><span>
+                                <th class="text-center"><span>
                                         <vc:i18n name='生效时间' namespace='couponPropertyUserManage'></vc:i18n>
                                     </span></th>
-                                <th class="text-center"><span>
+                                <!-- <th class="text-center"><span>
                                         <vc:i18n name='操作'></vc:i18n>
-                                    </span></th>
+                                    </span></th> -->
                             </tr>
                         </thead>
                         <tbody>
@@ -151,20 +145,18 @@
                                 <td class="text-center">{{couponPropertyUser.stock}}张</td>
                                 <td class="text-center">{{couponPropertyUser.state == '1001'?'未使用':'已使用'}}</td>
                                 <td class="text-center">{{couponPropertyUser.startTime}}</td>
-                                <td class="text-center">
+                                <!-- <td class="text-center">
                                     <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditCouponPropertyUserModel(couponPropertyUser)"><span>
+                                        <button class="btn-white btn btn-xs" v-on:click="_openEditCouponPropertyUserModel(couponPropertyUser)"><span>
                                                 <vc:i18n name='修改'></vc:i18n>
                                             </span></button>
                                     </div>
                                     <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteCouponPropertyUserModel(couponPropertyUser)"><span>
+                                        <button class="btn-white btn btn-xs" v-on:click="_openDeleteCouponPropertyUserModel(couponPropertyUser)"><span>
                                                 <vc:i18n name='删除'></vc:i18n>
                                             </span></button>
                                     </div>
-                                </td>
+                                </td> -->
 
                             </tr>
                         </tbody>
diff --git a/public/user.html b/public/user.html
index 2a731b3ff8dbd55d4d695e68b04ea7cce2ced39b..5ff4ac88241df8d9f004ce01fda2f73b3cc95dfc 100755
--- a/public/user.html
+++ b/public/user.html
@@ -36,13 +36,6 @@
             <div id="component" class="layui-form" action="" method="post">
                 <vc:create path="/pages/frame/login"></vc:create>
             </div>
-            <hr class="layui-bg-gray">
-            <div class="layui-footer text-white">
-                <!-- 底部固定区域 -->
-                &copy;2020-2023
-                <span class="java110-company-team"></span>
-
-            </div>
         </div>
     </div>
 
diff --git a/public/vcCore/vc-validate.js b/public/vcCore/vc-validate.js
index 478d89707440707da2375d4fcad739f0553837ab..1951f8999ee0bf6aa8da7c0457244fd1f66d9ef1 100755
--- a/public/vcCore/vc-validate.js
+++ b/public/vcCore/vc-validate.js
@@ -36,9 +36,18 @@ vc 校验 工具类 -method
             校验手机号
         **/
         phone:function(text){
-             var regPhone =/^0?1[3|4|5|6|7|8][0-9]\d{8}$/;
+             console.log('(vc-validate)phone:' + text)
+             var regPhone =/^.*$/;
              return regPhone.test(text);
         },
+
+        /**
+            校验手机号
+        **/
+        // newPhone:function(text){
+        //      var regPhone =/^0?1[3|4|5|6|7|8][0-9]\d{1}$/;
+        //      return regPhone.test(text);
+        // },
         /**
             校验邮箱
         **/
diff --git a/public/vcCore/vcFramework-0.4.js b/public/vcCore/vcFramework-0.4.js
index 2e176cb91d7594128ae606ff2c71c5300760001c..88f6cf59de854d0e7932077b2a63541e1c3cb3d6 100755
--- a/public/vcCore/vcFramework-0.4.js
+++ b/public/vcCore/vcFramework-0.4.js
@@ -1687,7 +1687,8 @@ vc 校验 工具类 -method
             校验手机号
         **/
         phone: function (text) {
-            let regPhone = /^0?1[3|4|5|6|7|8|9][0-9]\d{8}$/;
+            console.log('(vcFramework-0.4)phone:' + text)
+            var regPhone =/^.*$/;
             return regPhone.test(text);
         },
         /**
diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js
index b10a655122fa14bff8b87a832e19cdd1c14781c8..d9a6e131a489c832e4ac9cbf96ef266219d0bef5 100755
--- a/public/vcCore/vcFramework.js
+++ b/public/vcCore/vcFramework.js
@@ -2337,7 +2337,8 @@
          校验手机号
          **/
         phone: function(text) {
-            let regPhone = /^0?1[3|4|5|6|7|8|9][0-9]\d{8}$/;
+            console.log('(vcFramework)phone:' + text)
+            var regPhone =/^.*$/;
             return regPhone.test(text);
         },
         /**