From c5ee194c281fedcb2d2fba578040d22750018b6b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 16 Sep 2020 16:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E6=91=8A=E5=85=AC?=
 =?UTF-8?q?=E5=BC=8F=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/property/feeSharing/feeSharing.html   |  2 +-
 .../rentingAppointmentManage.html                    |  1 -
 .../admin/rentingPoolManage/rentingPoolManage.html   | 12 ++++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/public/components/property/feeSharing/feeSharing.html b/public/components/property/feeSharing/feeSharing.html
index ca11fff75..a5e538233 100644
--- a/public/components/property/feeSharing/feeSharing.html
+++ b/public/components/property/feeSharing/feeSharing.html
@@ -60,7 +60,7 @@
                   <select class="custom-select" v-model="feeSharingInfo.formulaId">
                     <option selected disabled value="">必填，请选择收费项目</option>
                     <option v-for="(item,index) in feeSharingInfo.formulas" :key="index"
-                      v-bind:value="item.formulaId">{{item.formulaValue}}
+                      v-bind:value="item.formulaId">{{item.formulaValue}}({{item.formulaDesc}})
                     </option>
                   </select>
                 </div>
diff --git a/public/pages/admin/rentingAppointmentManage/rentingAppointmentManage.html b/public/pages/admin/rentingAppointmentManage/rentingAppointmentManage.html
index 4acb0e06e..05dbda74e 100644
--- a/public/pages/admin/rentingAppointmentManage/rentingAppointmentManage.html
+++ b/public/pages/admin/rentingAppointmentManage/rentingAppointmentManage.html
@@ -82,7 +82,6 @@
                                 <td class="text-center">{{rentingAppointment.appointmentTime}}</td>
                                 <td class="text-center">{{rentingAppointment.appointmentRoomName}}</td>
                                 <td class="text-center">{{rentingAppointment.roomName}}</td>
-
                                 <td class="text-center">{{rentingAppointment.stateName}}</td>
                                 <td class="text-center">{{rentingAppointment.remark}}</td>
                                 <td class="text-right">
diff --git a/public/pages/admin/rentingPoolManage/rentingPoolManage.html b/public/pages/admin/rentingPoolManage/rentingPoolManage.html
index d2ff0eddb..4647f30af 100644
--- a/public/pages/admin/rentingPoolManage/rentingPoolManage.html
+++ b/public/pages/admin/rentingPoolManage/rentingPoolManage.html
@@ -67,7 +67,7 @@
                                 <th class="text-center">业主名称</th>
                                 <th class="text-center">业主电话</th>
                                 <th class="text-center">状态</th>
-                                <th class="text-center">操作</th>
+                                <th class="text-right">操作</th>
 
 
                             </tr>
@@ -83,7 +83,13 @@
                                 <td class="text-center">{{rentingPool.ownerName}}</td>
                                 <td class="text-center">{{rentingPool.ownerTel}}</td>
                                 <td class="text-center">{{rentingPool.stateName}}</td>
-                                <td class="text-center">
+                                <td class="text-right">
+
+                                    <div class="btn-group" if="rentingPool.state == '3'">
+                                        <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeleteRentingPoolModel(rentingPool)">租客支付</button>
+                                    </div>
+
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditRentingPoolModel(rentingPool)">修改</button>
@@ -92,6 +98,8 @@
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_openDeleteRentingPoolModel(rentingPool)">删除</button>
                                     </div>
+
+
                                 </td>
 
                             </tr>