diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
index 1b61d9ea1..755d573b3 100755
--- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html
+++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
@@ -41,8 +41,11 @@
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openProxyFeeModal()">
                 <span><vc:i18n name="代收费用" namespace="simplifyRoomFee"></vc:i18n></span>
             </button>
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openAddMeterWaterSimplifyModal()">
+            <!-- <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openAddMeterWaterSimplifyModal()">
                 <span><vc:i18n name="水电抄表" namespace="simplifyRoomFee"></vc:i18n></span>
+            </button> -->
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openRoomCreateFeeComboModal()">
+                <span><vc:i18n name="费用套餐" namespace="simplifyRoomFee"></vc:i18n></span>
             </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openRoomCreateFeeAddModal()">
                 <span><vc:i18n name="创建费用" namespace="simplifyRoomFee"></vc:i18n></span>
@@ -179,4 +182,4 @@
         </div>
     </div>
     <vc:create path="property/tempImportRoomFee"></vc:create>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.js b/public/components/property/simplifyRoomFee/simplifyRoomFee.js
index cf4c425be..e502af8da 100755
--- a/public/components/property/simplifyRoomFee/simplifyRoomFee.js
+++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.js
@@ -265,7 +265,13 @@
             },
             _openBatchPayRoomFeeModal: function() {
                 vc.jumpToPage('/#/pages/property/batchPayFeeOrder?ownerId=' + $that.simplifyRoomFeeInfo.ownerId + "&payerObjType=3333")
-            }
+            },
+            _openRoomCreateFeeComboModal: function() {
+                vc.jumpToPage('/#/pages/property/createFeeByCombo?payerObjId=' +
+                    $that.simplifyRoomFeeInfo.roomId +
+                    "&payerObjName=" + $that.simplifyRoomFeeInfo.roomName +
+                    "&payerObjType=3333")
+            },
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/pages/property/room/room.html b/public/pages/property/room/room.html
index beed9f5dd..3400ee823 100755
--- a/public/pages/property/room/room.html
+++ b/public/pages/property/room/room.html
@@ -24,8 +24,7 @@
                 <vc:i18n name="添加房屋" namespace="room"></vc:i18n>
             </span>
         </button>
-        <button type="button" class="btn btn-white btn-sm margin-left-sm"
-            v-on:click="_openImportRoomInfo()">
+        <button type="button" class="btn btn-white btn-sm margin-left-sm" v-on:click="_openImportRoomInfo()">
             <vc:i18n name="房产导入" namespace="room"></vc:i18n>
         </button>
     </div>
@@ -54,13 +53,11 @@
                             <div class="row">
                                 <div class="col-sm-4">
                                     <div class="form-group">
-                                        <input type="text" :placeholder="vc.i18n('请填写房屋编号  格式 楼栋-单元-房屋','room')"
-                                            class="form-control form-control-sm" v-model="roomInfo.conditions.roomId">
+                                        <input type="text" :placeholder="vc.i18n('请填写房屋编号  格式 楼栋-单元-房屋','room')" class="form-control form-control-sm" v-model="roomInfo.conditions.roomId">
                                     </div>
                                 </div>
                                 <div class="col-sm-3">
-                                    <select class="form-control-sm form-control input-s-sm inline"
-                                        v-model="roomInfo.conditions.state">
+                                    <select class="form-control-sm form-control input-s-sm inline" v-model="roomInfo.conditions.state">
                                         <option selected value="">{{vc.i18n('请选择状态','room')}}</option>
                                         <option v-for="(item,index) in roomInfo.states" :key="index"
                                             :value="item.statusCd">
@@ -69,16 +66,14 @@
                                     </select>
                                 </div>
                                 <div class="col-sm-3">
-                                    <select class="form-control-sm form-control input-s-sm inline"
-                                        v-model="roomInfo.conditions.roomSubType">
+                                    <select class="form-control-sm form-control input-s-sm inline" v-model="roomInfo.conditions.roomSubType">
                                         <option selected value="">{{vc.i18n('必填，请选择房屋类型','room')}}</option>
                                         <option :value="item.statusCd" v-for="(item,index) in roomInfo.roomSubTypes">
                                             {{item.name}}</option>
                                     </select>
                                 </div>
                                 <div class="col-sm-2">
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                        v-on:click="_queryRoomMethod()">
+                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryRoomMethod()">
                                         <i class="fa fa-search"></i> <span>
                                             <vc:i18n name="查询" namespace="room"></vc:i18n>
                                         </span>
@@ -115,8 +110,7 @@
                             </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><span><vc:i18n name="房屋" namespace="room"></vc:i18n></span>ID</th> -->
@@ -219,16 +213,20 @@
                                             {{item}}
                                         </td>
                                         <td class="text-center">
+                                            <!-- <div class="btn-group">
+                                                <button class="btn-white btn btn-xs" v-on:click="_openRoomCreateFeeComboModal(room)"><span>
+                                                        <vc:i18n name="费用套餐" namespace="room"></vc:i18n>
+                                                    </span>
+                                                </button>
+                                            </div> -->
                                             <div class="btn-group" v-if="vc.hasPrivilege('502020082493857941')">
-                                                <button class="btn-white btn btn-xs"
-                                                    v-on:click="_openEditRoomModel(room)"><span>
+                                                <button class="btn-white btn btn-xs" v-on:click="_openEditRoomModel(room)"><span>
                                                         <vc:i18n name="修改" namespace="room"></vc:i18n>
                                                     </span>
                                                 </button>
                                             </div>
                                             <div class="btn-group" v-if="vc.hasPrivilege('502020082417457942')">
