加入停车场选择

WebService/src/main/resources/components/parkingAreaPackage/choose-parkingArea/chooseParkingArea.js

@@ -48,7 +48,7 @@
                 }
                 vc.emit($props.emitChooseParkingArea,'chooseParkingArea',_parkingArea);
                 vc.emit($props.emitLoadData,'listParkingAreaData',{
-                    parkingAreaId:_parkingArea.parkingAreaId
+                    paId:_parkingArea.paId
                 });
                 $('#chooseParkingAreaModel').modal('hide');
             },

WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html

@@ -6,31 +6,32 @@
                 <div class="ibox-title">
                     <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()">{{listParkingSpaceInfo.moreCondition == true?'隐藏':'更多'}}
-                        </button>
+
                     </div>
                 </div>
                 <div class="ibox-content" >
                     <div class="row">
                         <div class="col-sm-4">
+                            <div class="form-group input-group">
+                                <input type="text" placeholder="请选择停车场"
+                                       v-model="listParkingSpaceInfo.conditions.areaNum" class="form-control">
+                                <div class="input-group-prepend">
+                                    <button type="button" class="btn btn-primary btn-sm"
+                                            v-on:click="_openChooseParkingArea()"><i
+                                            class="glyphicon glyphicon-search"></i> 选择
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="请填写车位ID" class="form-control form-control-sm"
                                        v-model="listParkingSpaceInfo.conditions.psId">
                             </div>
                         </div>
-                        <div class="col-sm-3">
-                            <select class="form-control-sm form-control input-s-sm inline"
-                                    v-model="listParkingSpaceInfo.conditions.typeCd">
-                                <option selected value="">请选择状态</option>
-                                <option value="1001">地上停车</option>
-                                <option value="2001">地下停车</option>
-                            </select>
-                        </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写面积" class="form-control form-control-sm"
-                                       v-model="listParkingSpaceInfo.conditions.area">
+                                <input type="text" placeholder="请填写车位编号" class=" form-control" v-model="listParkingSpaceInfo.num">
                             </div>
                         </div>
                         <div class="col-sm-1">
@@ -39,14 +40,6 @@
                             </button>
                         </div>
                     </div>
-                    <div class="row" v-if="listParkingSpaceInfo.moreCondition">
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input type="text" placeholder="请填写车位编号" class=" form-control" v-model="listParkingSpaceInfo.num">
-                            </div>
-                        </div>
-
-                    </div>
                 </div>
             </div>
         </div>
@@ -64,7 +57,7 @@
                                 <div class="col">
                                     <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddParkingSpaceModal(-1)">
                                         <i class="glyphicon glyphicon-plus"></i>
-                                        添加车位
+                                        添加
                                     </button>
                                 </div>
                             </div>
@@ -146,4 +139,9 @@
                notifyLoadDataComponentName="listParkingSpace"
     ></vc:create>
 
+    <vc:create name="chooseParkingArea"
+               emitChooseParkingArea="listParkingSpace"
+               emitLoadData="listParkingSpace"
+    ></vc:create>
+
 </div>

WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.js

@@ -12,7 +12,8 @@
                 conditions: {
                     psId: '',
                     area: '',
-                    typeCd: ''
+                    paId:'',
+                    areaNum: ''
                 }
             }
         },
@@ -24,6 +25,17 @@
                 vc.component._listParkingSpaceData(DEFAULT_PAGE, DEFAULT_ROWS);
                 vc.component.listParkingSpaceInfo.num = '';
             });
+            vc.on('listParkingSpace', 'chooseParkingArea', function (_parkingArea) {
+                vc.component.listParkingSpaceInfo.conditions.paId = _parkingArea.paId;
+                vc.component.listParkingSpaceInfo.conditions.areaNum = _parkingArea.num;
+                vc.component.listParkingSpaceInfo.num = '';
+            });
+
+            vc.on('listParkingSpace', 'listParkingAreaData', function (_parkingArea) {
+                vc.component.listParkingSpaceInfo.conditions.paId = _parkingArea.paId;
+                vc.component._listParkingSpaceData(DEFAULT_PAGE, DEFAULT_ROWS);
+                vc.component.listParkingSpaceInfo.num = '';
+            });
             vc.on('pagination', 'page_event', function (_currentPage) {
                 vc.component._listParkingSpaceData(_currentPage, DEFAULT_ROWS);
             });
@@ -105,7 +117,10 @@
                 } else {
                     vc.component.listParkingSpaceInfo.moreCondition = true;
                 }
-            }
+            },
+            _openChooseParkingArea:function(){
+                vc.emit('chooseParkingArea','openChooseParkingAreaModel',{});
+            },
         }
     })
 })(window.vc);