From b3df33972382f4a04d1b4c21dcff6e4fa85aa7dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 8 Sep 2020 09:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=84=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/property/addMeterWater/addMeterWater.html   | 2 +-
 public/components/property/addMeterWater/addMeterWater.js  | 7 +++++--
 public/pages/property/listRoomFee/listRoomFee.js           | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/components/property/addMeterWater/addMeterWater.html b/public/components/property/addMeterWater/addMeterWater.html
index f8c523404..66f99c096 100644
--- a/public/components/property/addMeterWater/addMeterWater.html
+++ b/public/components/property/addMeterWater/addMeterWater.html
@@ -54,7 +54,7 @@
               <div class="form-group row" v-show="addMeterWaterInfo.hasRoom == true">
                 <label class="col-sm-2 col-form-label">房屋</label>
                 <div class="col-sm-10">
-                  <input v-model="addMeterWaterInfo.objName" type="text" disabled="disabled" placeholder="必填，请填写房屋"
+                  <input v-model="addMeterWaterInfo.ownerName" type="text" disabled="disabled" placeholder="必填，请填写房屋"
                     class="form-control ">
                 </div>
               </div>
diff --git a/public/components/property/addMeterWater/addMeterWater.js b/public/components/property/addMeterWater/addMeterWater.js
index 056060c18..885617edb 100644
--- a/public/components/property/addMeterWater/addMeterWater.js
+++ b/public/components/property/addMeterWater/addMeterWater.js
@@ -21,7 +21,8 @@
                 feeConfigs: [],
                 configId: '',
                 objType: '1001',
-                hasRoom: false
+                hasRoom: false,
+                ownerName: ''
             }
         },
         _initMethod: function () {
@@ -34,6 +35,7 @@
                     $that.addMeterWaterInfo.roomId = _param.roomId;
                     $that.addMeterWaterInfo.objId = _param.roomId;
                     $that.addMeterWaterInfo.objName = _param.roomName;
+                    $that.addMeterWaterInfo.ownerName =_param.roomName +'('+_param.ownerName+')';
                     $that._queryPreMeterWater(_param.roomId);
                 }
                 $('#addMeterWaterModel').modal('show');
@@ -274,7 +276,8 @@
                     feeConfigs: [],
                     configId: '',
                     objType: '1001',
-                    hasRoom: false
+                    hasRoom: false,
+                    ownerName:''
 
                 };
             }
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index 47a10bc8d..92309ab2d 100644
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -111,6 +111,7 @@
                 vc.emit('addMeterWater', 'openAddMeterWaterModal', {
                     roomId:$that.listRoomCreateFeeInfo.roomId,
                     roomName:$that.listRoomCreateFeeInfo.roomName,
+                    ownerName:$that.listRoomCreateFeeInfo.ownerName
                     
                 });
             },