From 69e2baf5518079bfc16cfadc2fb29842fb3de85d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 14 一月 2020 21:02:48 +0800
Subject: [PATCH] 加入userName
---
WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.html | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 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..9f0a749 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,7 +11,7 @@
</button>
</div>
</div>
- <div class="ibox-content">
+ <div class="ibox-content" >
<div class="row">
<div class="col-sm-4">
<div class="form-group">
@@ -24,6 +24,7 @@
v-model="listParkingSpaceInfo.conditions.typeCd">
<option selected value="">璇烽�夋嫨鐘舵��</option>
<option value="1001">鍦颁笂鍋滆溅</option>
+ <option value="2001">鍦颁笅鍋滆溅</option>
</select>
</div>
<div class="col-sm-4">
@@ -38,7 +39,14 @@
</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>
@@ -53,14 +61,6 @@
<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>
@@ -83,10 +83,7 @@
<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,19 +96,13 @@
{{parkingSpace.num}}
</td>
<td>
- {{parkingSpace.typeCd == '1001'?'鍦颁笂鍋滆溅浣�':'鍦颁笅鍋滆溅浣�'}}
+ {{vc.component._viewParkingTypeCd(parkingSpace.typeCd)}}
</td>
<td>
{{vc.component._viewParkingSpaceState(parkingSpace.state)}}
</td>
<td>
{{parkingSpace.area}}
- </td>
- <td>
- {{parkingSpace.userName}}
- </td>
- <td>
- {{parkingSpace.remark}}
</td>
<td class="text-right">
<div class="btn-group">
--
Gitblit v1.8.0