diff --git a/public/components/property/importRoomFee/importRoomFee.html b/public/components/property/importRoomFee/importRoomFee.html
index a1eafbf64..604b53365 100644
--- a/public/components/property/importRoomFee/importRoomFee.html
+++ b/public/components/property/importRoomFee/importRoomFee.html
@@ -12,6 +12,7 @@
                                     <select class="custom-select" v-model="importRoomFeeInfo.feeTypeCd"
                                         @change="_changeFeeTypeCd(importRoomFeeInfo.feeTypeCd)">
                                         <option selected disabled value="">必填，请选择费用类型</option>
+                                        
                                         <option v-for="(item,index) in importRoomFeeInfo.feeTypeCds" :key="index"
                                             v-bind:value="item.statusCd" v-if="item.statusCd !='888800010008'">
                                             {{item.name}}
diff --git a/public/components/property/importRoomFee/importRoomFee.js b/public/components/property/importRoomFee/importRoomFee.js
index 66c5d5dd4..1a252a836 100644
--- a/public/components/property/importRoomFee/importRoomFee.js
+++ b/public/components/property/importRoomFee/importRoomFee.js
@@ -6,7 +6,7 @@
                 communityId: vc.getCurrentCommunity().communityId,
                 excelTemplate: '',
                 feeTypeCd: '',
-                feeConfigs: []
+                feeTypeCds: []
             }
         },
         _initMethod: function () {
@@ -89,6 +89,8 @@
                             vc.toast("处理成功");
                             $('#importRoomFeeModel').modal('hide');
                             //vc.jumpToPage('/admin.html#/pages/property/listOwner')
+
+                            vc.emit('roomFeeImport', 'listFee',{});
                             return;
                         }
                         vc.toast(json, 10000);
@@ -107,7 +109,7 @@
                     communityId: vc.getCurrentCommunity().communityId,
                     excelTemplate: '',
                     feeTypeCd: '',
-                    feeConfigs: []
+                    feeTypeCds: []
                 };
 
                 vc.component.importRoomFeeInfo.feeTypeCds = _feeTypeCds;
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js
index 47409e689..5ed02bde7 100644
--- a/public/pages/property/roomCreateFee/roomCreateFee.js
+++ b/public/pages/property/roomCreateFee/roomCreateFee.js
@@ -171,9 +171,7 @@
                 let roomName = _room.floorNum + "栋"+_room.unitNum+"单元"+_room.roomNum+"室"
                 vc.jumpToPage('/admin.html#/pages/property/owePayFeeOrder?payObjId='+_room.roomId+"&payObjType=3333&roomName="+roomName);
             },
-            _openRoomFeeImport:function(){
-                vc.emit('importRoomFee','openImportRoomFeeModal',{});
-            }
+           
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/pages/property/roomFeeImport/roomFeeImport.html b/public/pages/property/roomFeeImport/roomFeeImport.html
index 89afd0cc5..ecaf9b5bc 100644
--- a/public/pages/property/roomFeeImport/roomFeeImport.html
+++ b/public/pages/property/roomFeeImport/roomFeeImport.html
@@ -5,9 +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()">{{roomFeeImport.moreCondition == true?'隐藏':'更多'}}
-                        </button>
+
                     </div>
                 </div>
                 <div class="ibox-content">
@@ -19,11 +17,13 @@
                             </div>
                         </div>
                         <div class="col-sm-4">
-                            <select class="custom-select" v-model="roomFeeImport.conditions.curBill">
-                                <option selected value="">请选择账单类型</option>
-                                <option value="T">当期账单</option>
-                                <option value="F">往期账单</option>
+                            <select class="custom-select" v-model="roomFeeImport.conditions.feeTypeCd">
+                                <option selected disabled value="">必填，请选择费用类型</option>
 
+                                <option v-for="(item,index) in roomFeeImport.feeTypeCds" :key="index"
+                                    v-bind:value="item.statusCd" v-if="item.statusCd !='888800010008'">
+                                    {{item.name}}
+                                </option>
                             </select></div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryImportFeeMethod()">
@@ -31,14 +31,7 @@
                             </button>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col-sm-4" v-if="roomFeeImport.moreCondition == true">
-                            <div class="form-group">
-                                <input type="text" placeholder="请输入信息ID" v-model="roomFeeImport.conditions.activitiesId"
-                                    class=" form-control">
-                            </div>
-                        </div>
-                    </div>
+
 
 
                 </div>
@@ -74,7 +67,7 @@
                         <tbody>
                             <tr v-for="fee in roomFeeImport.improtFees">
                                 <td class="text-center">{{fee.importFeeId}}</td>
-                                <td class="text-center">{{fee.feeTypeCd}}</td>
+                                <td class="text-center">{{fee.feeTypeCdName}}</td>
                                 <td class="text-center">{{fee.createTime}}</td>
                                 <td class="text-right">
                                     <div class="btn-group">
diff --git a/public/pages/property/roomFeeImport/roomFeeImport.js b/public/pages/property/roomFeeImport/roomFeeImport.js
index 6b297015b..b80436efc 100644
--- a/public/pages/property/roomFeeImport/roomFeeImport.js
+++ b/public/pages/property/roomFeeImport/roomFeeImport.js
@@ -8,18 +8,22 @@
         data: {
             roomFeeImport: {
                 improtFees: [],
+                feeTypeCds: [],
                 total: 0,
                 records: 1,
                 moreCondition: false,
                 title: '',
                 conditions: {
                     importFeeId: '',
-
+                    feeTypeCd: ''
                 }
             }
         },
         _initMethod: function () {
-           $that._listFees(DEFAULT_PAGE,DEFAULT_ROWS);
+            vc.getDict('pay_fee_config', "fee_type_cd", function (_data) {
+                vc.component.roomFeeImport.feeTypeCds = _data;
+            });
+            $that._listImportFees(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent: function () {
 
@@ -57,14 +61,17 @@
                     }
                 );
             },
