From 534d4d1eb96752ab218ee5fa070b064996125df3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 9 Sep 2020 23:32:15 +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

---
 .../proxy/editJunkRequirement/editJunkRequirement.html     | 7 -------
 .../pages/admin/rentingAuditManage/rentingAuditManage.html | 7 +++----
 .../pages/admin/rentingAuditManage/rentingAuditManage.js   | 7 +++++--
 .../proxy/junkRequirementManage/junkRequirementManage.html | 2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/public/components/proxy/editJunkRequirement/editJunkRequirement.html b/public/components/proxy/editJunkRequirement/editJunkRequirement.html
index 5936ce198..c697f6c5f 100644
--- a/public/components/proxy/editJunkRequirement/editJunkRequirement.html
+++ b/public/components/proxy/editJunkRequirement/editJunkRequirement.html
@@ -16,13 +16,6 @@
                     <option value="10002">电器</option>
                   </select> </div>
               </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label">巡检计划</label>
-                <div class="col-sm-10">
-                  <input v-model="editJunkRequirementInfo.inspectionPlanId" type="text" readonly="readonly" 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/pages/admin/rentingAuditManage/rentingAuditManage.html b/public/pages/admin/rentingAuditManage/rentingAuditManage.html
index 18bd5203b..376e212d4 100644
--- a/public/pages/admin/rentingAuditManage/rentingAuditManage.html
+++ b/public/pages/admin/rentingAuditManage/rentingAuditManage.html
@@ -25,8 +25,6 @@
                                 <th class="text-center">业主名称</th>
                                 <th class="text-center">业主电话</th>
                                 <th class="text-center">操作</th>
-
-
                             </tr>
                         </thead>
                         <tbody>
@@ -35,14 +33,14 @@
                                 <td class="text-center">{{rentingPool.rentingTitle}}</td>
                                 <td class="text-center">{{rentingPool.price}}</td>
                                 <td class="text-center">{{rentingPool.paymentType}}</td>
-                                <td class="text-center">{{rentingPool.checkInDate}}</td>
+                                <td class="text-center">{{rentingPool.checkIn == '1001'?'立即入住':'预约入住'}}</td>
                                 <td class="text-center">{{rentingPool.rentingConfigId}}</td>
                                 <td class="text-center">{{rentingPool.ownerName}}</td>
                                 <td class="text-center">{{rentingPool.ownerTel}}</td>
                                 <td class="text-center">
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditRentingPoolModel(rentingPool)">审核</button>
+                                            v-on:click="_openAuditModal(rentingPool)">审核</button>
                                     </div>
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
@@ -68,4 +66,5 @@
     </div>
     <vc:create path="admin/editRentingPool"></vc:create>
     <vc:create path="admin/deleteRentingPool"></vc:create>
+    <vc:create path="common/audit" callBackListener = "rentingAuditManage" callBackFunction="audit"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/admin/rentingAuditManage/rentingAuditManage.js b/public/pages/admin/rentingAuditManage/rentingAuditManage.js
index 30ae14f31..06cd96083 100644
--- a/public/pages/admin/rentingAuditManage/rentingAuditManage.js
+++ b/public/pages/admin/rentingAuditManage/rentingAuditManage.js
@@ -29,6 +29,9 @@
             vc.on('rentingPoolManage', 'listRentingPool', function (_param) {
                 vc.component._listRentingPools(DEFAULT_PAGE, DEFAULT_ROWS);
             });
+            vc.on('rentingAuditManage','audit',function(_auditInfo){
+
+            })
             vc.on('pagination', 'page_event', function (_currentPage) {
                 vc.component._listRentingPools(_currentPage, DEFAULT_ROWS);
             });
@@ -60,8 +63,8 @@
                     }
                 );
             },
-            _openAddRentingPoolModal: function () {
-                vc.emit('addRentingPool', 'openAddRentingPoolModal', {});
+            _openAuditModal: function () {
+                vc.emit('audit', 'openAuditModal', {});
             },
             _openEditRentingPoolModel: function (_rentingPool) {
                 vc.emit('editRentingPool', 'openEditRentingPoolModal', _rentingPool);
diff --git a/public/pages/proxy/junkRequirementManage/junkRequirementManage.html b/public/pages/proxy/junkRequirementManage/junkRequirementManage.html
index fba66926b..31b1fb70b 100644
--- a/public/pages/proxy/junkRequirementManage/junkRequirementManage.html
+++ b/public/pages/proxy/junkRequirementManage/junkRequirementManage.html
@@ -90,7 +90,7 @@
                                     </div>
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteJunkRequirementModel(junkRequirement)">审核</button>
+                                            v-on:click="_openDeleteJunkRequirementModel(junkRequirement)">删除</button>
                                     </div>
                                 </td>