From cd62da04ff331eba1e59fe6033030df433e5f860 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 13 Sep 2020 15:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addRentingAppointment.html                | 12 +++++
 .../addRentingAppointment.js                  | 45 ++++++++++++++++---
 .../rentingAppointmentManage.html             |  8 ++--
 .../property/roomCreateFee/roomCreateFee.js   |  6 +--
 4 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/public/components/admin/addRentingAppointment/addRentingAppointment.html b/public/components/admin/addRentingAppointment/addRentingAppointment.html
index fa88c717a..a789d79ea 100644
--- a/public/components/admin/addRentingAppointment/addRentingAppointment.html
+++ b/public/components/admin/addRentingAppointment/addRentingAppointment.html
@@ -37,6 +37,18 @@
                     class="form-control addAppointmentTime">
                 </div>
               </div>
+
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">小区</label>
+                <div class="col-sm-10">
+                  <select class="custom-select" v-model="addRentingAppointmentInfo.communityId">
+                    <option selected disabled value="">必填，请选择小区</option>
+                    <option v-for="(item,index) in addRentingAppointmentInfo.communitys" :value="item.communityId">
+                      {{item.name}}</option>
+                  </select>
+                </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/admin/addRentingAppointment/addRentingAppointment.js b/public/components/admin/addRentingAppointment/addRentingAppointment.js
index 29cb7fe7c..d22a1afff 100644
--- a/public/components/admin/addRentingAppointment/addRentingAppointment.js
+++ b/public/components/admin/addRentingAppointment/addRentingAppointment.js
@@ -14,11 +14,20 @@
                 appointmentTime: '',
                 appointmentRoomId: '',
                 remark: '',
+                communitys: [],
+                communityId: '',
+                floorId: '',
+                floorNum: '',
+                unitId: '',
+                unitNum: '',
+                roomId: '',
+                roomNum: ''
 
             }
         },
         _initMethod: function () {
             $that._initAddAppointmentTime();
+            $that._loadAddCommunitys();
         },
         _initEvent: function () {
             vc.on('addRentingAppointment', 'openAddRentingAppointmentModal', function () {
@@ -110,10 +119,6 @@
                             errInfo: "备注不能超过500字"
                         },
                     ],
-
-
-
-
                 });
             },
             saveRentingAppointmentInfo: function () {
@@ -158,7 +163,30 @@
 
                     });
             },
+            _loadAddCommunitys: function () {
+                var param = {
+                    params: {
+                        _uId: 'ccdd00opikookjuhyyttvhnnjuuu',
+                        page: 1,
+                        row: 50
+                    }
+                };
+                vc.http.get('initData',
+                    'getCommunitys',
+                    param,
+                    function (json, res) {
+                        if (res.status == 200) {
+                            let _communityInfos = JSON.parse(json).communitys;
+                            $that.addRentingAppointmentInfo.communitys = _communityInfos;
+                        }
+                    }, function () {
+                        console.log('请求失败处理');
+                        vc.jumpToPage(_param.url);
+                    }
+                );
+            },
             clearAddRentingAppointmentInfo: function () {
+                let _communitys = $that.addRentingAppointmentInfo.communitys;
                 vc.component.addRentingAppointmentInfo = {
                     tenantName: '',
                     tenantSex: '',
@@ -166,7 +194,14 @@
                     appointmentTime: '',
                     appointmentRoomId: '',
                     remark: '',
-
+                    communityId: '',
+                    floorId: '',
+                    floorNum: '',
+                    unitId: '',
+                    unitNum: '',
+                    roomId: '',
+                    roomNum: '',
+                    communitys: _communitys
                 };
             }
         }
diff --git a/public/pages/admin/rentingAppointmentManage/rentingAppointmentManage.html b/public/pages/admin/rentingAppointmentManage/rentingAppointmentManage.html
index 612f67133..2df61d2e9 100644
--- a/public/pages/admin/rentingAppointmentManage/rentingAppointmentManage.html
+++ b/public/pages/admin/rentingAppointmentManage/rentingAppointmentManage.html
@@ -51,7 +51,7 @@
                         <button type="button" class="btn btn-primary btn-sm"
                             v-on:click="_openAddRentingAppointmentModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            预约
+                            电话预约
                         </button>
                     </div>
                 </div>
@@ -66,9 +66,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>
                         </thead>
                         <tbody>
@@ -79,7 +77,7 @@
                                 <td class="text-center">{{rentingAppointment.appointmentTime}}</td>
                                 <td class="text-center">{{rentingAppointment.appointmentRoomId}}</td>
                                 <td class="text-center">{{rentingAppointment.remark}}</td>
-                                <td class="text-center">
+                                <td class="text-right">
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditRentingAppointmentModel(rentingAppointment)">修改</button>
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js
index 5df4b11e6..af32d408f 100644
--- a/public/pages/property/roomCreateFee/roomCreateFee.js
+++ b/public/pages/property/roomCreateFee/roomCreateFee.js
@@ -61,9 +61,9 @@
 
                 if (_allNum.split('-').length == 3) {
                     let _allNums = _allNum.split('-')
-                    param.params.floorNum = _allNums[0];
-                    param.params.unitNum = _allNums[1];
-                    param.params.roomNum = _allNums[2];
+                    param.params.floorNum = _allNums[0].trim();
+                    param.params.unitNum = _allNums[1].trim();
+                    param.params.roomNum = _allNums[2].trim();
                 }
 
                 //发送get请求