diff --git a/public/components/admin/addRentingPool/addRentingPool.html b/public/components/admin/addRentingPool/addRentingPool.html
index 875fb9a5d..67b80c3d6 100644
--- a/public/components/admin/addRentingPool/addRentingPool.html
+++ b/public/components/admin/addRentingPool/addRentingPool.html
@@ -33,7 +33,7 @@
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label">入住时间</label>
                 <div class="col-sm-10">
-                  <input v-model="addRentingPoolInfo.checkInDate" type="text" placeholder="必填，请填写入住时间"
+                  <input v-model="addRentingPoolInfo.checkIn" type="text" placeholder="必填，请填写入住时间"
                     class="form-control">
                 </div>
               </div>
diff --git a/public/components/admin/editRentingPool/editRentingPool.html b/public/components/admin/editRentingPool/editRentingPool.html
index f2833f0c0..c9e6df02d 100644
--- a/public/components/admin/editRentingPool/editRentingPool.html
+++ b/public/components/admin/editRentingPool/editRentingPool.html
@@ -1,75 +1,85 @@
-<div id = "editRentingPoolModel" 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>
-                <div class="ibox-content">
-                    <div>
-                        <div>
-                            <div class="form-group row">
-         <label class="col-sm-2 col-form-label">出租标题</label>
-         <div class="col-sm-10">
-           <input v-model="editRentingPoolInfo.rentingTitle"                   type="text" placeholder="必填，请填写出租标题" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">租金</label>
-         <div class="col-sm-10">
-           <input v-model="editRentingPoolInfo.price"                   type="text" placeholder="必填，请填写租金" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">预付类型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editRentingPoolInfo.paymentType">
-         <option selected  disabled value="">必填，请选择预付类型</option>
-         <option  value="1001">押一付一</option>
-<option  value="2002">押一付三</option>
-<option  value="3003">押一付六</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">入住时间</label>
-         <div class="col-sm-10">
-           <input v-model="editRentingPoolInfo.checkInDate"                   type="text" placeholder="必填，请填写入住时间" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">出租配置</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editRentingPoolInfo.rentingConfigId">
-         <option selected  disabled value="">必填，请选择出租配置</option>
-         <option  value="1001">出租配置</option>
-<option  value="2002">每月租金比例</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">备注</label>
-         <div class="col-sm-10">
-           <input v-model="editRentingPoolInfo.rentingDesc"                   type="text" placeholder="选填，请填写备注" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">业主名称</label>
-         <div class="col-sm-10">
-           <input v-model="editRentingPoolInfo.ownerName"                   type="text" placeholder="必填，请填写业主名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">业主电话</label>
-         <div class="col-sm-10">
-           <input v-model="editRentingPoolInfo.ownerTel"                   type="text" placeholder="必填，请填写业主电话" class="form-control">
-         </div>
-</div>
-
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editRentingPool()" ><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>
-                            </div>
-                        </div>
-                    </div>
+<div id="editRentingPoolModel" 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>
+        <div class="ibox-content">
+          <div>
+            <div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">出租标题</label>
+                <div class="col-sm-10">
+                  <input v-model="editRentingPoolInfo.rentingTitle" type="text" placeholder="必填，请填写出租标题"
+                    class="form-control">
                 </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">租金</label>
