From b3f85b60ba9e39572e686009d36b5e5d7e81e910 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 七月 2019 20:30:10 +0800
Subject: [PATCH] 合并远程信息

---
 WebService/src/main/resources/components/room/room.html |   97 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 74 insertions(+), 23 deletions(-)

diff --git a/WebService/src/main/resources/components/room/room.html b/WebService/src/main/resources/components/room/room.html
index ec21f8b..5310b31 100644
--- a/WebService/src/main/resources/components/room/room.html
+++ b/WebService/src/main/resources/components/room/room.html
@@ -1,56 +1,103 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
+<div id="component">
+    <vc:create name="roomSelectFloor"
+               openAddRoomModelName="addRoom"
+    ></vc:create>
     <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-primary btn-sm" v-on:click="_openAddRoomModal()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            娣诲姞鎴垮眿
-                        </button>
-                    </div>
                 </div>
                 <div class="ibox-content">
 
-                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                    <div class="row">
+                        <div class="col-sm-4 m-b-xs">
+                            <select class="form-control-sm form-control input-s-sm inline" v-model="roomInfo.unitId">
+                                <option selected  value="">璇烽�夋嫨鍗曞厓</option>
+                                <option v-for="(unit,index) in roomUnits" :key="index" v-bind:value="unit.unitId">{{unit.unitNum}}鍗曞厓</option>
+                            </select>
+                        </div>
+                        <div class="col-sm-3 m-b-xs">
+                            <select class="form-control-sm form-control input-s-sm inline" v-model="roomInfo.state">
+                                <option selected  value="">璇烽�夋嫨鐘舵��</option>
+                                <option value="2001">鎴垮眿宸插敭</option>
+                                <option value="2002">鎴垮眿鏈敭</option>
+                                <option value="2003">宸蹭氦瀹氶噾</option>
+                                <option value="2004">宸插嚭绉�</option>
+                            </select>
+                        </div>
+
+                        <div class="col-sm-3">
+                            <div class="input-group">
+                                <input type="text" placeholder="璇峰~鍐欐埧灞嬬紪鍙�" class="form-control form-control-sm" v-model="roomInfo.roomNum">
+                            </div>
+
+                        </div>
+
+                        <div class="col-sm-2">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="queryRoomMethod()">
+                                <i class="glyphicon glyphicon-search"></i> 椹笂鏌ヨ</button>
+                        </div>
+
+                        </div>
+
+                    <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
                         <thead>
                         <tr>
                             <th>鎴垮眿ID</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,tablet" >鍩庡競缂栫爜</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 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 data-hide="phone">澶囨敞</th>
                             <th class="text-right">鎿嶄綔</th>
 
                         </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="room in roomInfo.roomDataInfo">
+                        <tr v-for="room in roomInfo.rooms">
                             <td>
-                                {{room.communityId}}
+                                {{room.roomId}}
                             </td>
                             <td>
-                                {{room.name}}
+                                {{room.roomNum}}
                             </td>
                             <td>
-                                {{room.tel}}
+                                {{room.unitNum}}
                             </td>
                             <td>
-                                {{room.address}}
+                                {{room.layer}}
                             </td>
                             <td>
-                                {{room.nearbyLandmarks}}
+                                {{room.section}}
                             </td>
                             <td>
-                                {{room.cityCode}}
+                                {{room.apartment}}
                             </td>
                             <td>
-                                {{room.statusCd}}
+                                {{room.builtUpArea}}
+                            </td>
+                            <td>
+                                {{room.unitPrice}}
+                            </td>
+                            <td>
+                                {{vc.component.showState(room.state)}}
+                            </td>
+                            <td>
+                                {{room.userName}}
+                            </td>
+                            <td>
+                                {{room.remark}}
                             </td>
                             <td class="text-right">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openEditRoomModel(room)">淇敼</button>
+                                </div>
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openDelRoomModel(room)">鍒犻櫎</button>
                                 </div>
@@ -65,10 +112,14 @@
                         </tr>
                         </tfoot>
                     </table>
+                    <!-- 鍒嗛〉 -->
+                    <vc:create name="pagination"></vc:create>
 
                 </div>
             </div>
         </div>
     </div>
-
+    <!-- 鍒犻櫎鍛樺伐鏉冮檺 -->
+    <vc:create name="editRoom"></vc:create>
+    <vc:create name="deleteRoom"></vc:create>
 </div>
\ No newline at end of file

--
Gitblit v1.8.0