From ea4e931b3e06e4abcd31d74de9e90fa0a8998f3a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 02 十月 2019 23:50:53 +0800
Subject: [PATCH] 业主报修功能开发完成

---
 WebService/src/main/resources/components/unitPackage/unit-manage/unit.html |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 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 55c59f6..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,4 +1,4 @@
-<div id="component" >
+<div id="component">
     <!--<vc:create name="unitSelectFloor"></vc:create>-->
 
     <div class="row">
@@ -7,23 +7,26 @@
                 <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()">鏇村
-                         </button>
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                                v-on:click="_moreCondition()">{{unitInfo.moreCondition == true?'闅愯棌':'鏇村'}}
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <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">
@@ -39,7 +42,7 @@
                         </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryUnitMethod()"><i
-                                    class="glyphicon glyphicon-search" ></i> 鏌ヨ
+                                    class="glyphicon glyphicon-search"></i> 鏌ヨ
                             </button>
                         </div>
 
@@ -54,7 +57,6 @@
                         </div>
                     </div>
 
-
                 </div>
             </div>
         </div>
@@ -68,9 +70,10 @@
                     <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>
+                            <i class="glyphicon glyphicon-plus"></i> 娣诲姞鍗曞厓
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
@@ -82,8 +85,7 @@
                             <th data-hide="phone">鍗曞厓缂栧彿</th>
                             <th data-hide="phone">鎬诲眰鏁�</th>
                             <th data-hide="phone">鏄惁鏈夌數姊�</th>
-                            <th data-hide="phone,tablet" >鍒涘缓浜�</th>
-                            <th data-hide="phone">澶囨敞</th>
+                            <th data-hide="phone,tablet">鍒涘缓浜�</th>
                             <th class="text-right">鎿嶄綔</th>
 
                         </tr>
@@ -105,15 +107,14 @@
                             <td>
                                 {{unit.userName}}
                             </td>
-                            <td>
-                                {{unit.remark}}
-                            </td>
                             <td class="text-right">
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditUnitModel(unit)">淇敼</button>
+                                    <button class="btn-white btn btn-xs" v-on:click="_openEditUnitModel(unit)">淇敼
+                                    </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteUnitModel(unit)">鍒犻櫎</button>
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteUnitModel(unit)">鍒犻櫎
+                                    </button>
                                 </div>
                             </td>
                         </tr>

--
Gitblit v1.8.0