-            _openImportFeeDetail: function (_bill) {
-                vc.jumpToPage('/admin.html#/pages/property/billOweManage?'+vc.objToGetParam(_bill));
+            _openImportFeeDetail: function (_fee) {
+                vc.jumpToPage('/admin.html#/pages/property/roomFeeImportDetail?importFeeId=' + _fee.importFeeId);
 
             },
             _queryImportFeeMethod: function () {
                 vc.component._listImportFees(DEFAULT_PAGE, DEFAULT_ROWS);
 
             },
+            _openRoomFeeImport: function () {
+                vc.emit('importRoomFee', 'openImportRoomFeeModal', {});
+            },
             _moreCondition: function () {
                 if (vc.component.roomFeeImport.moreCondition) {
                     vc.component.roomFeeImport.moreCondition = false;
diff --git a/public/pages/property/roomFeeImportDetail/roomFeeImportDetail.html b/public/pages/property/roomFeeImportDetail/roomFeeImportDetail.html
new file mode 100644
index 000000000..74b47e2e5
--- /dev/null
+++ b/public/pages/property/roomFeeImportDetail/roomFeeImportDetail.html
@@ -0,0 +1,110 @@
+<div class=" animated fadeInRight ecommerce">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox ">
+                <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()">{{roomFeeImportDetailInfo.moreCondition == true?'隐藏':'更多'}}
+                        </button>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入楼栋编号"
+                                    v-model="roomFeeImportDetailInfo.conditions.floorNum" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入单元编号"
+                                    v-model="roomFeeImportDetailInfo.conditions.unitNum" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入房屋编号"
+                                    v-model="roomFeeImportDetailInfo.conditions.roomNum" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryFeeDetailMethod()">
+                                <i class="fa fa-search"></i> 查询
+                            </button>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <!-- <div class="col-sm-4" v-if="roomFeeImportDetailInfo.moreCondition == true">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入信息ID"
+                                    v-model="roomFeeImportDetailInfo.conditions.activitiesId" class=" form-control">
+                            </div>
+                        </div> -->
+                    </div>
+
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>导入费用详情</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
+                            返回
+                        </button>
+
+                    </div>
+                </div>
+                <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">总金额</th>
+                                <th class="text-center">状态</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-for="detail in roomFeeImportDetailInfo.importFeeDetails">
+                                <td class="text-center">{{detail.floorNum}}</td>
+                                <td class="text-center">{{detail.unitNum}}</td>
+                                <td class="text-center">{{detail.roomNum}}</td>
+                                <td class="text-center">{{detail.feeName}}</td>
+                                <td class="text-center">{{detail.startTime}}</td>
+                                <td class="text-center">{{detail.endTime}}</td>
+                                <td class="text-center">{{detail.amount}}</td>
+                                <td class="text-center">
+                                    <span class="badge badge-success" v-if="detail.state == '1000'">导入成功</span>
+                                    <span class="badge badge-danger" v-else>导入失败</span>
+                                </td>
+                            </tr>
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
+                        </tfoot>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create path="frame/pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/public/pages/property/roomFeeImportDetail/roomFeeImportDetail.js b/public/pages/property/roomFeeImportDetail/roomFeeImportDetail.js
new file mode 100644
index 000000000..3a70cde18
--- /dev/null
+++ b/public/pages/property/roomFeeImportDetail/roomFeeImportDetail.js
@@ -0,0 +1,81 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data: {
+            roomFeeImportDetailInfo: {
+                importFeeDetails: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                conditions: {
+                    floorNum: '',
+                    unitNum: '',
+                    roomNum: '',
+                    importFeeId:''
+
+                }
+            }
+        },
+        _initMethod: function () {
+            $that.roomFeeImportDetailInfo.conditions.importFeeId = vc.getParam('importFeeId');
+            $that._listImportFeeDetails(DEFAULT_PAGE, DEFAULT_ROWS);
+        },
+        _initEvent: function () {
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listImportFeeDetails(_currentPage, DEFAULT_ROWS);
+            });
+        },
+        methods: {
+            _listImportFeeDetails: function (_page, _rows) {
+
+                vc.component.roomFeeImportDetailInfo.conditions.page = _page;
+                vc.component.roomFeeImportDetailInfo.conditions.row = _rows;
+                vc.component.roomFeeImportDetailInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
+                var param = {
+                    params: vc.component.roomFeeImportDetailInfo.conditions
+                };
+
+                //发送get请求
+                vc.http.apiGet('/importFee/queryImportFeeDetail',
+                    param,
+                    function (json, res) {
+                        var _roomFeeImportDetailInfo = JSON.parse(json);
+                        vc.component.roomFeeImportDetailInfo.total = _roomFeeImportDetailInfo.total;
+                        vc.component.roomFeeImportDetailInfo.records = _roomFeeImportDetailInfo.records;
+                        vc.component.roomFeeImportDetailInfo.importFeeDetails = _roomFeeImportDetailInfo.data;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.roomFeeImportDetailInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _openBillDetail: function () {
+
+
+            },
+            _queryFeeDetailMethod: function () {
+                vc.component._listImportFeeDetails(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            },
+            _moreCondition: function () {
+                if (vc.component.roomFeeImportDetailInfo.moreCondition) {
+                    vc.component.roomFeeImportDetailInfo.moreCondition = false;
+                } else {
+                    vc.component.roomFeeImportDetailInfo.moreCondition = true;
+                }
+            },
+            _goBack:function(){
+                vc.goBack();
+            }
+
+
+        }
+    });
+})(window.vc);