From f6cc48983f08452afd6102a83eb866a8fd49cf1d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 21 Mar 2022 14:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=97=E9=83=A8=E6=B9=BE?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=95=86=E7=94=A8=E5=8F=8D=E9=A6=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addFeeConfig/addFeeConfig.html   |  38 ++---
 .../property/addFeeConfig/addFeeConfig.js     | 145 +++++++---------
 .../property/editFeeConfig/editFeeConfig.js   | 159 ++++++++----------
 .../simplifyFeeReceipt.html                   |  29 ++--
 .../feeConfigManage/feeConfigManage.html      |  14 +-
 .../pages/property/feeReceipt/feeReceipt.html |  79 ++++-----
 .../pages/property/listOweFee/listOweFee.html |  89 +++++-----
 public/pages/property/room/room.html          |  27 ++-
 public/pages/property/room/room.js            |   5 +
 9 files changed, 268 insertions(+), 317 deletions(-)

diff --git a/public/components/property/addFeeConfig/addFeeConfig.html b/public/components/property/addFeeConfig/addFeeConfig.html
index aad752010..7b4027e44 100755
--- a/public/components/property/addFeeConfig/addFeeConfig.html
+++ b/public/components/property/addFeeConfig/addFeeConfig.html
@@ -1,9 +1,8 @@
-<div id="addFeeConfigModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-     aria-hidden="true">
+<div id="addFeeConfigModel" class="modal fade" tabindex="-1" 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 ">添加费用项</h3>
+                <h3 class="m-t-none m-b ">添加</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
@@ -22,8 +21,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">收费项目</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addFeeConfigInfo.feeName" type="text" placeholder="必填，请填写收费项目"
-                                           class="form-control">
+                                    <input v-model="addFeeConfigInfo.feeName" type="text" placeholder="必填，请填写收费项目" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
@@ -51,8 +49,7 @@
                             <div class="form-group row" v-if="addFeeConfigInfo.feeFlag=='1003006'">
                                 <label class="col-sm-2 col-form-label">缴费周期</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addFeeConfigInfo.paymentCycle" type="text"
-                                           placeholder="必填，请填写缴费周期 单位为月" class="form-control">
+                                    <input v-model="addFeeConfigInfo.paymentCycle" type="text" placeholder="必填，请填写缴费周期 单位为月" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
@@ -69,15 +66,13 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">计费起始时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addFeeConfigInfo.startTime" type="text" placeholder="必填，请填写计费起始时间"
-                                           class="form-control addFeeConfigStartTime" name="startTime">
+                                    <input v-model="addFeeConfigInfo.startTime" type="text" placeholder="必填，请填写计费起始时间" class="form-control addFeeConfigStartTime" name="startTime">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">计费终止时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addFeeConfigInfo.endTime" type="text" placeholder="必填，请填写计费终止时间"
-                                           class="form-control addFeeConfigEndTime" name="endTime">
+                                    <input v-model="addFeeConfigInfo.endTime" type="text" placeholder="必填，请填写计费终止时间" class="form-control addFeeConfigEndTime" name="endTime">
                                 </div>
                             </div>
                             <div class="form-group row">
@@ -92,8 +87,7 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="form-group row"
-                                 v-show="addFeeConfigInfo.computingFormula != '2002' 
+                            <div class="form-group row" v-show="addFeeConfigInfo.computingFormula != '2002' 
                                  && addFeeConfigInfo.computingFormula != '7007' 
                                  && addFeeConfigInfo.computingFormula != '8008'
                                  && addFeeConfigInfo.computingFormula != '1101'
@@ -101,12 +95,10 @@
                                  && addFeeConfigInfo.computingFormula != '9009'">
                                 <label class="col-sm-2 col-form-label">计费单价</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addFeeConfigInfo.squarePrice" type="text" placeholder="必填，请填写计费单价"
-                                           class="form-control">
+                                    <input v-model="addFeeConfigInfo.squarePrice" type="text" placeholder="必填，请填写计费单价" class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row"
-                                 v-show="addFeeConfigInfo.computingFormula != '7007' 
+                            <div class="form-group row" v-show="addFeeConfigInfo.computingFormula != '7007' 
                                  && addFeeConfigInfo.computingFormula != '8008'
                                  && addFeeConfigInfo.computingFormula != '1101'
                                  && addFeeConfigInfo.computingFormula != '4004'
@@ -115,16 +107,14 @@
                                     {{addFeeConfigInfo.computingFormula == '1001' ?'附加费用':'固定费用'}}
                                 </label>
                                 <div class="col-sm-10">
-                                    <input v-model="addFeeConfigInfo.additionalAmount" type="text"
-                                           placeholder="必填，请填写附加费用" class="form-control">
+                                    <input v-model="addFeeConfigInfo.additionalAmount" type="text" placeholder="必填，请填写附加费用" class="form-control">
                                 </div>
                             </div>
                             <div v-show="addFeeConfigInfo.computingFormula == '7007'">
                                 <div class="form-group row">
                                     <label class="col-sm-2 col-form-label">公式</label>
                                     <div class="col-sm-10">
-                                        <textarea v-model="addFeeConfigInfo.computingFormulaText" placeholder="必填，请填写公式"
-                                                  class="form-control"></textarea>
+                                        <textarea v-model="addFeeConfigInfo.computingFormulaText" placeholder="必填，请填写公式" class="form-control"></textarea>
                                     </div>
                                 </div>
                                 <div class="form-group row">
@@ -142,12 +132,10 @@
                                 </div>
                             </div>
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="saveFeeConfigInfo()">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveFeeConfigInfo()">
                                     <i class="fa fa-check"></i>&nbsp;保存
                                 </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">
                                     <i class="fa fa-times"></i>&nbsp;取消
                                 </button>
                             </div>
