From a86c7473fba0625ebee20e16861b3fd04f37598a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 6 Sep 2020 17:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=B4=B9=E7=94=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomCreateFeeAdd/roomCreateFeeAdd.js       |  3 ++-
 .../property/listRoomFee/listRoomFee.html      |  5 +++++
 .../pages/property/listRoomFee/listRoomFee.js  | 18 ++++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
index 6cc36e8e1..c60540ac7 100644
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -34,7 +34,7 @@
                     vc.component.roomCreateFeeAddInfo.locationTypeCd = '5008';
                     vc.component.roomCreateFeeAddInfo.locationObjId = _room.room.roomId;
                     var room =  _room.room;
-                    vc.component.roomCreateFeeAddInfo.locationTypeCdName = room.floorNum +'号楼'+room.unitNum+'单元'+room.roomNum+'室';
+                    vc.component.roomCreateFeeAddInfo.locationTypeCdName = room.floorNum +'号楼'+room.unitNum+'单元'+room.roomNum+'室('+room.ownerName+')';
                 }
                 $('#roomCreateFeeAddModel').modal('show');
 
@@ -137,6 +137,7 @@
                         $('#roomCreateFeeAddModel').modal('hide');
                         vc.component.clearAddFeeConfigInfo();
                         vc.toast("创建收费成功，总共["+_json.totalRoom+"]房屋，成功["+_json.successRoom+"],失败["+_json.errorRoom+"]",8000);
+                        vc.emit('listRoomFee','notify',{});
                         return;
                     }
                     vc.toast(json);
diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index 74af5e87e..84877a63a 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="_openRoomCreateFeeAddModal()">
+                            创建费用
+                        </button>
                         <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
                             v-on:click="_toOwnerPayFee()">
                             欠费缴费
@@ -81,4 +85,5 @@
     </div>
     <vc:create path="property/deleteFee"></vc:create>
     <vc:create path="property/editFee"></vc:create>
+    <vc:create path="property/roomCreateFeeAdd"></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 ab071de69..c518fdbbd 100644
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -9,7 +9,11 @@
                 roomId:'',
                 total: 0,
                 records: 1,
-                builtUpArea: 0.00
+                builtUpArea: 0.00,
+                floorNum:'',
+                unitNum:'',
+                roomNum:'',
+                ownerName:''
             }
         },
         _initMethod:function(){
@@ -17,6 +21,10 @@
                   vc.component.listRoomCreateFeeInfo.roomName = vc.getParam('floorNum')+"号楼"+vc.getParam('unitNum')+"单元"+vc.getParam("roomNum")+"室";
                   vc.component.listRoomCreateFeeInfo.roomId = vc.getParam('roomId');
                   $that.listRoomCreateFeeInfo.builtUpArea = vc.getParam('builtUpArea');
+                  $that.listRoomCreateFeeInfo.floorNum = vc.getParam('floorNum');
+                  $that.listRoomCreateFeeInfo.unitNum = vc.getParam('unitNum');
+                  $that.listRoomCreateFeeInfo.roomNum = vc.getParam('roomNum');
+                  $that.listRoomCreateFeeInfo.ownerName = vc.getParam('ownerName');
             };
             vc.component._loadListRoomCreateFeeInfo(1,10);
         },
@@ -92,7 +100,13 @@
             },
             _toOwnerPayFee:function(){
                 vc.jumpToPage('/admin.html#/pages/property/owePayFeeOrder?payObjId='+$that.listRoomCreateFeeInfo.roomId+"&payObjType=3333&roomName="+$that.listRoomCreateFeeInfo.roomName);
-            }
+            },
+            _openRoomCreateFeeAddModal:function(){
+                vc.emit('roomCreateFeeAdd', 'openRoomCreateFeeAddModal',{
+                    isMore:false,
+                    room:$that.listRoomCreateFeeInfo
+                });
+            },
         }
 
     });