From 9da2e1bd32dd8117fac2db1dc57da1b79d9a6452 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Sun, 25 Dec 2022 07:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E4=B8=BB=E8=BD=A6=E8=BE=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addParkingSpace/addParkingSpace.js | 8 +-- .../searchParkingSpace.html | 10 ++- .../searchParkingSpace/searchParkingSpace.js | 23 ++++++- .../property/listOwnerCar/listOwnerCar.html | 66 +++++++++---------- .../property/listOwnerCar/listOwnerCar.js | 13 +++- 5 files changed, 78 insertions(+), 42 deletions(-) diff --git a/public/components/property/addParkingSpace/addParkingSpace.js b/public/components/property/addParkingSpace/addParkingSpace.js index 79dc899c2..715b6acdf 100755 --- a/public/components/property/addParkingSpace/addParkingSpace.js +++ b/public/components/property/addParkingSpace/addParkingSpace.js @@ -9,10 +9,10 @@ addParkingSpaceInfo: { num: '', paId: '', - area: '', + area: '1', remark: '', psId: '', - parkingType: '', + parkingType: '1', parkingTypes: [], parkingAreas: [] } @@ -112,9 +112,9 @@ clearAddParkingSpaceInfo: function () { vc.component.addParkingSpaceInfo.num = ''; vc.component.addParkingSpaceInfo.paId = ''; - vc.component.addParkingSpaceInfo.area = ''; + vc.component.addParkingSpaceInfo.area = '1'; vc.component.addParkingSpaceInfo.remark = ''; - vc.component.addParkingSpaceInfo.parkingType = ''; + vc.component.addParkingSpaceInfo.parkingType = '1'; vc.emit('addParkingSpace', 'parkingAreaSelect2', 'setParkingArea', { paId: '', num: '' diff --git a/public/components/property/searchParkingSpace/searchParkingSpace.html b/public/components/property/searchParkingSpace/searchParkingSpace.html index 857ee16fb..8debaa764 100755 --- a/public/components/property/searchParkingSpace/searchParkingSpace.html +++ b/public/components/property/searchParkingSpace/searchParkingSpace.html @@ -24,9 +24,13 @@
- + diff --git a/public/components/property/searchParkingSpace/searchParkingSpace.js b/public/components/property/searchParkingSpace/searchParkingSpace.js index a08d67509..b7e342264 100755 --- a/public/components/property/searchParkingSpace/searchParkingSpace.js +++ b/public/components/property/searchParkingSpace/searchParkingSpace.js @@ -14,11 +14,13 @@ num: '', areaNum: '', carNum: '', + parkingAreas:[], psFlag: $props.parkingSpaceFlag, showSearchCondition: $props.showSearchCondition } }, _initMethod: function () { + $that._listSearchParkingAreas(); }, _initEvent: function () { vc.on('searchParkingSpace', 'openSearchParkingSpaceModel', function (_param) { @@ -87,7 +89,26 @@ } else { return "未知"; } - } + }, + _listSearchParkingAreas: function() { + let param = { + params: { + page:1, + row:50, + communityId:vc.getCurrentCommunity().communityId + } + }; + //发送get请求 + vc.http.apiGet('/parkingArea.listParkingAreas', param, + function(json, res) { + let _parkingAreaManageInfo = JSON.parse(json); + $that.searchParkingSpaceInfo.parkingAreas = _parkingAreaManageInfo.parkingAreas; + }, + function(errInfo, error) { + console.log('请求失败处理'); + }); + }, + } }); })(window.vc); \ No newline at end of file diff --git a/public/pages/property/listOwnerCar/listOwnerCar.html b/public/pages/property/listOwnerCar/listOwnerCar.html index b30b00464..336996920 100755 --- a/public/pages/property/listOwnerCar/listOwnerCar.html +++ b/public/pages/property/listOwnerCar/listOwnerCar.html @@ -1,4 +1,20 @@
+
+
+
+
+
    + +
  • + {{item.name}} +
    • +
+
+
+
+
@@ -25,14 +41,15 @@
- + + + +
+
+
-
- -
-
-
-
+
@@ -103,9 +111,9 @@ - + @@ -122,10 +130,7 @@ - - - - + @@ -143,9 +148,9 @@ {{car.roomName}} - + 临时车 @@ -170,13 +175,7 @@ 车位已释放 - {{car.startTime}} - - - - - - - {{car.endTime}} + {{car.startTime}}
~{{car.endTime}} - @@ -187,12 +186,12 @@
@@ -232,6 +231,7 @@
+
diff --git a/public/pages/property/listOwnerCar/listOwnerCar.js b/public/pages/property/listOwnerCar/listOwnerCar.js index 74ab7f139..3ba4d4ddc 100755 --- a/public/pages/property/listOwnerCar/listOwnerCar.js +++ b/public/pages/property/listOwnerCar/listOwnerCar.js @@ -40,10 +40,21 @@ }); //与字典表关联 vc.getDict('owner_car', "lease_type", function (_data) { - vc.component.listOwnerCarInfo.leaseTypes = _data; + vc.component.listOwnerCarInfo.leaseTypes = [{ + statusCd:'', + name:'全部车辆' + }] + _data.forEach(item=>{ + vc.component.listOwnerCarInfo.leaseTypes.push(item); + }) + }); }, methods: { + swatchLeaseType:function(_item){ + $that.listOwnerCarInfo.conditions.leaseType = _item.statusCd; + vc.component._listOwnerCar(DEFAULT_PAGE, DEFAULT_ROWS); + }, _listOwnerCar: function (_page, _row) { let _params = $that.listOwnerCarInfo.conditions; _params.page = _page;