From 32e91f538348488c43911f177c4f10b7a7d3e3e5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 28 Jan 2023 12:59:22 +0800
Subject: [PATCH] add  parking area owner leaseType

---
 .../parkingAreaControlOwnerCar.html           | 35 +++++++++++--------
 .../parkingAreaControlOwnerCar.js             | 31 +++++++++-------
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.html b/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.html
index 573ec817e..3db73aad1 100644
--- a/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.html
+++ b/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.html
@@ -1,12 +1,14 @@
 <div class="margin-top">
     <div class="row margin-top-lg">
         <div class="col-lg-3 padding-right-xs padding-left-xl">
-            <input v-model="parkingAreaControlOwnerCar.carNum" type="text" :placeholder="vc.i18n('必填，请填写车牌号','parkingAreaControlOwnerCar')"
-                class="form-control">
+            <input v-model="parkingAreaControlOwnerCar.carNum" type="text" :placeholder="vc.i18n('必填，请填写车牌号','parkingAreaControlOwnerCar')" class="form-control">
 
         </div>
         <div class="col-lg-3 padding-right-xs padding-left-xl">
-
+            <select class="custom-select" v-model="parkingAreaControlOwnerCar.leaseType">
+                <option selected value="">{{vc.i18n('请选择车牌类型','parkingAreaControlOwnerCar')}}</option>
+                <option v-for="(item,index) in parkingAreaControlOwnerCar.leaseTypes" :key="index" :value="item.statusCd">{{item.name}}</option>
+            </select>
         </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl">
 
@@ -15,8 +17,7 @@
 
         </div>
         <div class="col-lg-2 padding-right-xs padding-right-xl text-right">
-            <button type=" button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                v-on:click="_qureyParkingAreaControlOwnerCar()">
+            <button type=" button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_qureyParkingAreaControlOwnerCar()">
                 查询
             </button>
         </div>
@@ -27,13 +28,14 @@
                 <tr>
                     <th class="text-center"><span><vc:i18n name="车牌号" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
                     <th class="text-center"><span><vc:i18n name="房屋号" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
-                    <th data-hide="phone" class="text-center"><span><vc:i18n name="车辆品牌" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="车牌类型" namespace="parkingAreaControlOwnerCar"></vc:i18n></span>
+                    </th>
                     <th data-hide="phone" class="text-center"><span><vc:i18n name="车辆类型" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
                     <th data-hide="phone" class="text-center"><span><vc:i18n name="颜色" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
                     <th data-hide="phone" class="text-center"><span><vc:i18n name="业主" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
                     <th data-hide="phone" class="text-center"><span><vc:i18n name="车位" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
-                    <th data-hide="phone" class="text-center"><span><vc:i18n name="起租时间" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
-                    <th data-hide="phone" class="text-center"><span><vc:i18n name="截止时间" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
+                    <th data-hide="phone" class="text-center"><span><vc:i18n name="有效期" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
                     <th data-hide="phone" class="text-center"><span><vc:i18n name="状态" namespace="parkingAreaControlOwnerCar"></vc:i18n></span></th>
                 </tr>
             </thead>
@@ -45,8 +47,11 @@
                     <td class="text-center">
                         {{car.roomName}}
                     </td>
-                    <td class="text-center">
-                        {{car.carBrand}}
+                    <td class="text-center" v-if="car.leaseType == 'T'">
+                        临时车
+                    </td>
+                    <td class="text-center" v-else>
+                        {{car.leaseTypeName}}
                     </td>
                     <td class="text-center">
                         {{car.carTypeName}}
@@ -63,11 +68,11 @@
                     <td v-else class="text-center">
                         车位已释放
                     </td>
-                    <td class="text-center">
-                        {{car.startTime}}
+                    <td class="text-center" v-if="car.leaseType == 'H'">
+                        {{car.startTime}}</br>~{{car.endTime}}
                     </td>
-                    <td class="text-center">
-                        {{car.endTime}}
+                    <td class="text-center" v-else>
+                        -
                     </td>
                     <td class="text-center">
                         {{_getCarState(car)}}
@@ -85,4 +90,4 @@
         <!-- 分页 -->
         <vc:create path="frame/paginationPlus" namespace="parkingAreaControlOwnerCar"></vc:create>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js b/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js
index 89092d1d3..f5ca515dc 100644
--- a/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js
+++ b/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js
@@ -1,7 +1,7 @@
 /**
  入驻小区
  **/
-(function (vc) {
+(function(vc) {
     var DEFAULT_PAGE = 1;
     var DEFAULT_ROWS = 10;
     vc.extends({
@@ -9,25 +9,30 @@
             parkingAreaControlOwnerCar: {
                 cars: [],
                 boxId: '',
-                carNum: ''
+                carNum: '',
+                leaseType: '',
+                leaseTypes: []
             }
         },
-        _initMethod: function () {
+        _initMethod: function() {
+            vc.getDict('owner_car', "lease_type", function(_data) {
+                $that.parkingAreaControlOwnerCar.leaseTypes = _data;
 
+            });
         },
-        _initEvent: function () {
-            vc.on('parkingAreaControlOwnerCar', 'switch', function (_data) {
+        _initEvent: function() {
+            vc.on('parkingAreaControlOwnerCar', 'switch', function(_data) {
                 $that.parkingAreaControlOwnerCar.boxId = _data.boxId;
                 $that._loadParkingAreaControlOwnerCars(DEFAULT_PAGE, DEFAULT_ROWS);
             });
             vc.on('parkingAreaControlOwnerCar', 'paginationPlus', 'page_event',
-                function (_currentPage) {
+                function(_currentPage) {
                     vc.component._loadParkingAreaControlOwnerCars(_currentPage, DEFAULT_ROWS);
                 });
         },
         methods: {
 
-            _loadParkingAreaControlOwnerCars: function (_page, _row) {
+            _loadParkingAreaControlOwnerCars: function(_page, _row) {
                 let param = {
                     params: {
                         page: _page,
@@ -35,13 +40,14 @@
                         communityId: vc.getCurrentCommunity().communityId,
                         boxId: $that.parkingAreaControlOwnerCar.boxId,
                         carTypeCds: '1001,1002',
-                        carNum: $that.parkingAreaControlOwnerCar.carNum
+                        carNum: $that.parkingAreaControlOwnerCar.carNum,
+                        leaseType: $that.parkingAreaControlOwnerCar.leaseType
                     }
                 };
                 //发送get请求
                 vc.http.apiGet('owner.queryOwnerCars',
                     param,
-                    function (json, res) {
+                    function(json, res) {
                         var _json = JSON.parse(json);
                         $that.parkingAreaControlOwnerCar.total = _json.total;
                         $that.parkingAreaControlOwnerCar.records = _json.records;
@@ -51,19 +57,20 @@
                             dataCount: $that.parkingAreaControlOwnerCar.total,
                             currentPage: _page
                         });
-                    }, function (errInfo, error) {
+                    },
+                    function(errInfo, error) {
                         console.log('请求失败处理');
                     }
                 );
             },
-            _getCarState: function (car) {
+            _getCarState: function(car) {
                 let _carEndTime = new Date(car.endTime);
                 if (_carEndTime.getTime() > new Date().getTime()) {
                     return "正常";
                 }
                 return "到期";
             },
-            _qureyParkingAreaControlOwnerCar: function () {
+            _qureyParkingAreaControlOwnerCar: function() {
                 $that._loadParkingAreaControlOwnerCars(DEFAULT_PAGE, DEFAULT_ROWS);
             }