From 4a6cf568060b5cdb272596ff80889189763280a9 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 17 May 2020 16:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=BF=E5=B1=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/editRoom/editRoom.html           |  8 ++++++--
 public/pages/property/room/room.html          | 20 +++++++++----------
 public/pages/property/room/room.js            |  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/public/components/property/editRoom/editRoom.html b/public/components/property/editRoom/editRoom.html
index b3aab1a30..2ff4eda48 100644
--- a/public/components/property/editRoom/editRoom.html
+++ b/public/components/property/editRoom/editRoom.html
@@ -6,6 +6,10 @@
                 <div class="ibox-content">
                     <div>
                         <div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">房屋ID</label>
+                                <div class="col-sm-10"><input v-model="editRoomInfo.roomId" disabled="disabled" type="text" placeholder="必填，请填写房屋编号" class="form-control"></div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">房屋编号</label>
                                 <div class="col-sm-10"><input v-model="editRoomInfo.roomNum" type="text" placeholder="必填，请填写房屋编号" class="form-control"></div>
@@ -71,8 +75,8 @@
                                 <div class="col-sm-10">
                                     <select class="custom-select" disabled="disabled" readonly="true" v-model="editRoomInfo.state">
                                         <option selected  value="">必填，请选择房屋状态</option>
-                                        <option value="2001">已出售</option>
-                                        <option value="2002">未出售</option>
+                                        <option value="2001">已入住</option>
+                                        <option value="2002">未入住</option>
                                         <option value="2003">已交定金</option>
                                         <option value="2004">已出租</option>
                                     </select>
diff --git a/public/pages/property/room/room.html b/public/pages/property/room/room.html
index 466dbf697..58fecc1c5 100644
--- a/public/pages/property/room/room.html
+++ b/public/pages/property/room/room.html
@@ -102,7 +102,7 @@
                            data-page-size="10">
                         <thead>
                         <tr>
-                            <th>房屋ID</th>
+                            <!-- <th>房屋ID</th> -->
                             <th data-hide="phone">楼栋编号</th>
                             <th data-hide="phone">单元</th>
                             <th data-hide="phone">房屋编号</th>
@@ -118,29 +118,29 @@
                         </thead>
                         <tbody>
                         <tr v-for="room in roomInfo.rooms">
-                            <td>
+                            <!-- <td>
                                 {{room.roomId}}
+                            </td> -->
+                            <td>
+                                {{room.floorNum}}号楼
                             </td>
                             <td>
-                                {{room.floorNum}}
+                                {{room.unitNum}}单元
                             </td>
                             <td>
-                                {{room.unitNum}}
+                                {{room.roomNum}}室
                             </td>
                             <td>
-                                {{room.roomNum}}
-                            </td>
-                            <td>
-                                {{room.layer}}
+                                {{room.layer}}层
                             </td>
                             <!--<td>
                                 {{room.apartment}}
                             </td>-->
                             <td>
-                                {{room.builtUpArea}}
+                                {{room.builtUpArea}}平方米
                             </td>
                             <td>
-                                {{room.unitPrice != '0.00'?room.unitPrice:'0'}}
+                                {{room.unitPrice != '0.00'?room.unitPrice:'0'}}元
                             </td>
                             <td>
                                 {{vc.component.showState(room.state)}}
diff --git a/public/pages/property/room/room.js b/public/pages/property/room/room.js
index 3bc32b6b2..462ef3b8a 100644
--- a/public/pages/property/room/room.js
+++ b/public/pages/property/room/room.js
@@ -130,9 +130,9 @@
             },
             showState:function(_state){
                 if(_state == '2001'){
-                    return "房屋已售";
+                    return "已入住";
                 }else if(_state == '2002'){
-                    return "房屋未售";
+                    return "未入驻";
                 }else if(_state == '2003'){
                     return "已交定金";
                 }