diff --git a/public/components/property/addFeeConfig/addFeeConfig.html b/public/components/property/addFeeConfig/addFeeConfig.html
index 0c9577133..9119efc6e 100644
--- a/public/components/property/addFeeConfig/addFeeConfig.html
+++ b/public/components/property/addFeeConfig/addFeeConfig.html
@@ -13,7 +13,9 @@
                                     <select class="custom-select" v-model="addFeeConfigInfo.feeTypeCd">
                                         <option selected disabled value="">必填，请选择费用类型</option>
                                         <option v-for="(item,index) in addFeeConfigInfo.feeTypeCds" :key="index"
-                                                v-bind:value="item.statusCd">{{item.name}}
+                                                v-bind:value="item.statusCd"
+                                                v-if="item.statusCd != '888800010007'"
+                                                >{{item.name}}
                                         </option>
                                     </select></div>
                             </div>
diff --git a/public/components/property/hireParkingSpaceFee/hireParkingSpaceFee.js b/public/components/property/hireParkingSpaceFee/hireParkingSpaceFee.js
index 7149538b1..793419421 100644
--- a/public/components/property/hireParkingSpaceFee/hireParkingSpaceFee.js
+++ b/public/components/property/hireParkingSpaceFee/hireParkingSpaceFee.js
@@ -93,7 +93,7 @@
                         communityId: vc.getCurrentCommunity().communityId,
                         typeCd: vc.component.hireParkingSpaceFeeInfo.typeCd,
                         page: 1,
-                        row: 1
+                        row: 50
                     }
                 };
                 vc.http.get(
diff --git a/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.html b/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.html
index 79cffb881..80c03b787 100644
--- a/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.html
+++ b/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.html
@@ -54,7 +54,7 @@
                                     </select></div>
                             </div>
                         
-                            <div class="form-group row" >
+                            <!-- <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="parkingSpaceCreateFeeAddInfo.parkingSpaceState">
@@ -64,7 +64,7 @@
                                         <option  value="F">空闲</option>
                                     </select>
                                 </div>
-                            </div>
+                            </div> -->
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
                                         v-on:click="saveParkingSpaceCreateFeeInfo()"><i class="fa fa-check"></i>&nbsp;提交
diff --git a/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js b/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js
index cb8f18bca..4cab0e32d 100644
--- a/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js
+++ b/public/components/property/parkingSpaceCreateFeeAdd/parkingSpaceCreateFeeAdd.js
@@ -11,7 +11,7 @@
                 psId: '',
                 feeTypeCd:'',
                 configId:'',
-                parkingSpaceState:'',
+                parkingSpaceState:'SH',
                 isMore:false,
                 locationTypeCdName:'',
             }
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
index 77e6ed79c..7cd8cda66 100644
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
@@ -77,7 +77,7 @@
                                     </select></div>
                             </div>
                         
-                            <div class="form-group row" >
+                            <!-- <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="roomCreateFeeAddInfo.roomState">
@@ -86,7 +86,7 @@
                                         <option  value="0000">全部房屋</option>
                                     </select>
                                 </div>
-                            </div>
+                            </div> -->
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
                                         v-on:click="saveRoomCreateFeeInfo()"><i class="fa fa-check"></i>&nbsp;提交
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
index 4b3e8d080..1ca9cbb62 100644
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -15,7 +15,7 @@
                 roomId: '',
                 feeTypeCd:'',
                 configId:'',
-                roomState:'',
+                roomState:'2001',
                 isMore:false,
                 locationTypeCdName:'',
             }
diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index e52e07dac..634a76f26 100644
--- a/public/pages/property/listRoomFee/listRoomFee.html
+++ b/public/pages/property/listRoomFee/listRoomFee.html
@@ -1,55 +1,55 @@
-<div >
+<div>
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>{{listRoomCreateFeeInfo.roomName}}费用</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <!--                        <button type="button" class="btn btn-primary btn-sm"-->
-                        <!--                                style="margin-left:10px" v-on:click="_openRoomCreateFeeAddModal(null,true)">-->
-                        <!--                            <i class="fa fa-plus"></i> 批量创建-->
-                        <!--                        </button>-->
+                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                            v-on:click="_goBack()">
+                            返回
+                        </button>
 
                     </div>
                 </div>
                 <div class="ibox-content">
 
                     <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px"
