From c3fd59c5e32704e5c55180966f2d52c108f70f33 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 7 Sep 2020 21:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addMeterWater/addMeterWater.html  | 13 ++++++++++---
 .../property/addMeterWater/addMeterWater.js    | 18 ++++++++++++++----
 .../property/listRoomFee/listRoomFee.html      |  7 +++++++
 .../pages/property/listRoomFee/listRoomFee.js  |  7 +++++++
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/components/property/addMeterWater/addMeterWater.html b/public/components/property/addMeterWater/addMeterWater.html
index 94d40c29d..f8c523404 100644
--- a/public/components/property/addMeterWater/addMeterWater.html
+++ b/public/components/property/addMeterWater/addMeterWater.html
@@ -28,14 +28,14 @@
                   </select>
                 </div>
               </div>
-              <div class="form-group row">
+              <div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
                 <label class="col-sm-2 col-form-label">楼栋</label>
                 <div class="col-sm-10">
                   <vc:create path="property/floorSelect2" parentModal="addMeterWaterModel" namespace="addMeterWater">
                   </vc:create>
                 </div>
               </div>
-              <div class="form-group row">
+              <div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
                 <label class="col-sm-2 col-form-label">单元</label>
                 <div class="col-sm-10">
                   <vc:create path="property/unitSelect2" parentModal="addMeterWaterModel"
@@ -43,7 +43,7 @@
                   </vc:create>
                 </div>
               </div>
-              <div class="form-group row">
+              <div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
                 <label class="col-sm-2 col-form-label">房屋</label>
                 <div class="col-sm-10">
                   <vc:create path="property/roomSelect2" parentModal="addMeterWaterModel"
@@ -51,6 +51,13 @@
                   </vc:create>
                 </div>
               </div>
+              <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="必填，请填写房屋"
+                    class="form-control ">
+                </div>
+              </div>
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label">上期度数</label>
                 <div class="col-sm-10">
diff --git a/public/components/property/addMeterWater/addMeterWater.js b/public/components/property/addMeterWater/addMeterWater.js
index e9855e3c8..056060c18 100644
--- a/public/components/property/addMeterWater/addMeterWater.js
+++ b/public/components/property/addMeterWater/addMeterWater.js
@@ -20,14 +20,22 @@
                 feeTypeCd: '',
                 feeConfigs: [],
                 configId: '',
-                objType: '1001'
+                objType: '1001',
+                hasRoom: false
             }
         },
         _initMethod: function () {
             $that._initAddMeterWaterDateInfo();
         },
         _initEvent: function () {
-            vc.on('addMeterWater', 'openAddMeterWaterModal', function () {
+            vc.on('addMeterWater', 'openAddMeterWaterModal', function (_param) {
+                if (_param.hasOwnProperty('roomId')) {
+                    $that.addMeterWaterInfo.hasRoom =true;
+                    $that.addMeterWaterInfo.roomId = _param.roomId;
+                    $that.addMeterWaterInfo.objId = _param.roomId;
+                    $that.addMeterWaterInfo.objName = _param.roomName;
+                    $that._queryPreMeterWater(_param.roomId);
+                }
                 $('#addMeterWaterModel').modal('show');
             });
 
@@ -189,7 +197,8 @@
                             $('#addMeterWaterModel').modal('hide');
                             vc.component.clearAddMeterWaterInfo();
                             vc.emit('meterWaterManage', 'listMeterWater', {});
-
+                            vc.emit('listRoomFee','notify', {});
+                           
                             return;
                         }
                         vc.message(_json.msg);
@@ -264,7 +273,8 @@
                     feeTypeCd: '',
                     feeConfigs: [],
                     configId: '',
-                    objType: '1001'
+                    objType: '1001',
+                    hasRoom: false
 
                 };
             }
diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index cfdd2a8f3..9223a42a9 100644
--- a/public/pages/property/listRoomFee/listRoomFee.html
+++ b/public/pages/property/listRoomFee/listRoomFee.html
@@ -5,6 +5,10 @@
                 <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="_openAddMeterWaterModal()">
+                            水电抄表
+                        </button>
                         <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
                             v-on:click="_openRoomCreateFeeAddModal()">
                             创建费用
@@ -93,4 +97,7 @@
     <vc:create path="property/deleteFee"></vc:create>
     <vc:create path="property/editFee"></vc:create>
     <vc:create path="property/roomCreateFeeAdd"></vc:create>
+
+    <vc:create path="property/addMeterWater" callBackListener="" callBackFunction=""></vc:create>
+
 </div>
\ No newline at end of file
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index c518fdbbd..47a10bc8d 100644
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -107,6 +107,13 @@
                     room:$that.listRoomCreateFeeInfo
                 });
             },
+            _openAddMeterWaterModal: function () {
+                vc.emit('addMeterWater', 'openAddMeterWaterModal', {
+                    roomId:$that.listRoomCreateFeeInfo.roomId,
+                    roomName:$that.listRoomCreateFeeInfo.roomName,
+                    
+                });
+            },
         }
 
     });