房屋管理开发测试完成

WebService/src/main/resources/components/add-room/addRoom.js

@@ -211,6 +211,7 @@
                   builtUpArea:'',
                   unitPrice:'',
                   remark:'',
+                  state:'',
                   communityId:''
                 }
             }

WebService/src/main/resources/components/edit-room/editRoom.html

@@ -49,7 +49,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">房屋状态</label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addRoomInfo.state">
+                                    <select class="custom-select" v-model="editRoomInfo.state">
                                         <option selected disabled value="">必填，请选择房屋状态</option>
                                         <option value="2001">已出售</option>
                                         <option value="2002">未出售</option>

WebService/src/main/resources/components/edit-room/editRoom.js

@@ -115,7 +115,7 @@
                                     errInfo:"房间数必须为数字"
                                 }
                             ],
-                            'addRoomInfo.state':[
+                            'editRoomInfo.state':[
                                 {
                                     limit:"required",
                                     param:"",
@@ -213,6 +213,7 @@
                   apartment:'',
                   builtUpArea:'',
                   unitPrice:'',
+                  state:'',
                   remark:'',
                   communityId:''
                 }

WebService/src/main/resources/components/room/room.html

@@ -18,10 +18,10 @@
                             </select>
                         </div>
                         <div class="col-sm-3 m-b-xs">
-                            <select class="form-control-sm form-control input-s-sm inline" v-model="roomInfo.roomState">
+                            <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="2001">房屋已售</option>
+                                <option value="2002">房屋未售</option>
                                 <option value="2003">已交定金</option>
                                 <option value="2004">已出租</option>
                             </select>
@@ -86,7 +86,7 @@
                                 {{room.unitPrice}}
                             </td>
                             <td>
-                                {{room.state}}
+                                {{vc.component.showState(room.state)}}
                             </td>
                             <td>
                                 {{room.userName}}

WebService/src/main/resources/components/room/room.js

@@ -13,7 +13,7 @@
                 records:1,
                 floorId:'',
                 unitId:'',
-                roomState:'',
+                state:'',
                 roomNum:''
             }
         },
@@ -27,7 +27,7 @@
             vc.on('room','loadData',function(_param){
                 vc.component.roomInfo.floorId = _param.floorId;
                 vc.component.roomInfo.unitId = '';
-                vc.component.roomInfo.roomState = '';
+                vc.component.roomInfo.state = '';
                 vc.component.roomInfo.roomNum = '';
 
                 vc.component.listRoom(DEFAULT_PAGE,DEFAULT_ROW);
@@ -46,7 +46,7 @@
                         communityId:vc.getCurrentCommunity().communityId,
                         floorId:vc.component.roomInfo.floorId,
                         unitId:vc.component.roomInfo.unitId,
-                        roomState:vc.component.roomInfo.roomState,
+                        state:vc.component.roomInfo.state,
                         roomNum:vc.component.roomInfo.roomNum
 
                     }
@@ -117,6 +117,20 @@
             },
             queryRoomMethod:function(){
                 vc.component.listRoom(DEFAULT_PAGE,DEFAULT_ROW);
+            },
+            showState:function(_state){
+                if(_state == '2001'){
+                    return "房屋已售";
+                }else if(_state == '2002'){
+                    return "房屋未售";
+                }else if(_state == '2003'){
+                    return "已交定金";
+                }
+                else if(_state == '2004'){
+                    return "已出租";
+                }else{
+                    return "未知";
+                }
             }
         }
     });