+                <div class="col-sm-10">
+                  <input v-model="editRentingPoolInfo.price" type="text" placeholder="必填，请填写租金" class="form-control">
+                </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">预付类型</label>
+                <div class="col-sm-10">
+                  <select class="custom-select" v-model="editRentingPoolInfo.paymentType">
+                    <option selected disabled value="">必填，请选择预付类型</option>
+                    <option value="1001">押一付一</option>
+                    <option value="2002">押一付三</option>
+                    <option value="3003">押一付六</option>
+                  </select> </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">入住时间</label>
+                <div class="col-sm-10">
+                  <select class="custom-select" v-model="editRentingPoolInfo.checkIn">
+                    <option selected disabled value="">必填，请选择入住时间</option>
+                    <option value="1001">立即入住</option>
+                    <option value="2002">入住预约</option>
+                  </select>
+                </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">出租配置</label>
+                <div class="col-sm-10">
+                  <select class="custom-select" v-model="editRentingPoolInfo.rentingConfigId">
+                    <option selected disabled value="">必填，请选择出租配置</option>
+                    <option v-for="(item,index) in editRentingPoolInfo.rentingConfigs" :value="item.rentingConfigId">{{item.rentingFormulaName}}</option> 
+                  </select> </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">备注</label>
+                <div class="col-sm-10">
+                  <input v-model="editRentingPoolInfo.rentingDesc" type="text" placeholder="选填，请填写备注"
+                    class="form-control">
+                </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">业主名称</label>
+                <div class="col-sm-10">
+                  <input v-model="editRentingPoolInfo.ownerName" type="text" placeholder="必填，请填写业主名称"
+                    class="form-control">
+                </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">业主电话</label>
+                <div class="col-sm-10">
+                  <input v-model="editRentingPoolInfo.ownerTel" type="text" placeholder="必填，请填写业主电话"
+                    class="form-control">
+                </div>
+              </div>
+
+              <div class="ibox-content">
+                <button class="btn btn-primary float-right" type="button" v-on:click="editRentingPool()"><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>
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
-</div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/public/components/admin/editRentingPool/editRentingPool.js b/public/components/admin/editRentingPool/editRentingPool.js
index dede10e3e..2e7eae251 100644
--- a/public/components/admin/editRentingPool/editRentingPool.js
+++ b/public/components/admin/editRentingPool/editRentingPool.js
@@ -3,16 +3,17 @@
     vc.extends({
         data: {
             editRentingPoolInfo: {
+                roomId:'',
                 rentingId: '',
                 rentingTitle: '',
                 price: '',
                 paymentType: '',
-                checkInDate: '',
+                checkIn: '',
                 rentingConfigId: '',
                 rentingDesc: '',
                 ownerName: '',
                 ownerTel: '',
-
+                rentingConfigs: [],
             }
         },
         _initMethod: function () {
@@ -21,12 +22,33 @@
         _initEvent: function () {
             vc.on('editRentingPool', 'openEditRentingPoolModal', function (_params) {
                 vc.component.refreshEditRentingPoolInfo();
+                $that._listEditRentingConfigs();
                 $('#editRentingPoolModel').modal('show');
                 vc.copyObject(_params, vc.component.editRentingPoolInfo);
                 vc.component.editRentingPoolInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
         methods: {
+            _listEditRentingConfigs: function (_page, _rows) {
+                var param = {
+                    params: {
+                        page: 1,
+                        row: 30
+                    }
+                };
+
+                //发送get请求
+                vc.http.apiGet('/renting/queryRentingConfig',
+                    param,
+                    function (json, res) {
+                        var _rentingConfigManageInfo = JSON.parse(json);
+                        vc.component.editRentingPoolInfo.rentingConfigs = _rentingConfigManageInfo.data;
+
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
             editRentingPoolValidate: function () {
                 return vc.validate.validate({
                     editRentingPoolInfo: vc.component.editRentingPoolInfo
@@ -67,17 +89,12 @@
                             errInfo: "格式错误"
                         },
                     ],
-                    'editRentingPoolInfo.checkInDate': [
+                    'editRentingPoolInfo.checkIn': [
                         {
                             limit: "required",
                             param: "",
                             errInfo: "入住时间不能为空"
-                        },
-                        {
-                            limit: "date",
-                            param: "",
-                            errInfo: "格式错误"
-                        },
+                        }
                     ],
                     'editRentingPoolInfo.rentingConfigId': [
                         {
@@ -166,12 +183,13 @@
                     rentingTitle: '',
                     price: '',
                     paymentType: '',
-                    checkInDate: '',
+                    checkIn: '',
                     rentingConfigId: '',
                     rentingDesc: '',
                     ownerName: '',
                     ownerTel: '',
-
+                    rentingConfigs: [],
+                    roomId:'',
                 }
             }
         }
diff --git a/public/pages/admin/rentingAuditManage/rentingAuditManage.html b/public/pages/admin/rentingAuditManage/rentingAuditManage.html
index cd45ad8a0..10be9e57b 100644
--- a/public/pages/admin/rentingAuditManage/rentingAuditManage.html
+++ b/public/pages/admin/rentingAuditManage/rentingAuditManage.html
@@ -44,7 +44,7 @@
                                     </div>
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteRentingPoolModel(rentingPool)">修改</button>
+                                            v-on:click="_openEditRentingPoolModel(rentingPool)">修改</button>
                                     </div>
                                     <div class="btn-group" >
                                         <button class="btn-white btn btn-xs"
@@ -69,6 +69,5 @@
         </div>
     </div>
     <vc:create path="admin/editRentingPool"></vc:create>
-    <vc:create path="admin/deleteRentingPool"></vc:create>
     <vc:create path="common/audit" callBackListener = "rentingAuditManage" callBackFunction="audit"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
index 78667a0db..ecf08c2a9 100644
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
@@ -112,11 +112,11 @@
                                 <label class="">{{simplifyAcceptanceInfo.age}}</label>
                             </div>
                         </div>
-                        <div class="col-sm-3">
-
-                        </div>
-                        <div class="col-sm-3">
-
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label class="col-form-label">车辆车位：</label>
+                                <label class="">{{simplifyAcceptanceInfo.age}}</label>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -124,6 +124,106 @@
         </div>
 
 
+        <div class="row margin-top">
+            <div class="col-lg-1 ibox-title">
+                <h5>房屋费用</h5>
+            </div>
+            <div class="col-lg-11 text-right">
+                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                    v-on:click="_openProxyFeeModal()">
+                    代收费用
+                </button>
+                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                    v-on:click="_openAddMeterWaterModal()">
+                    水电抄表
+                </button>
+                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                    v-on:click="_openRoomCreateFeeAddModal()">
+                    创建费用
+                </button>
+                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                    v-on:click="_toOwnerPayFee()">
+                    欠费缴费
+                </button>
+            </div>
+        </div>
+        <div class="vc-line margin-top-xs"></div>
+        <div>
+            <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">计费结束时间</th>
+                        <th class="text-center">说明</th>
+                        <th class="text-center">状态</th>
+                        <th class="text-right">操作</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="fee in simplifyAcceptanceInfo.fees">
+                        <!-- <td class="text-center">{{fee.feeId}}</td> -->
+                        <td class="text-center">{{fee.feeName}}</td>
+                        <td class="text-center">{{fee.feeFlagName}}</td>
+                        <td class="text-center">{{fee.feeTypeCdName}}</td>
+                        <td class="text-center">{{fee.amountOwed}}</td>
+                        <td class="text-center">{{fee.startTime}}</td>
+                        <td class="text-center">{{_getEndTime(fee)}}</td>
+                        <td class="text-center">{{_getDeadlineTime(fee)}}</td>
+                        <td class="text-center" v-if="fee.computingFormula == '5005'">
+                            <div>上期度数：{{fee.preDegrees}}</div>
+                            <div>本期度数：{{fee.curDegrees}} </div>
+                            <div>单价：{{fee.squarePrice}} </div>
+                            <div>附加费：{{fee.additionalAmount}}</div>
+                        </td>
+                        <td class="text-center" v-else-if="fee.computingFormula == '6006'">
+                            <div>用量：{{_getAttrValue(fee.feeAttrs,'390006')}}</div>
+                            <div>单价：{{fee.squarePrice}} </div>
+                            <div>附加费：{{fee.additionalAmount}}</div>
+                        </td>
+                        <td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
+                            <div>算法：{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
+                            <div>用量：{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
+                        </td>
+                        <td class="text-center" v-else>
+                            <div>面积：{{listRoomCreateFeeInfo.builtUpArea}}</div>
+                            <div>单价：{{fee.squarePrice}}</div>
+                            <div v-if="fee.feeFlag == '1003006'">附加费：{{fee.additionalAmount}}</div>
+                            <div v-else>固定费：{{fee.additionalAmount}}</div>
+                        </td>
+                        <td class="text-center">{{fee.stateName}}</td>
+                        <td class="text-right">
+
+                            <button class="btn btn-link btn-xs"
+                                v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')"
+                                v-on:click="_payFee(fee)">缴费
+                            </button>
+                            <button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史
+                            </button>
+                            <button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')"
+                                v-on:click="_deleteFee(fee)">取消费用
+                            </button>
+                            <button class="btn btn-link btn-xs"
+                                v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
+                                v-on:click="_editFee(fee)">费用变更
+                            </button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <div class="row">
+                <div class="col-sm-5">
+                    <span> 注意： 计费结束时间 “-” 表示未到计费时间 或 收费已结束</span>
+                </div>
+                <div class="col-sm-7 float-right">
+                    <vc:create path="frame/pagination"></vc:create>
+                </div>
+            </div>
+        </div>
     </div>
 
 </div>
\ No newline at end of file