From ecdac8a738f254db2b2ea28cbe3248f7a6a7eb2b Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期五, 06 三月 2020 16:18:27 +0800
Subject: [PATCH] 优化采购申请组件

---
 WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 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 effb56a..091be37 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,7 +6,9 @@
                 <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" >
@@ -23,21 +25,33 @@
                                 </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-4">
                             <div class="form-group">
                                 <input type="text" placeholder="璇峰~鍐欒溅浣嶇紪鍙�" class=" form-control" v-model="listParkingSpaceInfo.num">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <select class="custom-select" v-model="listParkingSpaceInfo.conditions.state">
+                                    <option selected value="">蹇呭~锛岃閫夋嫨杞︿綅鐘舵��</option>
+                                    <option value="S">鍑哄敭</option>
+                                    <option value="H">鍑虹</option>
+                                    <option value="F">绌洪棽</option>
+                                </select>
                             </div>
                         </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryRoomMethod()"><i
                                     class="glyphicon glyphicon-search"></i> 鏌ヨ
                             </button>
+                        </div>
+                    </div>
+                    <div class="row" v-if="listParkingSpaceInfo.moreCondition == true">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇峰~鍐欒溅浣岻D" class="form-control form-control-sm"
+                                       v-model="listParkingSpaceInfo.conditions.psId">
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -62,7 +76,6 @@
                                 </div>
                             </div>
                         </form>
-
 
                     </div>
                 </div>
@@ -102,6 +115,12 @@
                                 {{parkingSpace.area}}
                             </td>
                             <td class="text-right">
+                                <div class="btn-group" v-if="parkingSpace.state =='F'">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openToHireParkingSpaceModel(parkingSpace)">鍑虹</button>
+                                </div>
+                                <div class="btn-group" v-if="parkingSpace.state =='F'">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openToSellParkingSpaceModel(parkingSpace)">鍑哄敭</button>
+                                </div>
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditParkingSpaceModel(parkingSpace)">淇敼</button>
                                 </div>

--
Gitblit v1.8.0