From 489277cb08b89646738a78fbb921fe18aac01b41 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 30 Aug 2020 15:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=BD=A6=E8=BE=86=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carCreateFee.html}                        | 37 +++++++----------
 .../carCreateFee.js}                          | 41 +++++++++----------
 2 files changed, 35 insertions(+), 43 deletions(-)
 rename public/pages/property/{parkingSpaceCreateFee/parkingSpaceCreateFee.html => carCreateFee/carCreateFee.html} (78%)
 rename public/pages/property/{parkingSpaceCreateFee/parkingSpaceCreateFee.js => carCreateFee/carCreateFee.js} (55%)

diff --git a/public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.html b/public/pages/property/carCreateFee/carCreateFee.html
similarity index 78%
rename from public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.html
rename to public/pages/property/carCreateFee/carCreateFee.html
index 627ad15a3..1cb8c584f 100644
--- a/public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.html
+++ b/public/pages/property/carCreateFee/carCreateFee.html
@@ -6,7 +6,7 @@
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
 <!--                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"-->
-<!--                                v-on:click="_moreCondition()">{{parkingSpaceCreateFeeInfo.moreCondition == true?'隐藏':'更多'}}-->
+<!--                                v-on:click="_moreCondition()">{{carCreateFeeInfo.moreCondition == true?'隐藏':'更多'}}-->
 <!--                        </button>-->
                     </div>
                 </div>
@@ -16,7 +16,7 @@
                         <div class="col-sm-4">
                             <div class="form-group input-group">
                                     <input type="text" placeholder="请填写车位编码" class="form-control form-control-sm"
-                                           v-model="parkingSpaceCreateFeeInfo.conditions.num">
+                                           v-model="carCreateFeeInfo.conditions.num">
                             </div>
 
                         </div>
@@ -24,14 +24,14 @@
                             <div class="form-group">
                                 <div class="form-group">
                                     <input type="text" placeholder="请填写车牌号" class="form-control form-control-sm"
-                                           v-model="parkingSpaceCreateFeeInfo.conditions.carNum">
+                                           v-model="carCreateFeeInfo.conditions.carNum">
                                 </div>
                             </div>
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <input type="text" placeholder="请填写车位ID" class="form-control form-control-sm"
-                                       v-model="parkingSpaceCreateFeeInfo.conditions.psId">
+                                       v-model="carCreateFeeInfo.conditions.psId">
                             </div>
                         </div>
                         <div class="col-sm-1">
@@ -67,47 +67,40 @@
                             <th data-hide="phone">车牌号</th>
                             <th data-hide="phone">停车场</th>
                             <th data-hide="phone">车位</th>
-                            
                             <th data-hide="phone">业主名称</th>
                             <th data-hide="phone">联系方式</th>
                             <th data-hide="phone">车位状态</th>
-                            <th>车位ID</th>
                             <th class="text-right">操作</th>
 
                         </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="parkingSpace in parkingSpaceCreateFeeInfo.parkingSpaces">
+                        <tr v-for="car in carCreateFeeInfo.cars">
                             <td>
-                                {{parkingSpace.carNum}}
+                                {{car.carNum}}
                             </td>
                             <td>
-                                {{parkingSpace.areaNum}}号
+                                {{car.areaNum}}号
                             </td>
                             <td>
-                                {{parkingSpace.num}}号
-                            </td>
-                           
-                           
+                                {{car.num}}号
+                            </td>          
                             <td>
-                                {{parkingSpace.ownerName}}
+                                {{car.ownerName}}
                             </td>
                             <td>
-                                {{parkingSpace.link}}
+                                {{car.link}}
                             </td>
                             <td>
-                                {{parkingSpace.stateName}}
-                            </td>
-                            <td>
-                                {{parkingSpace.psId}}
+                                {{car.stateName}}
                             </td>
                             <td class="text-right">
-                                <div class="btn-group" v-if="parkingSpace.state != 'F'">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openParkingSpaceCreateFeeAddModal(parkingSpace,false)">创建收费
+                                <div class="btn-group" v-if="car.state != 'F'">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openParkingSpaceCreateFeeAddModal(car,false)">创建收费
                                     </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openViewParkingSpaceCreateFee(parkingSpace)">查看收费
