From e64168261c38f090b74b41b386ecdf6becdafd48 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 25 一月 2020 13:50:43 +0800
Subject: [PATCH] 加入停车场选择

---
 WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html |   42 ++++++++++++++++++++----------------------
 1 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html b/WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html
index 401b038..effb56a 100644
--- a/WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html
+++ b/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="璇峰~鍐欒溅浣岻D" 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">
@@ -38,14 +39,6 @@
                                     class="glyphicon glyphicon-search"></i> 鏌ヨ
                             </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>
@@ -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>
\ No newline at end of file

--
Gitblit v1.8.0