-                           data-page-size="10">
+                        data-page-size="10">
 
                         <thead>
-                        <tr>
-                            <th class="text-center">费用项ID</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>
+                            <tr>
+                                <th class="text-center">费用项ID</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 listRoomCreateFeeInfo.fees">
-                            <td class="text-center">{{fee.feeId}}</td>
-                            <td class="text-center">{{fee.feeFlagName}}</td>
-                            <td class="text-center">{{fee.feeTypeCdName}}</td>
-                            <td class="text-center">{{fee.feeName}}</td>
-                            <td class="text-center">{{fee.startTime}}</td>
-                            <td class="text-center">{{fee.endTime}}</td>
-                            <td class="text-center">{{fee.stateName}}</td>
-                            <td class="text-right">
-                                <button class="btn btn-link btn-xs" v-if=" fee.state != '2009001'"  
+                            <tr v-for="fee in listRoomCreateFeeInfo.fees">
+                                <td class="text-center">{{fee.feeId}}</td>
+                                <td class="text-center">{{fee.feeFlagName}}</td>
+                                <td class="text-center">{{fee.feeTypeCdName}}</td>
+                                <td class="text-center">{{fee.feeName}}</td>
+                                <td class="text-center">{{fee.startTime}}</td>
+                                <td class="text-center">{{fee.endTime}}</td>
+                                <td class="text-center">{{fee.stateName}}</td>
+                                <td class="text-right">
+                                    <button class="btn btn-link btn-xs" v-if=" fee.state != '2009001'"
                                         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="fee.isDefault == 'F' && fee.state != '2009001'" 
+                                    </button>
+                                    <button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史
+                                    </button>
+                                    <button class="btn btn-link btn-xs"
+                                        v-if="fee.isDefault == 'F' && fee.state != '2009001'"
                                         v-on:click="_deleteFee(fee)">取消费用
-                                </button>
-                            </td>
-                        </tr>
+                                    </button>
+                                </td>
+                            </tr>
                         </tbody>
                     </table>
                     <!-- 分页 -->
@@ -60,4 +60,4 @@
         </div>
     </div>
     <vc:create path="property/deleteFee"></vc:create>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index 9d8e25589..204938d1b 100644
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -78,6 +78,9 @@
             },
             _refreshListRoomCreateFeeInfo:function(){
                 vc.component.listRoomCreateFeeInfo._currentFeeConfigName = "";
+            },
+            _goBack:function(){
+                vc.goBack();
             }
         }
 
diff --git a/public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.html b/public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.html
index a82219d49..94c6c496d 100644
--- a/public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.html
+++ b/public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.html
@@ -109,7 +109,7 @@
                                 {{parkingSpace.psId}}
                             </td>
                             <td class="text-right">
-                                <div class="btn-group">
+                                <div class="btn-group" v-if="parkingSpace.state != 'F'">
                                     <button class="btn-white btn btn-xs" v-on:click="_openParkingSpaceCreateFeeAddModal(parkingSpace,false)">创建收费
                                     </button>
                                 </div>
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html
index a5ce1a416..acd447040 100644
--- a/public/pages/property/roomCreateFee/roomCreateFee.html
+++ b/public/pages/property/roomCreateFee/roomCreateFee.html
@@ -133,7 +133,7 @@
                                 {{room.ownerId}}
                             </td> -->
                             <td class="text-right">
-                                <div class="btn-group">
+                                <div class="btn-group" v-if="room.state == '2001'">
                                     <button class="btn-white btn btn-xs" v-on:click="_openRoomCreateFeeAddModal(room,false)">创建收费
                                     </button>
                                 </div>