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 @@
- +
- +
@@ -15,8 +17,7 @@
-
@@ -27,13 +28,14 @@ - + + + - - + @@ -45,8 +47,11 @@ {{car.roomName}} - - {{car.carBrand}} + + 临时车 + + + {{car.leaseTypeName}} {{car.carTypeName}} @@ -63,11 +68,11 @@ 车位已释放 - - {{car.startTime}} + + {{car.startTime}}
~{{car.endTime}} - - {{car.endTime}} + + - {{_getCarState(car)}} @@ -85,4 +90,4 @@
-
+ \ 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); }