From 494f66686b9ee000e182f57d45b9de92d08d5027 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 21 Mar 2022 17:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E9=A1=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/pages/property/listOweFee/listOweFee.html | 10 +---------
 public/pages/property/listOweFee/listOweFee.js   |  7 ++++++-
 public/pages/property/room/room.js               |  7 ++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/public/pages/property/listOweFee/listOweFee.html b/public/pages/property/listOweFee/listOweFee.html
index 3b335492c..027914074 100755
--- a/public/pages/property/listOweFee/listOweFee.html
+++ b/public/pages/property/listOweFee/listOweFee.html
@@ -49,15 +49,7 @@
                             <div class="form-group input-group">
                                 <select class="form-control-md form-control input-s-sm inline" v-model="listOweFeeInfo.conditions.roomSubType">
                                     <option selected value="">请选择房屋类型</option>
-                                    <option value="110">
-                                        住宅
-                                    </option>
-                                    <option value="120">
-                                        办公室
-                                    </option>
-                                    <option value="119">
-                                        宿舍
-                                    </option>
+                                    <option :value="item.statusCd" v-for="(item,index) in listOweFeeInfo.roomSubTypes">{{item.name}}</option>
                                 </select>
                             </div>
                         </div>
diff --git a/public/pages/property/listOweFee/listOweFee.js b/public/pages/property/listOweFee/listOweFee.js
index 708ebc776..a8e7e7895 100755
--- a/public/pages/property/listOweFee/listOweFee.js
+++ b/public/pages/property/listOweFee/listOweFee.js
@@ -28,7 +28,8 @@
                 feeConfigs: [],
                 feeConfigNames: [],
                 floorId: '',
-                unitId: ''
+                unitId: '',
+                roomSubTypes: []
             }
         },
         watch: {
@@ -46,6 +47,10 @@
             vc.getDict('report_owe_fee', "payer_obj_type", function(_data) {
                 vc.component.listOweFeeInfo.payObjTypes = _data;
             });
+            //与字典表关联
+            vc.getDict('building_room', "room_sub_type", function(_data) {
+                vc.component.listOweFeeInfo.roomSubTypes = _data;
+            });
             vc.component._loadListOweFeeInfo(1, 10);
             $that._listFeeConfigs();
         },
diff --git a/public/pages/property/room/room.js b/public/pages/property/room/room.js
index 93eec9b95..23c9b0804 100755
--- a/public/pages/property/room/room.js
+++ b/public/pages/property/room/room.js
@@ -161,11 +161,8 @@
             _loadDataByParam: function() {
                 vc.component.roomInfo.conditions.floorId = vc.getParam("floorId");
                 vc.component.roomInfo.conditions.floorId = vc.getParam("floorName");
-                //如果 floodId 没有传 则，直接结束
-                /* if(!vc.notNull(vc.component.roomInfo.conditions.floorId)){
-                     return ;
-                 }*/
-                var param = {
+
+                let param = {
                     params: {
                         communityId: vc.getCurrentCommunity().communityId,
                         floorId: vc.component.roomInfo.conditions.floorId