From 439a08ee2116a85372091e2b73b44d9033ec77d7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 29 十一月 2019 12:43:45 +0800
Subject: [PATCH] 优化单元显示处理问题
---
WebService/src/main/resources/components/unitPackage/unit-manage/unit.html | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/WebService/src/main/resources/components/unitPackage/unit-manage/unit.html b/WebService/src/main/resources/components/unitPackage/unit-manage/unit.html
index 94840a0..ca9bda1 100644
--- a/WebService/src/main/resources/components/unitPackage/unit-manage/unit.html
+++ b/WebService/src/main/resources/components/unitPackage/unit-manage/unit.html
@@ -1,14 +1,14 @@
<div id="component">
<!--<vc:create name="unitSelectFloor"></vc:create>-->
- <!--<div class="row">
+ <div class="row">
<div class="col-lg-12">
<div class="ibox ">
<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()">鏇村
+ v-on:click="_moreCondition()">{{unitInfo.moreCondition == true?'闅愯棌':'鏇村'}}
</button>
</div>
</div>
@@ -16,14 +16,17 @@
<div class="row">
<div class="col-sm-4">
- <input type="text" placeholder="璇烽�夋嫨妤兼爧"
- v-model="unitInfo.conditions.floorName" class=" form-control">
- <div class="input-group-prepend">
- <button type="button" class="btn btn-primary btn-sm"
- v-on:click="_openChooseFloorMethod()"><i
- class="glyphicon glyphicon-search"></i> 閫夋嫨
- </button>
+ <div class="form-group input-group">
+ <input type="text" placeholder="璇烽�夋嫨妤兼爧"
+ v-model="unitInfo.conditions.floorName" class=" form-control">
+ <div class="input-group-prepend">
+ <button type="button" class="btn btn-primary btn-sm"
+ v-on:click="_openChooseFloorMethod()"><i
+ class="glyphicon glyphicon-search"></i> 閫夋嫨
+ </button>
+ </div>
</div>
+
</div>
<div class="col-sm-3">
<div class="form-group">
@@ -57,7 +60,7 @@
</div>
</div>
</div>
- </div>-->
+ </div>
<div class="row">
@@ -67,7 +70,7 @@
<h5>鍗曞厓淇℃伅</h5>
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm"
- v-if="unitInfo銆俢onditions.floorId != null && unitInfo銆俢onditions.floorId != ''"
+ v-if="unitInfo.conditions.floorId != null && unitInfo.conditions.floorId != ''"
style="margin-left:10px" v-on:click="openAddUnitModel()">
<i class="glyphicon glyphicon-plus"></i> 娣诲姞鍗曞厓
</button>
@@ -83,7 +86,6 @@
<th data-hide="phone">鎬诲眰鏁�</th>
<th data-hide="phone">鏄惁鏈夌數姊�</th>
<th data-hide="phone,tablet">鍒涘缓浜�</th>
- <th data-hide="phone">澶囨敞</th>
<th class="text-right">鎿嶄綔</th>
</tr>
@@ -104,9 +106,6 @@
</td>
<td>
{{unit.userName}}
- </td>
- <td>
- {{unit.remark}}
</td>
<td class="text-right">
<div class="btn-group">
--
Gitblit v1.8.0