From 8cea708a15891f266e8d786ae43df1a85736ae0c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 11 Sep 2020 23:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=A6=E4=BD=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/carCreateFee/carCreateFee.html   |  8 ++++----
 .../property/carCreateFee/carCreateFee.js     | 20 ++++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/public/pages/property/carCreateFee/carCreateFee.html b/public/pages/property/carCreateFee/carCreateFee.html
index 0e9a7ac41..313aee468 100644
--- a/public/pages/property/carCreateFee/carCreateFee.html
+++ b/public/pages/property/carCreateFee/carCreateFee.html
@@ -15,8 +15,8 @@
 
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                    <input type="text" placeholder="请填写车位编码" class="form-control "
-                                           v-model="carCreateFeeInfo.conditions.num">
+                                    <input type="text" placeholder="请填写停车场-车位，如 1-101" class="form-control "
+                                           v-model="carCreateFeeInfo.conditions.allNum">
                             </div>
 
                         </div>
@@ -30,8 +30,8 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写车位ID" class="form-control "
-                                       v-model="carCreateFeeInfo.conditions.psId">
+                                <input type="text" placeholder="请填写业主名称" class="form-control "
+                                       v-model="carCreateFeeInfo.conditions.ownerName">
                             </div>
                         </div>
                         <div class="col-sm-1">
diff --git a/public/pages/property/carCreateFee/carCreateFee.js b/public/pages/property/carCreateFee/carCreateFee.js
index e41327ca6..abc904706 100644
--- a/public/pages/property/carCreateFee/carCreateFee.js
+++ b/public/pages/property/carCreateFee/carCreateFee.js
@@ -18,8 +18,9 @@
                 moreCondition: false,
                 conditions: {
                     psId: '',
-                    num: '',
-                    carNum: ''
+                    ownerName: '',
+                    carNum: '',
+                    allNum: ''
                 }
             }
         },
@@ -39,10 +40,19 @@
                 vc.component.carCreateFeeInfo.conditions.page = _page;
                 vc.component.carCreateFeeInfo.conditions.row = _row;
                 vc.component.carCreateFeeInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
-                var param = {
-                    params: vc.component.carCreateFeeInfo.conditions
+
+                let _allNum = $that.carCreateFeeInfo.conditions.allNum;
+                let _conditions = JSON.parse(JSON.stringify(vc.component.carCreateFeeInfo.conditions));
+                let param = {
+                    params: _conditions
                 };
 
+                if (_allNum.split('-').length == 2) {
+                    let _allNums = _allNum.split('-')
+                    param.params.areaNum = _allNums[0];
+                    param.params.num = _allNums[1];
+                }
+
                 //发送get请求
                 vc.http.apiGet('owner.queryOwnerCars',
                     param,
@@ -71,7 +81,7 @@
             },
             _openViewParkingSpaceCreateFee: function (_car) {
 
-                vc.jumpToPage("/admin.html#/pages/property/listCarFee?carId=" + _car.carId + "&carNum=" + _car.carNum+"&areaNum="+_car.areaNum+"&num="+_car.num);
+                vc.jumpToPage("/admin.html#/pages/property/listCarFee?carId=" + _car.carId + "&carNum=" + _car.carNum + "&areaNum=" + _car.areaNum + "&num=" + _car.num);
             },
             _queryParkingSpaceMethod: function () {
                 vc.component.listCars(DEFAULT_PAGE, DEFAULT_ROW);