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 | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 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 295e90c..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
@@ -11,25 +11,33 @@
</button>
</div>
</div>
- <div class="ibox-content">
+ <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-4">
<div class="form-group">
- <input type="text" placeholder="璇峰～鍐欒溅浣岻D" class="form-control form-control-sm"
- v-model="listParkingSpaceInfo.conditions.psId">
+ <input type="text" placeholder="璇峰～鍐欒溅浣嶇紪鍙�" class=" form-control" v-model="listParkingSpaceInfo.num">
</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>
- </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">
+ <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">
@@ -38,7 +46,14 @@
</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>
</div>
</div>
@@ -53,23 +68,14 @@
<form>
<div class="form-row">
- <div class="col-8 input-group input-group-sm">
- <input type="text" placeholder="璇峰～鍐欒溅浣嶇紪鍙�" class=" form-control" v-model="listParkingSpaceInfo.num">
- <div class="input-group-prepend">
- <button type="button" class="btn btn-primary btn-sm" v-on:click="queryParkingSpaceMethod()">
- <i class="glyphicon glyphicon-search"></i> 椹笂鏌ヨ</button>
- </div>
- </div>
-
<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>
</form>
-
</div>
</div>
@@ -80,13 +86,11 @@
<tr>
<th>杞︿綅ID</th>
<th data-hide="phone">杞︿綅缂栫爜</th>
- <th data-hide="phone">杞︿綅绫诲瀷</th>
+ <th data-hide="phone">鍋滆溅鍦篒D</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 class="text-right">鎿嶄綔</th>
-
</tr>
</thead>
<tbody>
@@ -99,7 +103,10 @@
{{parkingSpace.num}}
</td>
<td>
- {{parkingSpace.typeCd == '1001'?'鍦颁笂鍋滆溅浣�':'鍦颁笅鍋滆溅浣�'}}
+ {{parkingSpace.paId}}
+ </td>
+ <td>
+ {{parkingSpace.areaNum}}
</td>
<td>
{{vc.component._viewParkingSpaceState(parkingSpace.state)}}
@@ -107,13 +114,13 @@
<td>
{{parkingSpace.area}}
</td>
- <td>
- {{parkingSpace.userName}}
- </td>
- <td>
- {{parkingSpace.remark}}
- </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>
@@ -151,4 +158,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