-                                                <button class="btn-white btn btn-xs"
-                                                    v-on:click="_openDelRoomModel(room)"><span>
+                                                <button class="btn-white btn btn-xs" v-on:click="_openDelRoomModel(room)"><span>
                                                         <vc:i18n name="删除" namespace="room"></vc:i18n>
                                                     </span>
                                                 </button>
diff --git a/public/pages/property/room/room.js b/public/pages/property/room/room.js
index a8a2e5768..5effadf00 100755
--- a/public/pages/property/room/room.js
+++ b/public/pages/property/room/room.js
@@ -52,12 +52,12 @@
             vc.on('room', 'switchFloor', function(_param) {
                 vc.component.roomInfo.conditions.floorId = _param.floorId;
                 vc.component.roomInfo.conditions.unitId = '';
-                vc.component.listRoom(DEFAULT_PAGE,DEFAULT_ROW);
+                vc.component.listRoom(DEFAULT_PAGE, DEFAULT_ROW);
             });
             vc.on('room', 'switchUnit', function(_param) {
                 vc.component.roomInfo.conditions.floorId = '';
                 vc.component.roomInfo.conditions.unitId = _param.unitId;
-                vc.component.listRoom(DEFAULT_PAGE,DEFAULT_ROW);
+                vc.component.listRoom(DEFAULT_PAGE, DEFAULT_ROW);
             });
             vc.on('room', 'listRoom', function(_param) {
                 vc.component.listRoom($that.roomInfo.currentPage, DEFAULT_ROW);
@@ -118,7 +118,7 @@
             /**
              根据楼ID加载房屋
              **/
-            loadUnits: function(_unitId,callBack) {
+            loadUnits: function(_unitId, callBack) {
                 vc.component.addRoomUnits = [];
                 let param = {
                     params: {
@@ -160,11 +160,11 @@
                     return "未知";
                 }
             },
-            _loadFloor: function(_floorId,callBack) {
+            _loadFloor: function(_floorId, callBack) {
                 let param = {
                     params: {
-                        page:1,
-                        row:1,
+                        page: 1,
+                        row: 1,
                         communityId: vc.getCurrentCommunity().communityId,
                         floorId: _floorId
                     }
@@ -240,54 +240,61 @@
                 $that.roomInfo.conditions.roomType = '1010301';
                 vc.component.listRoom(DEFAULT_PAGE, DEFAULT_ROW);
             },
-            _openAddRoomFloorModal:function(){
+            _openAddRoomFloorModal: function() {
                 vc.emit('addFloor', 'openAddFloorModal', {});
             },
-            _openUpdateRoomFloorModal:function(){
-                if(!$that.roomInfo.conditions.floorId){
+            _openUpdateRoomFloorModal: function() {
+                if (!$that.roomInfo.conditions.floorId) {
                     vc.toast('请先选择楼栋');
-                    return ;
+                    return;
                 }
-                $that._loadFloor($that.roomInfo.conditions.floorId, function (_floor) {
+                $that._loadFloor($that.roomInfo.conditions.floorId, function(_floor) {
                     vc.emit('editFloor', 'openEditFloorModal', _floor);
                 })
             },
-            _openDeleteRoomFloorModal:function(){
-                if(!$that.roomInfo.conditions.floorId){
+            _openDeleteRoomFloorModal: function() {
+                if (!$that.roomInfo.conditions.floorId) {
                     vc.toast('请先选择楼栋');
-                    return ;
+                    return;
                 }
-                $that._loadFloor($that.roomInfo.conditions.floorId, function (_floor) {
+                $that._loadFloor($that.roomInfo.conditions.floorId, function(_floor) {
                     vc.emit('deleteFloor', 'openFloorModel', _floor);
                 })
             },
-            _openAddRoomUnitModal:function(){
-                if(!$that.roomInfo.conditions.floorId){
+            _openAddRoomUnitModal: function() {
+                if (!$that.roomInfo.conditions.floorId) {
                     vc.toast('请先选择楼栋');
-                    return ;
+                    return;
                 }
                 vc.emit('addUnit', 'addUnitModel', {
                     floorId: vc.component.roomInfo.conditions.floorId
                 });
             },
-            _openUpdateRoomUnitModal:function(){
-                if(!$that.roomInfo.conditions.unitId){
+            _openUpdateRoomUnitModal: function() {
+                if (!$that.roomInfo.conditions.unitId) {
                     vc.toast('请先选择单元');
-                    return ;
+                    return;
                 }
-                $that.loadUnits($that.roomInfo.conditions.unitId, function (_unit) {
+                $that.loadUnits($that.roomInfo.conditions.unitId, function(_unit) {
                     vc.emit('editUnit', 'openUnitModel', _unit);
                 })
             },
-            _openDeleteRoomUnitModal:function(){
-                if(!$that.roomInfo.conditions.unitId){
+            _openDeleteRoomUnitModal: function() {
+                if (!$that.roomInfo.conditions.unitId) {
                     vc.toast('请先选择单元');
-                    return ;
+                    return;
                 }
-                $that.loadUnits($that.roomInfo.conditions.unitId, function (_unit) {
+                $that.loadUnits($that.roomInfo.conditions.unitId, function(_unit) {
                     vc.emit('deleteUnit', 'openUnitModel', _unit);
                 })
-            }
+            },
+            _openRoomCreateFeeComboModal: function(_room) {
+                let _roomName = _room.floorNum + "-" + _room.unitNum + "-" + _room.roomNum;
+                vc.jumpToPage('/#/pages/property/createFeeByCombo?payerObjId=' +
+                    _room.roomId +
+                    "&payerObjName=" + _roomName +
+                    "&payerObjType=3333")
+            },
 
         }
     });