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 |   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 f5c66dc..ca9bda1 100644
--- a/WebService/src/main/resources/components/unitPackage/unit-manage/unit.html
+++ b/WebService/src/main/resources/components/unitPackage/unit-manage/unit.html
@@ -8,7 +8,7 @@
                     <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">
@@ -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">
@@ -134,14 +133,14 @@
         </div>
     </div>
 
-    <!--<vc:create name="searchFloor"
+    <vc:create name="searchFloor"
                emitChooseFloor="unit"
                emitLoadData="unit"
     ></vc:create>
     <vc:create name="addUnit"
                callBackListener=""
                callBackFunction=""
-    ></vc:create>-->
+    ></vc:create>
     <!-- 鍒犻櫎鍛樺伐鏉冮檺 -->
     <vc:create name="editUnit"></vc:create>
     <vc:create name="deleteUnit"></vc:create>

--
Gitblit v1.8.0