diff --git a/public/components/property/addFeeConfig/addFeeConfig.js b/public/components/property/addFeeConfig/addFeeConfig.js
index 660e61b98..1c51768a3 100755
--- a/public/components/property/addFeeConfig/addFeeConfig.js
+++ b/public/components/property/addFeeConfig/addFeeConfig.js
@@ -1,4 +1,4 @@
-(function (vc) {
+(function(vc) {
     vc.extends({
         propTypes: {
             callBackListener: vc.propTypes.string,
@@ -11,8 +11,8 @@
                 feeTypeCd: '',
                 feeName: '',
                 feeFlag: '',
-                startTime: '',
-                endTime: '',
+                startTime: '2010-01-01',
+                endTime: '2050-01-01',
                 computingFormula: '',
                 squarePrice: '',
                 additionalAmount: '',
@@ -27,73 +27,50 @@
                 computingFormulaText: ''
             }
         },
-        _initMethod: function () {
+        _initMethod: function() {
             vc.component._initAddFeeConfigDateInfo();
             //与字典表费用类型关联
-            vc.getDict('pay_fee_config', "fee_type_cd_show", function (_data) {
+            vc.getDict('pay_fee_config', "fee_type_cd_show", function(_data) {
                 vc.component.addFeeConfigInfo.feeTypeCds = _data;
             });
             //与字典表计算公式关联
-            vc.getDict('pay_fee_config', "computing_formula", function (_data) {
+            vc.getDict('pay_fee_config', "computing_formula", function(_data) {
                 vc.component.addFeeConfigInfo.computingFormulas = _data;
             });
             //与字典表费用标识关联
-            vc.getDict('pay_fee_config', 'fee_flag', function (_data) {
+            vc.getDict('pay_fee_config', 'fee_flag', function(_data) {
                 vc.component.addFeeConfigInfo.feeFlags = _data;
             });
             //与字典表付费类型关联
-            vc.getDict('pay_fee_config', 'payment_cd', function (_data) {
+            vc.getDict('pay_fee_config', 'payment_cd', function(_data) {
                 vc.component.addFeeConfigInfo.paymentCds = _data;
             });
             //与字典表出账类型关联
-            vc.getDict('pay_fee_config', 'bill_type', function (_data) {
+            vc.getDict('pay_fee_config', 'bill_type', function(_data) {
                 vc.component.addFeeConfigInfo.billTypes = _data;
             });
         },
-        _initEvent: function () {
+        _initEvent: function() {
             vc.on('addFeeConfig', 'openAddFeeConfigModal',
-                function () {
+                function() {
                     $('#addFeeConfigModel').modal('show');
                 });
         },
         methods: {
-            _initAddFeeConfigDateInfo: function () {
-                // vc.component.addFeeConfigInfo.startTime = vc.dateTimeFormat(new Date().getTime());
-                $('.addFeeConfigStartTime').datetimepicker({
-                    language: 'zh-CN',
-                    fontAwesome: 'fa',
-                    format: 'yyyy-mm-dd hh:ii:ss',
-                    initTime: true,
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
+            _initAddFeeConfigDateInfo: function() {
+                vc.initDate('addFeeConfigStartTime', function(_value) {
+                    vc.component.addFeeConfigInfo.startTime = _value;
                 });
-                $('.addFeeConfigStartTime').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".addFeeConfigStartTime").val();
-                        vc.component.addFeeConfigInfo.startTime = value;
-                    });
-                $('.addFeeConfigEndTime').datetimepicker({
-                    language: 'zh-CN',
-                    fontAwesome: 'fa',
-                    format: 'yyyy-mm-dd hh:ii:ss',
-                    initTime: true,
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
+                vc.initDate('addFeeConfigEndTime', function(_value) {
+                    var start = Date.parse(new Date(vc.component.addFeeConfigInfo.startTime))
+                    var end = Date.parse(new Date(_value))
+                    if (start - end >= 0) {
+                        vc.toast("计费终止时间必须大于计费起始时间")
+                        $(".addFeeConfigEndTime").val('')
+                    } else {
+                        vc.component.addFeeConfigInfo.endTime = _value;
+                    }
                 });
-                $('.addFeeConfigEndTime').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".addFeeConfigEndTime").val();
-                        var start = Date.parse(new Date(vc.component.addFeeConfigInfo.startTime))
-                        var end = Date.parse(new Date(value))
-                        if (start - end >= 0) {
-                            vc.toast("计费终止时间必须大于计费起始时间")
-                            $(".addFeeConfigEndTime").val('')
-                        } else {
-                            vc.component.addFeeConfigInfo.endTime = value;
-                        }
-                    });
                 //防止多次点击时间插件失去焦点
                 document.getElementsByName('startTime')[0].addEventListener('click', myfunc)
 
@@ -110,9 +87,8 @@
             addFeeConfigValidate() {
                 return vc.validate.validate({
                     addFeeConfigInfo: vc.component.addFeeConfigInfo
-                },
-                    {
-                        'addFeeConfigInfo.feeTypeCd': [{
+                }, {
+                    'addFeeConfigInfo.feeTypeCd': [{
                             limit: "required",
                             param: "",
                             errInfo: "费用类型不能为空"
@@ -122,8 +98,8 @@
                             param: "",
                             errInfo: "费用类型格式错误"
                         },
-                        ],
-                        'addFeeConfigInfo.feeName': [{
+                    ],
+                    'addFeeConfigInfo.feeName': [{
                             limit: "required",
                             param: "",
                             errInfo: "收费项目不能为空"
@@ -133,8 +109,8 @@
                             param: "1,100",
                             errInfo: "收费项目不能超过100位"
                         },
-                        ],
-                        'addFeeConfigInfo.feeFlag': [{
+                    ],
+                    'addFeeConfigInfo.feeFlag': [{
                             limit: "required",
                             param: "",
                             errInfo: "费用标识不能为空"
@@ -144,30 +120,30 @@
                             param: "",
                             errInfo: "费用类型格式错误"
                         },
-                        ],
-                        'addFeeConfigInfo.startTime': [{
+                    ],
+                    'addFeeConfigInfo.startTime': [{
                             limit: "required",
                             param: "",
                             errInfo: "计费起始时间不能为空"
                         },
                         {
-                            limit: "dateTime",
+                            limit: "date",
                             param: "",
                             errInfo: "计费起始时间不是有效的时间格式"
                         },
-                        ],
-                        'addFeeConfigInfo.endTime': [{
+                    ],
+                    'addFeeConfigInfo.endTime': [{
                             limit: "required",
                             param: "",
                             errInfo: "计费终止时间不能为空"
                         },
                         {
-                            limit: "dateTime",
+                            limit: "date",
                             param: "",
                             errInfo: "计费终止时间不是有效的时间格式"
                         },
-                        ],
-                        'addFeeConfigInfo.computingFormula': [{
+                    ],
+                    'addFeeConfigInfo.computingFormula': [{
                             limit: "required",
                             param: "",
                             errInfo: "计算公式不能为空"
@@ -177,8 +153,8 @@
                             param: "",
                             errInfo: "计算公式格式错误"
                         },
-                        ],
-                        'addFeeConfigInfo.squarePrice': [{
+                    ],
+                    'addFeeConfigInfo.squarePrice': [{
                             limit: "required",
                             param: "",
                             errInfo: "计费单价不能为空"
@@ -188,8 +164,8 @@
                             param: "",
                             errInfo: "计费单价格式错误"
                         },
-                        ],
-                        'addFeeConfigInfo.additionalAmount': [{
+                    ],
+                    'addFeeConfigInfo.additionalAmount': [{
                             limit: "required",
                             param: "",
                             errInfo: "附加费用不能为空"
@@ -199,14 +175,13 @@
                             param: "",
                             errInfo: "附加费用格式错误"
                         },
-                        ],
-                        'addFeeConfigInfo.billType': [{
-                            limit: "required",
-                            param: "",
-                            errInfo: "出账类型不能为空"
-                        }
-                        ],
-                        'addFeeConfigInfo.paymentCycle': [{
+                    ],
+                    'addFeeConfigInfo.billType': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "出账类型不能为空"
+                    }],
+                    'addFeeConfigInfo.paymentCycle': [{
                             limit: "required",
                             param: "",
                             errInfo: "缴费周期不能为空"
@@ -216,8 +191,8 @@
                             param: "",
                             errInfo: "缴费周期必须为数字 单位月"
                         },
-                        ],
-                        'addFeeConfigInfo.paymentCd': [{
+                    ],
+                    'addFeeConfigInfo.paymentCd': [{
                             limit: "required",
                             param: "",
                             errInfo: "付费类型不能为空"
@@ -227,10 +202,10 @@
                             param: "",
                             errInfo: "付费类型格式错误"
                         },
-                        ]
-                    });
+                    ]
+                });
             },
-            saveFeeConfigInfo: function () {
+            saveFeeConfigInfo: function() {
 
                 //固定费用
                 if (vc.component.addFeeConfigInfo.computingFormula == '2002') {
@@ -238,8 +213,8 @@
                 }
                 //自定义费用
                 if (vc.component.addFeeConfigInfo.computingFormula == '7007' ||
-                    vc.component.addFeeConfigInfo.computingFormula == '4004'||
-                    vc.component.addFeeConfigInfo.computingFormula == '1101'||
+                    vc.component.addFeeConfigInfo.computingFormula == '4004' ||
+                    vc.component.addFeeConfigInfo.computingFormula == '1101' ||
                     vc.component.addFeeConfigInfo.computingFormula == '9009') {
                     vc.component.addFeeConfigInfo.squarePrice = "0.00";
                     vc.component.addFeeConfigInfo.additionalAmount = "0.00";
@@ -267,9 +242,9 @@
                     return;
                 }
                 vc.http.post('addFeeConfig', 'save', JSON.stringify(vc.component.addFeeConfigInfo), {
-                    emulateJSON: true
-                },
-                    function (json, res) {
+                        emulateJSON: true
+                    },
+                    function(json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                         if (res.status == 200) {
                             //关闭model
@@ -280,12 +255,12 @@
                             return;
                         }
                     },
-                    function (errInfo, error) {
+                    function(errInfo, error) {
                         console.log('请求失败处理');
                         vc.toast(errInfo);
                     });
             },
-            clearAddFeeConfigInfo: function () {
+            clearAddFeeConfigInfo: function() {
                 var _feeTypeCds = vc.component.addFeeConfigInfo.feeTypeCds;
                 var _computingFormulas = vc.component.addFeeConfigInfo.computingFormulas;
                 var _feeFlags = vc.component.addFeeConfigInfo.feeFlags;
diff --git a/public/components/property/editFeeConfig/editFeeConfig.js b/public/components/property/editFeeConfig/editFeeConfig.js
index 1818a64cf..6e3709ecb 100755
--- a/public/components/property/editFeeConfig/editFeeConfig.js
+++ b/public/components/property/editFeeConfig/editFeeConfig.js
@@ -1,4 +1,4 @@
-(function (vc, vm) {
+(function(vc, vm) {
     vc.extends({
         data: {
             editFeeConfigInfo: {
@@ -23,71 +23,51 @@
                 computingFormulaText: ''
             }
         },
-        _initMethod: function () {
+        _initMethod: function() {
             vc.component._initEditFeeConfigDateInfo();
-            vc.getDict('pay_fee_config', "fee_type_cd", function (_data) {
+            vc.getDict('pay_fee_config', "fee_type_cd", function(_data) {
                 vc.component.editFeeConfigInfo.feeTypeCds = _data;
             });
-            vc.getDict('pay_fee_config', "computing_formula", function (_data) {
+            vc.getDict('pay_fee_config', "computing_formula", function(_data) {
                 vc.component.editFeeConfigInfo.computingFormulas = _data;
             });
-            vc.getDict('pay_fee_config', 'fee_flag', function (_data) {
+            vc.getDict('pay_fee_config', 'fee_flag', function(_data) {
                 vc.component.editFeeConfigInfo.feeFlags = _data;
             });
-            vc.getDict('pay_fee_config', 'bill_type', function (_data) {
+            vc.getDict('pay_fee_config', 'bill_type', function(_data) {
                 vc.component.editFeeConfigInfo.billTypes = _data;
             });
-            vc.getDict('pay_fee_config', 'payment_cd', function (_data) {
+            vc.getDict('pay_fee_config', 'payment_cd', function(_data) {
                 vc.component.editFeeConfigInfo.paymentCds = _data;
             });
         },
-        _initEvent: function () {
+        _initEvent: function() {
             vc.on('editFeeConfig', 'openEditFeeConfigModal',
-                function (_params) {
+                function(_params) {
                     vc.component.refreshEditFeeConfigInfo();
                     $('#editFeeConfigModel').modal('show');
                     vc.copyObject(_params, vc.component.editFeeConfigInfo);
+                    vc.component.editFeeConfigInfo.startTime = vc.dateFormat(_params.startTime);
+                    vc.component.editFeeConfigInfo.endTime = vc.dateFormat(_params.endTime);
                     vc.component.editFeeConfigInfo.communityId = vc.getCurrentCommunity().communityId;
                 });
         },
         methods: {
-            _initEditFeeConfigDateInfo: function () {
+            _initEditFeeConfigDateInfo: function() {
                 //vc.component.editFeeConfigInfo.startTime = vc.dateTimeFormat(new Date().getTime());
-                $('.editFeeConfigStartTime').datetimepicker({
-                    language: 'zh-CN',
-                    fontAwesome: 'fa',
-                    format: 'yyyy-mm-dd hh:ii:ss',
-                    initTime: true,
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
+                vc.initDate('editFeeConfigStartTime', function(_value) {
+                    vc.component.editFeeConfigInfo.startTime = _value;
                 });
-                $('.editFeeConfigStartTime').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".editFeeConfigStartTime").val();
-                        vc.component.editFeeConfigInfo.startTime = value;
-                    });
-                $('.editFeeConfigEndTime').datetimepicker({
-                    language: 'zh-CN',
-                    fontAwesome: 'fa',
-                    format: 'yyyy-mm-dd hh:ii:ss',
-                    initTime: true,
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
+                vc.initDate('editFeeConfigEndTime', function(_value) {
+                    var start = Date.parse(new Date(vc.component.editFeeConfigInfo.startTime))
+                    var end = Date.parse(new Date(_value))
+                    if (start - end >= 0) {
+                        vc.toast("计费终止时间必须大于计费起始时间")
+                        $(".editFeeConfigEndTime").val('')
+                    } else {
+                        vc.component.editFeeConfigInfo.endTime = _value;
+                    }
                 });
-                $('.editFeeConfigEndTime').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".editFeeConfigEndTime").val();
-                        var start = Date.parse(new Date(vc.component.editFeeConfigInfo.startTime))
-                        var end = Date.parse(new Date(value))
-                        if (start - end >= 0) {
-                            vc.toast("计费终止时间必须大于计费起始时间")
-                            $(".editFeeConfigEndTime").val('')
-                        } else {
-                            vc.component.editFeeConfigInfo.endTime = value;
-                        }
-                    });
                 //防止多次点击时间插件失去焦点
                 document.getElementsByClassName("form-control editFeeConfigStartTime")[0].addEventListener('click', myfunc)
 
@@ -101,12 +81,11 @@
                     e.currentTarget.blur();
                 }
             },
-            editFeeConfigValidate: function () {
+            editFeeConfigValidate: function() {
                 return vc.validate.validate({
                     editFeeConfigInfo: vc.component.editFeeConfigInfo
-                },
-                    {
-                        'editFeeConfigInfo.feeTypeCd': [{
+                }, {
+                    'editFeeConfigInfo.feeTypeCd': [{
                             limit: "required",
                             param: "",
                             errInfo: "费用类型不能为空"
@@ -116,8 +95,8 @@
                             param: "",
                             errInfo: "费用类型格式错误"
                         },
-                        ],
-                        'editFeeConfigInfo.feeName': [{
+                    ],
+                    'editFeeConfigInfo.feeName': [{
                             limit: "required",
                             param: "",
                             errInfo: "收费项目不能为空"
@@ -127,8 +106,8 @@
                             param: "1,100",
                             errInfo: "收费项目不能超过100位"
                         },
-                        ],
-                        'editFeeConfigInfo.feeFlag': [{
+                    ],
+                    'editFeeConfigInfo.feeFlag': [{
                             limit: "required",
                             param: "",
                             errInfo: "费用标识不能为空"
@@ -138,30 +117,30 @@
                             param: "",
                             errInfo: "费用类型格式错误"
                         },
-                        ],
-                        'editFeeConfigInfo.startTime': [{
+                    ],
+                    'editFeeConfigInfo.startTime': [{
                             limit: "required",
                             param: "",
                             errInfo: "计费起始时间不能为空"
                         },
                         {
-                            limit: "dateTime",
+                            limit: "date",
                             param: "",
                             errInfo: "计费起始时间不是有效的时间格式"
                         },
-                        ],
-                        'editFeeConfigInfo.endTime': [{
+                    ],
+                    'editFeeConfigInfo.endTime': [{
                             limit: "required",
                             param: "",
                             errInfo: "计费终止时间不能为空"
                         },
                         {
-                            limit: "dateTime",
+                            limit: "date",
                             param: "",
                             errInfo: "计费终止时间不是有效的时间格式"
                         },
-                        ],
-                        'editFeeConfigInfo.computingFormula': [{
+                    ],
+                    'editFeeConfigInfo.computingFormula': [{
                             limit: "required",
                             param: "",
                             errInfo: "计算公式不能为空"
@@ -171,8 +150,8 @@
                             param: "",
                             errInfo: "计算公式格式错误"
                         },
-                        ],
-                        'editFeeConfigInfo.squarePrice': [{
+                    ],
+                    'editFeeConfigInfo.squarePrice': [{
                             limit: "required",
                             param: "",
                             errInfo: "计费单价不能为空"
@@ -182,8 +161,8 @@
                             param: "",
                             errInfo: "计费单价格式错误，如1.5000"
                         },
-                        ],
-                        'editFeeConfigInfo.additionalAmount': [{
+                    ],
+                    'editFeeConfigInfo.additionalAmount': [{
                             limit: "required",
                             param: "",
                             errInfo: "附加费用不能为空"
@@ -193,18 +172,18 @@
                             param: "",
                             errInfo: "附加费用格式错误"
                         },
-                        ],
-                        'editFeeConfigInfo.configId': [{
-                            limit: "required",
-                            param: "",
-                            errInfo: "费用项ID不能为空"
-                        }],
-                        'editFeeConfigInfo.billType': [{
-                            limit: "required",
-                            param: "",
-                            errInfo: "出账类型不能为空"
-                        }],
-                        'editFeeConfigInfo.paymentCycle': [{
+                    ],
+                    'editFeeConfigInfo.configId': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "费用项ID不能为空"
+                    }],
+                    'editFeeConfigInfo.billType': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "出账类型不能为空"
+                    }],
+                    'editFeeConfigInfo.paymentCycle': [{
                             limit: "required",
                             param: "",
                             errInfo: "缴费周期不能为空"
@@ -214,8 +193,8 @@
                             param: "",
                             errInfo: "缴费周期必须为数字 单位月"
                         },
-                        ],
-                        'editFeeConfigInfo.paymentCd': [{
+                    ],
+                    'editFeeConfigInfo.paymentCd': [{
                             limit: "required",
                             param: "",
                             errInfo: "付费类型不能为空"
@@ -225,20 +204,20 @@
                             param: "",
                             errInfo: "付费类型格式错误"
                         },
-                        ]
-                    });
+                    ]
+                });
             },
-            editFeeConfig: function () {
-                
+            editFeeConfig: function() {
+
                 //固定费用
                 if (vc.component.editFeeConfigInfo.computingFormula == '2002') {
                     vc.component.editFeeConfigInfo.squarePrice = "0.00";
                 }
                 //自定义费用
-                if (vc.component.editFeeConfigInfo.computingFormula == '7007'
-                || vc.component.editFeeConfigInfo.computingFormula == '4004'
-                || vc.component.editFeeConfigInfo.computingFormula == '1101'
-                || vc.component.editFeeConfigInfo.computingFormula == '9009') {
+                if (vc.component.editFeeConfigInfo.computingFormula == '7007' ||
+                    vc.component.editFeeConfigInfo.computingFormula == '4004' ||
+                    vc.component.editFeeConfigInfo.computingFormula == '1101' ||
+                    vc.component.editFeeConfigInfo.computingFormula == '9009') {
                     vc.component.editFeeConfigInfo.squarePrice = "0.00";
                     vc.component.editFeeConfigInfo.additionalAmount = "0.00";
                 }
@@ -258,9 +237,9 @@
                     return;
                 }
                 vc.http.post('editFeeConfig', 'update', JSON.stringify(vc.component.editFeeConfigInfo), {
-                    emulateJSON: true
-                },
-                    function (json, res) {
+                        emulateJSON: true
+                    },
+                    function(json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                         if (res.status == 200) {
                             //关闭model
@@ -270,12 +249,12 @@
                             return;
                         }
                     },
-                    function (errInfo, error) {
+                    function(errInfo, error) {
                         console.log('请求失败处理');
                         vc.toast(errInfo);
                     });
             },
-            refreshEditFeeConfigInfo: function () {
+            refreshEditFeeConfigInfo: function() {
                 var _feeTypeCds = vc.component.editFeeConfigInfo.feeTypeCds;
                 var _computingFormulas = vc.component.editFeeConfigInfo.computingFormulas;
                 var _feeFlags = vc.component.editFeeConfigInfo.feeFlags;
diff --git a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
index 6acdefcd5..6eb769522 100755
--- a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
+++ b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
@@ -1,8 +1,7 @@
 <div>
     <div class="row margin-top-lg">
         <div class="col-lg-2 padding-right-xs padding-left-xl">
-            <select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.objType"
-                @change="_changeSimplifyFeeReceiptFeeTypeCd(simplifyFeeReceiptInfo.objType)">
+            <select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.objType" @change="_changeSimplifyFeeReceiptFeeTypeCd(simplifyFeeReceiptInfo.objType)">
                 <option disabled value="">请选择收费类型</option>
                 <option selected value="3333">房屋费</option>
                 <option value="6666">车位费</option>
@@ -10,16 +9,14 @@
             </select>
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType == '6666'">
-            <select class="custom-select custom-select-sm" v-model="simplifyCarFeeInfo.carId"
-                @change="changeSimplifyFeeReceiptCar()">
+            <select class="custom-select custom-select-sm" v-model="simplifyCarFeeInfo.carId" @change="changeSimplifyFeeReceiptCar()">
                 <option disabled value="">请选择车辆</option>
                 <option v-for="(item,index) in simplifyFeeReceiptInfo.ownerCars" :value="item.carId">{{item.carNum}}
                 </option>
             </select>
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl" v-else-if="simplifyFeeReceiptInfo.objType == '7777'">
-            <select class="custom-select custom-select-sm" v-model="simplifyCarFeeInfo.contractId"
-                @change="changeSimplifyFeeReceiptCar()">
+            <select class="custom-select custom-select-sm" v-model="simplifyCarFeeInfo.contractId" @change="changeSimplifyFeeReceiptCar()">
                 <option disabled value="">请选择合同</option>
                 <option v-for="(item,index) in simplifyFeeReceiptInfo.ownerContracts" :value="item.contractId">
                     {{item.contractCode}}
@@ -27,8 +24,7 @@
             </select>
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType != '7777'">
-            <select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.ownerFlag"
-                @change="_queryFeeReceiptMethod()">
+            <select class="custom-select custom-select-sm" v-model="simplifyFeeReceiptInfo.ownerFlag" @change="_queryFeeReceiptMethod()">
                 <option value="F">当前{{simplifyFeeReceiptInfo.objType == '6666'?'车辆':'房屋'}}</option>
                 <option value="T">全部{{simplifyFeeReceiptInfo.objType == '6666'?'车辆':'房屋'}}</option>
             </select>
@@ -37,16 +33,13 @@
 
         </div>
         <div class="col-lg-6 text-right padding-right-lg">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                v-on:click="_printFeeReceipt()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_printFeeReceipt()">
                 打印
             </button>
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                v-on:click="_printFeeSmallReceipt()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_printFeeSmallReceipt()">
                 打印小票
             </button>
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                v-on:click="_printApplyFeeReceipt()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_printApplyFeeReceipt()">
                 申请单
             </button>
         </div>
@@ -56,11 +49,11 @@
             <thead>
                 <tr>
                     <th class="text-center">
-                        <input type="checkbox" class="i-checks" v-bind:checked="simplifyFeeReceiptInfo.quan == true"
-                            @click="checkAllReceipt($event)">
+                        <input type="checkbox" class="i-checks" v-bind:checked="simplifyFeeReceiptInfo.quan == true" @click="checkAllReceipt($event)">
                     </th>
                     <th class="text-center">费用类型</th>
                     <th class="text-center">{{_getFeeObjName(simplifyFeeReceiptInfo.objType)}}</th>
+                    <th class="text-center">业主</th>
                     <th class="text-center">费用项目</th>
                     <th class="text-center">总金额</th>
                     <th class="text-center">缴费时间</th>
@@ -70,11 +63,11 @@
             <tbody>
                 <tr v-for="feeReceipt in simplifyFeeReceiptInfo.feeReceipts">
                     <td class="text-center">
-                        <input type="checkbox" class="i-checks checReceiptItem" v-bind:value="feeReceipt.receiptId"
-                            v-model="simplifyFeeReceiptInfo.selectReceipts">
+                        <input type="checkbox" class="i-checks checReceiptItem" v-bind:value="feeReceipt.receiptId" v-model="simplifyFeeReceiptInfo.selectReceipts">
                     </td>
                     <td class="text-center">{{_getFeeObjName(feeReceipt.objType)}}费</td>
                     <td class="text-center">{{feeReceipt.objName}}</td>
+                    <td class="text-center">{{feeReceipt.payObjName}}</td>
                     <td class="text-center">{{feeReceipt.feeName}}</td>
                     <td class="text-center">{{feeReceipt.amount}}</td>
                     <td class="text-center">{{feeReceipt.createTime}}</td>
diff --git a/public/pages/property/feeConfigManage/feeConfigManage.html b/public/pages/property/feeConfigManage/feeConfigManage.html
index 673ac2bca..43c1f2cbc 100755
--- a/public/pages/property/feeConfigManage/feeConfigManage.html
+++ b/public/pages/property/feeConfigManage/feeConfigManage.html
@@ -153,7 +153,19 @@
                         </tfoot>
                     </table>
                     <!-- 分页 -->
-                    <vc:create path="frame/pagination"></vc:create>
+                    <div class="row margin-top-xs">
+                        <div class="col-sm-9">
+                            <div> 出账类型：出账类型只是表示欠费催收功能，每月1日表示每月1日推送业主微信进行催收；</div>
+                            <div> 计费起始时间：只是表示这个费用项开始时间，和房屋上费用开始时间没有关系；</div>
+                            <div> 计费结束时间：只是表示这个费用项结束时间，和房屋上费用结束时间没有关系；</div>
+                            <div> 费用标识：分为周期费用和一次性费用，周期费是连续收费的费用比如物业费每年都会收取，所以物业费建议用周期费；</div>
+                            <div> 一次性费用表示费用只收取一次比如押金，下次收费时还需要手工创建到房屋上；</div>
+                            <div> 付费类型：分为预付费和后付费，预付费表示费用提前收费 后付费表示之后收取；</div>
+                        </div>
+                        <div class="col-sm-3 float-right">
+                            <vc:create path="frame/pagination"></vc:create>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/public/pages/property/feeReceipt/feeReceipt.html b/public/pages/property/feeReceipt/feeReceipt.html
index b8fa160ea..fdb415957 100755
--- a/public/pages/property/feeReceipt/feeReceipt.html
+++ b/public/pages/property/feeReceipt/feeReceipt.html
@@ -5,8 +5,7 @@
                 <div class="ibox-title">
                     <h5>查询条件</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()">
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;" v-on:click="_moreCondition()">
                             {{feeReceiptManageInfo.moreCondition == true ? '隐藏' : '更多'}}
                         </button>
                     </div>
@@ -22,13 +21,11 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" v-model="feeReceiptManageInfo.conditions.roomId"
-                                       class=" form-control" placeholder="请输入房屋或车位信息">
+                                <input type="text" v-model="feeReceiptManageInfo.conditions.roomId" class=" form-control" placeholder="请输入房屋或车位信息">
                             </div>
                         </div>
                         <div class="col-sm-3">
-                            <input type="text" v-model="feeReceiptManageInfo.conditions.receiptId" class=" form-control"
-                                   placeholder="请输入收据ID">
+                            <input type="text" v-model="feeReceiptManageInfo.conditions.receiptId" class=" form-control" placeholder="请输入收据ID">
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryFeeReceiptMethod()">
@@ -46,15 +43,12 @@
                     <div class="row" v-show="feeReceiptManageInfo.moreCondition == true">
                         <div class="col-sm-3">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择开始时间"
-                                       v-model="feeReceiptManageInfo.conditions.qstartTime"
-                                       class="form-control startTime">
+                                <input type="text" placeholder="请选择开始时间" v-model="feeReceiptManageInfo.conditions.qstartTime" class="form-control startTime">
                             </div>
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择结束时间"
-                                       v-model="feeReceiptManageInfo.conditions.qendTime" class="form-control endTime">
+                                <input type="text" placeholder="请选择结束时间" v-model="feeReceiptManageInfo.conditions.qendTime" class="form-control endTime">
                             </div>
                         </div>
                         <div class="col-sm-3">
@@ -91,45 +85,46 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">费用类型</th>
-                            <th class="text-center">费用项</th>
-                            <th class="text-center">房屋</th>
-                            <th class="text-center">车位</th>
-                            <th class="text-center">总金额(单位:元)</th>
-                            <th class="text-center">缴费时间</th>
-                            <th class="text-center">收据ID</th>
-                            <th class="text-center">操作</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">费用类型</th>
+                                <th class="text-center">费用项</th>
+                                <th class="text-center">房屋</th>
+                                <th class="text-center">业主</th>
+                                <th class="text-center">车位</th>
+                                <th class="text-center">总金额(单位:元)</th>
+                                <th class="text-center">缴费时间</th>
+                                <th class="text-center">收据ID</th>
+                                <th class="text-center">操作</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="feeReceipt in feeReceiptManageInfo.feeReceipts">
-                            <td class="text-center">{{feeReceipt.objType == '3333'? '房屋费':'车位费'}}</td>
-                            <td class="text-center">{{feeReceipt.feeName}}</td>
-                            <td class="text-center">{{feeReceipt.roomName}}</td>
-                            <td class="text-center">{{feeReceipt.carNum}}</td>
-                            <td class="text-center">{{feeReceipt.amount}}</td>
-                            <td class="text-center">{{feeReceipt.createTime}}</td>
-                            <td class="text-center">{{feeReceipt.receiptId}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_printFeeReceipt(feeReceipt)">补打收据
+                            <tr v-for="feeReceipt in feeReceiptManageInfo.feeReceipts">
+                                <td class="text-center">{{feeReceipt.objType == '3333'? '房屋费':'车位费'}}</td>
+                                <td class="text-center">{{feeReceipt.feeName}}</td>
+                                <td class="text-center">{{feeReceipt.roomName}}</td>
+                                <td class="text-center">{{feeReceipt.payObjName}}</td>
+                                <td class="text-center">{{feeReceipt.carNum}}</td>
+                                <td class="text-center">{{feeReceipt.amount}}</td>
+                                <td class="text-center">{{feeReceipt.createTime}}</td>
+                                <td class="text-center">{{feeReceipt.receiptId}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs" v-on:click="_printFeeReceipt(feeReceipt)">补打收据
                                     </button>
-                                </div>
-                                <!-- <div v-if="feeReceipt.objType == '6666'" class="btn-group">
+                                    </div>
+                                    <!-- <div v-if="feeReceipt.objType == '6666'" class="btn-group">
                                 <button class="btn-white btn btn-xs"
                                     v-on:click="_printFeeReceipt(feeReceipt)">补打收据(车)</button>
                             </div> -->
-                            </td>
-                        </tr>
+                                </td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
diff --git a/public/pages/property/listOweFee/listOweFee.html b/public/pages/property/listOweFee/listOweFee.html
index 0c5ab4c0a..3b335492c 100755
--- a/public/pages/property/listOweFee/listOweFee.html
+++ b/public/pages/property/listOweFee/listOweFee.html
@@ -11,11 +11,9 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择楼栋" v-model="listOweFeeInfo.conditions.floorName"
-                                       class=" form-control">
+                                <input type="text" placeholder="请选择楼栋" v-model="listOweFeeInfo.conditions.floorName" class=" form-control">
                                 <div class="input-group-prepend">
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                            v-on:click="_openChooseFloorMethod()">
+                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openChooseFloorMethod()">
                                         <i class="fa fa-search"></i> 选择
                                     </button>
                                 </div>
@@ -23,8 +21,7 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <select class="form-control-md form-control input-s-sm inline"
-                                        v-model="listOweFeeInfo.conditions.unitId">
+                                <select class="form-control-md form-control input-s-sm inline" v-model="listOweFeeInfo.conditions.unitId">
                                     <option selected value="">请选择单元</option>
                                     <option v-for="(unit,index) in listOweFeeInfo.roomUnits" :key="index"
                                             v-bind:value="unit.unitId">
@@ -35,15 +32,14 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写房屋编号" class="form-control form-control-md"
-                                       v-model="listOweFeeInfo.conditions.roomNum">
+                                <input type="text" placeholder="请填写房屋编号" class="form-control form-control-md" v-model="listOweFeeInfo.conditions.roomNum">
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOweFeeMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_resetOweFeeMethod()">
+                            <button type="button" class="btn btn-white btn-sm" v-on:click="_resetOweFeeMethod()">
                                 <i class="fa fa-repeat"></i> 重置
                             </button>
                         </div>
@@ -51,8 +47,7 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <select class="form-control-md form-control input-s-sm inline"
-                                        v-model="listOweFeeInfo.conditions.roomSubType">
+                                <select class="form-control-md form-control input-s-sm inline" v-model="listOweFeeInfo.conditions.roomSubType">
                                     <option selected value="">请选择房屋类型</option>
                                     <option value="110">
                                         住宅
@@ -68,8 +63,7 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写业主名称" class="form-control form-control-md"
-                                       v-model="listOweFeeInfo.conditions.ownerName">
+                                <input type="text" placeholder="请填写业主名称" class="form-control form-control-md" v-model="listOweFeeInfo.conditions.ownerName">
                             </div>
                         </div>
                         <div class="col-sm-3">
@@ -88,14 +82,12 @@
 
                         <div class="col-sm-4" v-if="listOweFeeInfo.conditions.payObjType == '3333'">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写房屋编号,如1-1-1123" class="form-control"
-                                       v-model="listOweFeeInfo.conditions.num">
+                                <input type="text" placeholder="请填写房屋编号,如1-1-1123" class="form-control" v-model="listOweFeeInfo.conditions.num">
                             </div>
                         </div>
                         <div class="col-sm-4" v-else-if="listOweFeeInfo.conditions.payObjType == '6666'">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写车位编号，如6-8" class="form-control "
-                                       v-model="listOweFeeInfo.conditions.num">
+                                <input type="text" placeholder="请填写车位编号，如6-8" class="form-control " v-model="listOweFeeInfo.conditions.num">
                             </div>
                         </div>
                         <div class="col-sm-3">
@@ -129,43 +121,42 @@
                     </div>
                 </div>
                 <div class="ibox-content">
-                    <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px"
-                           data-page-size="10">
+                    <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
                         <thead>
-                        <tr>
-                            <th class="text-center">序号</th>
-                            <th class="text-center">收费对象</th>
-                            <th class="text-center">业主名称</th>
-                            <th class="text-center">开始时间</th>
-                            <th class="text-center">结束时间</th>
-                            <!-- <th class="text-center">面积</th> -->
-                            <th class="text-center" v-for="(item,index) in listOweFeeInfo.feeConfigNames">
-                                {{item.configName}}
-                            </th>
-                            <th class="text-center">合计(单位:元)</th>
-                            <th class="text-center">更新时间</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">序号</th>
+                                <th class="text-center">收费对象</th>
+                                <th class="text-center">业主名称</th>
+                                <th class="text-center">开始时间</th>
+                                <th class="text-center">结束时间</th>
+                                <!-- <th class="text-center">面积</th> -->
+                                <th class="text-center" v-for="(item,index) in listOweFeeInfo.feeConfigNames">
+                                    {{item.configName}}
+                                </th>
+                                <th class="text-center">合计(单位:元)</th>
+                                <th class="text-center">更新时间</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="(fee,i) in listOweFeeInfo.fees">
-                            <td class="text-center">{{i+1}}</td>
-                            <td class="text-center">{{fee.payerObjName}}</td>
-                            <td class="text-center">{{fee.ownerName}}</td>
-                            <td class="text-center">{{fee.endTime}}</td>
-                            <td class="text-center">{{fee.deadlineTime}}</td>
-                            <td class="text-center" v-for="item in listOweFeeInfo.feeConfigNames">
-                                {{_getFeeOweAmount(item,fee)}}
-                            </td>
-                            <td class="text-center">{{_getAllFeeOweAmount(fee)}}</td>
-                            <td class="text-center">{{fee.updateTime}}</td>
-                        </tr>
+                            <tr v-for="(fee,i) in listOweFeeInfo.fees">
+                                <td class="text-center">{{i+1}}</td>
+                                <td class="text-center">{{fee.payerObjName}}</td>
+                                <td class="text-center">{{fee.ownerName}}</td>
+                                <td class="text-center">{{fee.endTime}}</td>
+                                <td class="text-center">{{fee.deadlineTime}}</td>
+                                <td class="text-center" v-for="item in listOweFeeInfo.feeConfigNames">
+                                    {{_getFeeOweAmount(item,fee)}}
+                                </td>
+                                <td class="text-center">{{_getAllFeeOweAmount(fee)}}</td>
+                                <td class="text-center">{{fee.updateTime}}</td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
diff --git a/public/pages/property/room/room.html b/public/pages/property/room/room.html
index 5269e687b..395df19a2 100755
--- a/public/pages/property/room/room.html
+++ b/public/pages/property/room/room.html
@@ -35,15 +35,18 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="col-sm-4">
+                        <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="请填写房屋编号" class="form-control form-control-sm" v-model="roomInfo.conditions.roomNum">
                             </div>
                         </div>
-                        <div class="col-sm-1">
+                        <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryRoomMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
+                            <button type="button" class="btn btn-white btn-sm" v-on:click="_resetRoomInfo()">
+                                重置
+                            </button>
                         </div>
                     </div>
 
@@ -61,9 +64,9 @@
                                 </option>
                             </select>
                         </div>
-                        <div class="col-sm-4">
+                        <div class="col-sm-3">
                             <select class="form-control-sm form-control input-s-sm inline" v-model="roomInfo.conditions.roomSubType">
-                                <option selected disabled value="">必填，请选择房屋类型</option>
+                                <option selected  value="">必填，请选择房屋类型</option>
                                 <option :value="item.statusCd" v-for="(item,index) in roomInfo.roomSubTypes">{{item.name}}</option>
                             </select>
                         </div>
@@ -98,7 +101,7 @@
                                 <th data-hide="phone" class="text-center">类型</th>
                                 <th data-hide="phone" class="text-center">建筑面积</th>
                                 <th data-hide="phone" class="text-center">室内面积</th>
-                                <th data-hide="phone" class="text-center">算费系数</th>
+                                <th data-hide="phone" class="text-center">租金</th>
                                 <th data-hide="phone" class="text-center">房屋状态</th>
                                 <th v-for="(item,index) in roomInfo.listColumns" class="text-center">{{item}}</th>
                                 <th class="text-center">操作</th>
@@ -131,7 +134,7 @@
                                     {{room.roomArea}}平方米
                                 </td>
                                 <td class="text-center">
-                                    {{room.feeCoefficient}}
+                                    {{room.roomRent}}
                                 </td>
                                 <td class="text-center">
                                     {{room.stateName}}
@@ -160,7 +163,17 @@
                         </tfoot>
                     </table>
                     <!-- 分页 -->
-                    <vc:create path="frame/pagination"></vc:create>
+                    <div class="row margin-top-xs">
+                        <div class="col-sm-9">
+                            <div> 房屋状态 分为：未销售，未入住，已交房，已装修，已入住 等状态 </div>
+                            <div>1、未销售表示 房屋和业主之间还没有任何关系，所以修改时状态不能手工修改 需要业主入住房屋的方式 将未销售改为已入住</div>
+                            <div>2、未入住 已交房 已装修 已入住 状态表示业主和房屋之间已经有关系 可以相互修改，主要作用为在房屋创建费用时根据不同的状态去创建不同的费用</div>
+                            <div> 租金：主要用于园区类或者房屋出租比较多的物业使用，小区物业忽略</div>
+                        </div>
+                        <div class="col-sm-3 float-right">
+                            <vc:create path="frame/pagination"></vc:create>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/public/pages/property/room/room.js b/public/pages/property/room/room.js
index 7084b0660..93eec9b95 100755
--- a/public/pages/property/room/room.js
+++ b/public/pages/property/room/room.js
@@ -240,6 +240,11 @@
             },
             _openImportRoomInfo: function() {
                 vc.emit('importOwnerRoom', 'openImportOwnerRoomModal', {})
+            },
+            _resetRoomInfo: function() {
+                vc.resetObject($that.roomInfo.conditions);
+                $that.roomInfo.conditions.roomType = '1010301';
+                vc.component.listRoom(DEFAULT_PAGE, DEFAULT_ROW);
             }
 
         }