+                                    <button class="btn-white btn btn-xs" v-on:click="_openViewParkingSpaceCreateFee(car)">查看收费
                                     </button>
                                 </div>
                             </td>
diff --git a/public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.js b/public/pages/property/carCreateFee/carCreateFee.js
similarity index 55%
rename from public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.js
rename to public/pages/property/carCreateFee/carCreateFee.js
index 5d513a455..c9c1a23a9 100644
--- a/public/pages/property/parkingSpaceCreateFee/parkingSpaceCreateFee.js
+++ b/public/pages/property/carCreateFee/carCreateFee.js
@@ -7,8 +7,8 @@
     vc.extends({
         data:{
             parkingSpaceUnits:[],
-            parkingSpaceCreateFeeInfo:{
-                parkingSpaces:[],
+            carCreateFeeInfo:{
+                cars:[],
                 total:0,
                 records:1,
                 floorId:'',
@@ -24,39 +24,38 @@
             }
         },
         _initMethod:function(){
-            vc.component.listParkingSpace(DEFAULT_PAGE,DEFAULT_ROW);
+            vc.component.listCars(DEFAULT_PAGE,DEFAULT_ROW);
         },
         _initEvent:function(){
 
             vc.on('pagination','page_event',function(_currentPage){
-                vc.component.listParkingSpace(_currentPage,DEFAULT_ROW);
+                vc.component.listCars(_currentPage,DEFAULT_ROW);
             });
         },
         methods:{
 
-            listParkingSpace:function(_page,_row){
+            listCars:function(_page,_row){
 
-                vc.component.parkingSpaceCreateFeeInfo.conditions.page=_page;
-                vc.component.parkingSpaceCreateFeeInfo.conditions.row=_row;
-                vc.component.parkingSpaceCreateFeeInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
+                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.parkingSpaceCreateFeeInfo.conditions
+                    params:vc.component.carCreateFeeInfo.conditions
                 };
 
                //发送get请求
-               vc.http.get('parkingSpaceCreateFee',
-                            'listParkingSpace',
+               vc.http.apiGet('owner.queryOwnerCars',
                              param,
                              function(json,res){
-                                var listParkingSpaceData =JSON.parse(json);
+                                var listCarData =JSON.parse(json);
 
-                                vc.component.parkingSpaceCreateFeeInfo.total = listParkingSpaceData.total;
-                                vc.component.parkingSpaceCreateFeeInfo.records = listParkingSpaceData.records;
-                                vc.component.parkingSpaceCreateFeeInfo.parkingSpaces = listParkingSpaceData.parkingSpaces;
+                                vc.component.carCreateFeeInfo.total = listCarData.total;
+                                vc.component.carCreateFeeInfo.records = listCarData.records;
+                                vc.component.carCreateFeeInfo.cars = listCarData.data;
 
                                 vc.emit('pagination','init',{
-                                    total:vc.component.parkingSpaceCreateFeeInfo.records,
-                                    dataCount: vc.component.parkingSpaceCreateFeeInfo.total,
+                                    total:vc.component.carCreateFeeInfo.records,
+                                    dataCount: vc.component.carCreateFeeInfo.total,
                                     currentPage:_page
                                 });
                              },function(errInfo,error){
@@ -74,14 +73,14 @@
                  vc.jumpToPage("/admin.html#/pages/property/listParkingSpaceFee?"+vc.objToGetParam(_parkingSpace));
             },
             _queryParkingSpaceMethod:function(){
-                vc.component.listParkingSpace(DEFAULT_PAGE,DEFAULT_ROW);
+                vc.component.listCars(DEFAULT_PAGE,DEFAULT_ROW);
             },
 
             _moreCondition:function(){
-                if(vc.component.parkingSpaceCreateFeeInfo.moreCondition){
-                    vc.component.parkingSpaceCreateFeeInfo.moreCondition = false;
+                if(vc.component.carCreateFeeInfo.moreCondition){
+                    vc.component.carCreateFeeInfo.moreCondition = false;
                 }else{
-                    vc.component.parkingSpaceCreateFeeInfo.moreCondition = true;
+                    vc.component.carCreateFeeInfo.moreCondition = true;
                 }
             }