From b4282afb7a83309fb47af2911d8067b25c1bc45b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 15 Jan 2021 15:04:57 +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

---
 public/pages/property/listRoomFee/listRoomFee.js         | 6 +++---
 public/pages/property/owePayFeeOrder/owePayFeeOrder.html | 4 ++--
 public/pages/property/owePayFeeOrder/owePayFeeOrder.js   | 2 +-
 public/pages/property/roomCreateFee/roomCreateFee.html   | 2 +-
 public/pages/property/roomCreateFee/roomCreateFee.js     | 3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index 96a404b1c..ef1b6f359 100644
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -16,7 +16,7 @@
                 ownerName: '',
                 roomType: '',
                 hireOwnerFee: '0',
-                ownerId: ''
+                urlOwnerId: ''
             }
         },
         _initMethod: function () {
@@ -28,7 +28,7 @@
             }
 
             if (vc.notNull(vc.getParam('ownerId'))) {
-                $that.listRoomCreateFeeInfo.ownerId = vc.getParam("ownerId");
+                $that.listRoomCreateFeeInfo.urlOwnerId = vc.getParam("ownerId");
             }
         },
         _initEvent: function () {
@@ -48,7 +48,7 @@
                         row: _row,
                         communityId: vc.getCurrentCommunity().communityId,
                         payerObjId: vc.component.listRoomCreateFeeInfo.roomId,
-                        ownerId: $that.listRoomCreateFeeInfo.ownerId
+                        ownerId: $that.listRoomCreateFeeInfo.urlOwnerId
                     }
                 };
                 //发送get请求
diff --git a/public/pages/property/owePayFeeOrder/owePayFeeOrder.html b/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
index 56e0469dc..6fe4af19d 100644
--- a/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
+++ b/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
@@ -5,9 +5,9 @@
                 <div class="ibox-title">
                     <h5>{{owePayFeeOrderInfo.roomName}}</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_printOwnOrder()" v-if="owePayFeeOrderInfo.oweFees.length > 0">
+                        <!-- <button type="button" class="btn btn-primary btn-sm" v-on:click="_printOwnOrder()" v-if="owePayFeeOrderInfo.oweFees.length > 0">
                             催缴单
-                        </button>
+                        </button> -->
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
                             返回
                         </button>
diff --git a/public/pages/property/owePayFeeOrder/owePayFeeOrder.js b/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
index 3283b268a..0d2b1b93e 100644
--- a/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
+++ b/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
@@ -29,7 +29,7 @@
             let _payObjType = vc.getParam('payObjType');
             if (!vc.notNull(_payObjId)) {
                 vc.toast('非法操作');
-                vc.getBack();
+               vc.getBack();
                 return;
             }
             $that.owePayFeeOrderInfo.payObjId = _payObjId;
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html
index 36b63e0ef..50deea226 100644
--- a/public/pages/property/roomCreateFee/roomCreateFee.html
+++ b/public/pages/property/roomCreateFee/roomCreateFee.html
@@ -148,7 +148,7 @@
                                     </div>
                                     <div class="btn-group" v-if="room.state != '2002'">
                                         <button class="btn-white btn btn-xs"
-                                            v-on:click="_openTranslateFeeManualCollectionDetailModel(room)">催缴单
+                                            v-on:click="_downloadRoomCollectionLetterOrder(room)">催缴单
                                         </button>
                                     </div>
                                     <div class="btn-group">
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js
index ddfd33f79..a1160d777 100644
--- a/public/pages/property/roomCreateFee/roomCreateFee.js
+++ b/public/pages/property/roomCreateFee/roomCreateFee.js
@@ -301,6 +301,9 @@
             },
             _downloadCollectionLetterOrder:function(){
                 vc.jumpToPage('/callComponent/feeManualCollection/downloadCollectionLetterOrder?communityId=' + vc.getCurrentCommunity().communityId );
+            },
+            _downloadRoomCollectionLetterOrder:function(_room){
+                vc.jumpToPage('/callComponent/feeManualCollection/downloadCollectionLetterOrder?communityId=' + vc.getCurrentCommunity().communityId +"&roomId="+_room.roomId );
             }
         }
     });