From 70fa9c54559e5f9383ca65273ca3b16e7f8dcdb3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 16 Oct 2021 13:24:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E4=BB=A3=E7=A0=81=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parkingAreaControlCarInouts.html          |  9 ++--
 .../parkingAreaControlCarInouts.js            | 42 +++++++++++++++++--
 .../payFeeAuditManage/payFeeAuditManage.html  |  1 -
 .../payFeeAuditManage/payFeeAuditManage.js    |  2 +-
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html
index 71a406240..607dc14cf 100644
--- a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html
+++ b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html
@@ -4,11 +4,10 @@
             <tr>
                 <th class="text-center">进出场编号</th>
                 <th class="text-center">车辆状态</th>
-                <th class="text-center">车辆类型</th>
                 <th class="text-center">车牌号</th>
                 <th class="text-center">进场时间</th>
                 <th class="text-center">出场时间</th>
-                <th class="text-center">停车时间(小时)</th>
+                <th class="text-center">停车时间</th>
                 <th class="text-center">收费金额</th>
             </tr>
         </thead>
@@ -17,9 +16,9 @@
                 <td class="text-center">{{carIn.inoutId}}</td>
                 <td class="text-center">{{carIn.stateName}}</td>
                 <td class="text-center">{{carIn.carNum}}</td>
-                <td class="text-center">{{carIn.carNum}}</td>
                 <td class="text-center">{{carIn.inTime}}</td>
-                <td class="text-center">{{carIn.outTime}}</td>
+                <td class="text-center" v-if="carIn.state != '100500'">-</td>
+                <td class="text-center" v-else>{{carIn.outTime}}</td>
                 <td class="text-center">{{carIn.inHours}}小时{{carIn.inMin}}分</td>
                 <td class="text-center">{{carIn.outTime}}</td>
                 <td class="text-center">{{carIn.amount}}</td>
@@ -35,5 +34,5 @@
         </tfoot>
     </table>
     <!-- 分页 -->
-    <vc:create path="frame/paginationPlus" namespace="parkingAreaControlInCar"></vc:create>
+    <vc:create path="frame/paginationPlus" namespace="parkingAreaControlCarInouts"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js
index d44ffed74..74ce6d8c1 100644
--- a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js
+++ b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js
@@ -2,21 +2,57 @@
  入驻小区
  **/
 (function (vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
     vc.extends({
         data: {
             parkingAreaControlCarInoutsInfo: {
-                carIns: []
-
+                carIns: [],
+                paId: '',
             }
         },
         _initMethod: function () {
 
         },
         _initEvent: function () {
-
+            vc.on('parkingAreaControlCarInouts', 'switch', function (_data) {
+                $that.parkingAreaControlCarInoutsInfo.paId = _data.paId;
+                $that._loadParkingAreaControlCarInouts(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on('parkingAreaControlCarInouts', 'paginationPlus', 'page_event',
+                function (_currentPage) {
+                    vc.component._loadParkingAreaControlCarInouts(_currentPage, DEFAULT_ROWS);
+                });
         },
         methods: {
 
+            _loadParkingAreaControlCarInouts: function (_page,_row) {
+                let param = {
+                    params: {
+                        page: _page,
+                        row: _row,
+                        communityId: vc.getCurrentCommunity().communityId,
+                        paId: $that.parkingAreaControlCarInoutsInfo.paId,
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/carInoutDetail.listCarInoutDetail',
+                    param,
+                    function (json) {
+                        let _feeConfigInfo = JSON.parse(json);
+                        vc.component.parkingAreaControlCarInoutsInfo.total = _feeConfigInfo.total;
+                        vc.component.parkingAreaControlCarInoutsInfo.records = _feeConfigInfo.records;
+                        vc.component.parkingAreaControlCarInoutsInfo.carIns = _feeConfigInfo.data;
+                        vc.emit('parkingAreaControlCarInouts', 'paginationPlus', 'init', {
+                            total: _feeConfigInfo.records,
+                            currentPage: _page
+                        });
+                    }, function () {
+                        console.log('请求失败处理');
+                    }
+                );
+            }
+
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/pages/property/payFeeAuditManage/payFeeAuditManage.html b/public/pages/property/payFeeAuditManage/payFeeAuditManage.html
index 49e1a6952..dac311d71 100755
--- a/public/pages/property/payFeeAuditManage/payFeeAuditManage.html
+++ b/public/pages/property/payFeeAuditManage/payFeeAuditManage.html
@@ -23,7 +23,6 @@
                         <div class="col-sm-4">
                             <select class="custom-select" v-model="payFeeAuditManageInfo.conditions.state"
                                     placeholder="请选择状态">
-                                <option value="" selected>请选择状态</option>
                                 <option value="1010">待审核</option>
                                 <option value="2020">审核通过</option>
                                 <option value="3030">审核未通过</option>
diff --git a/public/pages/property/payFeeAuditManage/payFeeAuditManage.js b/public/pages/property/payFeeAuditManage/payFeeAuditManage.js
index 11aab46ba..f63897c7d 100755
--- a/public/pages/property/payFeeAuditManage/payFeeAuditManage.js
+++ b/public/pages/property/payFeeAuditManage/payFeeAuditManage.js
@@ -19,7 +19,7 @@
                     startTime: '',
                     endTime: '',
                     userCode: '',
-                    state: '',
+                    state: '1010',
                     payerObjId: ''
                 },
                 curPayFee: {}