Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java

@@ -38,7 +38,7 @@ public class TpRentalHouseController extends BaseController{
             @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "houseTypeValue",value = "1:一室居 2:二室居 3:三室局 4:四室居及以上 5:不限"),
             @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "rentalPriceValue",value = "1:1000以内 2:1000-1500 3:1500-2000 4:2000-3000 5:3000-4000 6:4000以上 7:不限"),
             @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "priceFluctuateValue",value = "1:价格由低到高 2:价格由高到低  3:默认排序" ),
-            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "communityId",value = "小区编号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据")
     })

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServicelImpl.java

@@ -57,7 +57,7 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
     }
 
     @Override
-    public ResponseBean getRentalHouseDetails(UserElement userElement, String id) {
+    public ResponseBean  getRentalHouseDetails(UserElement userElement, String id) {
         ResponseBean response= new ResponseBean<>();
         TpRentalHouse tpRentalHouse = tpRentalHouseMapper.selectByPrimaryKey(Integer.valueOf(id));
         List<TpRentalHouseImg> tpRentalHouseImgList= tpRentalHouseImgMapper.selectRentalHouseImg(tpRentalHouse.getId(),2);
@@ -137,13 +137,6 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
         object.add(mapfive);
         object.add(mapSix);
         object.add(mapSeven);
-
-
-
-
-
-
-
         responseBean.addSuccess(object);
         return responseBean;
     }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/HotelController.java

@@ -1,8 +1,12 @@
 package com.community.huiju.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.model.HotelRoom;
+import com.community.huiju.service.IHotelRoomService;
 import com.community.huiju.model.Hotel;
 import com.community.huiju.service.IHotelService;
 import io.swagger.annotations.Api;
@@ -35,6 +39,10 @@ public class HotelController extends BaseController {
     @Autowired
     private IHotelService iHotelService;
 
+    @Autowired
+    private IHotelRoomService tpHotelRoomService;
+
+
     @ApiOperation(value = "房屋列表", notes = "房屋列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "roomNo:房间号" +
@@ -69,6 +77,50 @@ public class HotelController extends BaseController {
         ResponseBean  responseBean = iHotelService.hotelRoomAdd(parameter,userElement);
         return responseBean;
     }
+
+    @ApiOperation(value = "查询当前房间信息", notes = "查询当前房间信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID")})
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/getRoom", method = RequestMethod.POST)
+    public ResponseBean getRoom(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean= new ResponseBean<>();
+
+       JSONObject object= JSONObject.parseObject(parameter);
+        Integer id= object.getInteger("id");
+         HotelRoom totelRoom= tpHotelRoomService.getById(id);
+         responseBean.addSuccess(totelRoom);
+         return responseBean;
+    }
+    @ApiOperation(value = "编辑房间", notes = "编辑房间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID，roomNo:房间号" +
+                    "roomName:房间名称" +
+                    "price:价格" +
+                    "roomStatus:(1:是已上架 2:是已下架)" +
+                    "remark:(描述)"+
+                    "sort:权重")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/hotelRoomEdit", method = RequestMethod.POST)
+    public ResponseBean hotelRoomEdit(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iHotelService.hotelRoomEdit(parameter,userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改当前房间上架或下架状态", notes = "修改当前房间上架或下架状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID，roomStatus:(1:是已上架 2:是已下架)"
+            )})
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/hotelRoomRoomStatus", method = RequestMethod.POST)
+    public ResponseBean hotelRoomRoomStatus(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iHotelService.hotelRoomRoomStatus(parameter,userElement);
+        return responseBean;
+    }
     
     @ApiOperation(value = "根据小区获取酒店数据", notes = "根据搜索条件获取角色列表")
     @ApiImplicitParams({

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/HotelRoomMapper.java

@@ -28,5 +28,5 @@ public interface HotelRoomMapper extends BaseMapper<HotelRoom> {
      * @param communityId
      * @return
      */
-    IPage<HotelRoom> hotelRoomLiset(Page HotelRoom , @Param("hotelRoom") HotelRoom hotelRoom, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("communityId") Integer communityId);
+    IPage<HotelRoom> hotelRoomLiset(Page HotelRoom , @Param("hotelRoom") HotelRoom hotelRoom, @Param("beginTime")Date beginTime, @Param("endTime")Date endTime, @Param("communityId") Integer communityId);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/HotelRoom.java

@@ -1,6 +1,8 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -24,6 +26,9 @@ public class HotelRoom implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private  Integer id;
+
     /**
      * 小区ID
      */

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IHotelService.java

@@ -29,6 +29,22 @@ public interface IHotelService extends IService<Hotel> {
      * @return
      */
     ResponseBean hotelRoomAdd(String parameter , UserElement userElement);
+
+    /**
+     * 编辑房间
+     * @param parameter
+     * @param userElement
+     * @return
+     */
+    ResponseBean hotelRoomEdit(String parameter, UserElement userElement);
+
+    /**
+     * 修改上架或下架
+     * @param parameter
+     * @param userElement
+     * @return
+     */
+    ResponseBean hotelRoomRoomStatus(String parameter, UserElement userElement);
 	
 	/**
 	 * 根据小区id获取酒店信息

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/HotelServiceImpl.java

@@ -91,6 +91,29 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
     public ResponseBean hotelRoomAdd(String parameter, UserElement userElement) {
         ResponseBean response= new ResponseBean<>();
         HotelRoom hotelRoom= JSONObject.parseObject(parameter, HotelRoom.class);
+        // 查询当前房间名称是否重复
+        QueryWrapper<HotelRoom> HotelRoomName= new QueryWrapper<>();
+        HotelRoomName.eq("community_id",userElement.getCommunityId());
+        HotelRoomName.eq("room_name",hotelRoom.getRoomName());
+        List<HotelRoom> roomName= tpHotelRoomMapper.selectList(HotelRoomName);
+        if (null != roomName && roomName.size()>0){
+            response.addError("当前房间名称已存在");
+            return response;
+        }
+        // 查询当前房间编号是否重复
+        QueryWrapper<HotelRoom> HotelRoomQuery= new QueryWrapper<>();
+        HotelRoomQuery.eq("community_id",userElement.getCommunityId());
+        HotelRoomQuery.eq("room_no",hotelRoom.getRoomNo());
+        List<HotelRoom> RoomNo= tpHotelRoomMapper.selectList(HotelRoomQuery);
+        if (null != RoomNo && RoomNo.size()>0){
+            response.addError("当前房间号已存在");
+            return response;
+        }
+        // 判断价格是否存在
+        if (null == hotelRoom.getPrice()) {
+            response.addError("请输入房间价格");
+            return response;
+        }
         Hotel hotel= tpHotelMapper.selectHotel(userElement.getCommunityId());
         hotelRoom.setCommunityId(userElement.getCommunityId())
                 .setHotelId(hotel.getId())
@@ -101,6 +124,41 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
         response.addSuccess("成功");
         return response;
     }
+
+    @Override
+    public ResponseBean hotelRoomEdit(String parameter, UserElement userElement) {
+            ResponseBean response= new ResponseBean<>();
+            HotelRoom hotelRoom= JSONObject.parseObject(parameter, HotelRoom.class);
+            // 判断价格是否存在
+            if (null == hotelRoom.getPrice()) {
+                response.addError("请输入房间价格");
+                return response;
+            }
+            Hotel hotel= tpHotelMapper.selectHotel(userElement.getCommunityId());
+            hotelRoom.setCommunityId(userElement.getCommunityId())
+                    .setHotelId(hotel.getId())
+                    .setPrice(String.valueOf(hotelRoom.getPrice()))
+                    .setUpdateDate(LocalDateTime.now())
+                    .setUpdateUser(userElement.getId());
+            tpHotelRoomMapper.updateById(hotelRoom);
+            response.addSuccess("成功");
+            return response;
+        }
+
+    @Override
+    public ResponseBean hotelRoomRoomStatus(String parameter, UserElement userElement) {
+        ResponseBean responseBean= new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer id= object.getInteger("id");
+        String roomStatus= object.getString("roomStatus");
+        HotelRoom hotelRoom= tpHotelRoomMapper.selectById(id);
+        hotelRoom.setRoomStatus(roomStatus);
+        hotelRoom.setUpdateDate(LocalDateTime.now());
+        hotelRoom.setUpdateUser(userElement.getId());
+        tpHotelRoomMapper.updateById(hotelRoom);
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
     
     /**
      * 根据小区id获取酒店信息

CODE/smart-community/property-api/src/main/resources/mapper/HotelRoomMapper.xml

@@ -10,15 +10,15 @@
                 AND  room_no like concat('%',#{hotelRoom.roomNo},'%')
             </if>
             <if test="hotelRoom.roomName !=null and hotelRoom.roomName !=''">
-                AND room_name = #{hotelRoom.roomName}
+                AND  room_name like concat('%',#{hotelRoom.roomName},'%')
             </if>
             <if test="hotelRoom.price !=null and hotelRoom.price !=''">
                 AND price = #{hotelRoom.price}
             </if>
             <if test="hotelRoom.roomStatus !=null and hotelRoom.roomStatus !=''">
-                AND room_no = #{hotelRoom.roomStatus}
+                AND room_status = #{hotelRoom.roomStatus}
             </if>
-            <if test="beginTime !=null and beginTime !='' and endTime !=null and endTime !=''">
+            <if test="beginTime !=null  and endTime !=null ">
                 AND date_format(create_date, '%Y-%m-%d') <![CDATA[>= ]]> date_format(#{beginTime}, '%Y-%m-%d')
                 AND date_format(create_date, '%Y-%m-%d')<![CDATA[<= ]]> date_format(#{endTime}, '%Y-%m-%d')
             </if>

VUECODE/smart-property-manage/src/api/grogshop.js

@@ -11,7 +11,9 @@ export function hotelRoom(data) {
       roomStatus: data.roomStatus,
       beginTime: data.beginTime,
       endTime: data.endTime,
-      sort: data.sort
+      sort: data.sort,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
     }
   })
 }
@@ -29,7 +31,40 @@ export function hotelRoomAdd(data) {
     }
   })
 }
-
+export function hotelRoomEdit(data) {
+  return request({
+    url: '/hotelRoomEdit',
+    method: 'post',
+    data: {
+      id: data.id,
+      roomNo: data.roomNo,
+      roomName: data.roomName,
+      price: data.price,
+      roomStatus: data.roomStatus,
+      sort: data.sort,
+      remark: data.remark
+    }
+  })
+}
+export function getRoomId(data) {
+  return request({
+    url: '/getRoom',
+    method: 'post',
+    data: {
+      id: data.id
+    }
+  })
+}
+export function hotelRoomRoomStatus(data) {
+  return request({
+    url: '/hotelRoomRoomStatus',
+    method: 'post',
+    data: {
+      id: data.id,
+      roomStatus: data.roomStatus
+    }
+  })
+}
 export function updateHotel(data) {
   return request({
     url: '/addHotel',
@@ -37,7 +72,6 @@ export function updateHotel(data) {
     data: data
   })
 }
-
 export function getHotelData(data) {
   return request({
     url: '/getHotelData',

VUECODE/smart-property-manage/src/router/index.js

@@ -495,6 +495,13 @@ export const constantRouterMap = [
         name: 'grogshop-grogshopRoomAdd',
         hidden: true,
         meta: { title: '新增房间', icon: 'table' }
+      },
+      {
+        path: '/grogshop/grogshopRoomEdit',
+        component: () => import('@/views/grogshop/grogshopRoomEdit'),
+        name: 'grogshop-grogshopRoomEdit',
+        hidden: true,
+        meta: { title: '编辑房间', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/modules/grogshop.js

@@ -1,4 +1,5 @@
-import { hotelRoom, hotelRoomAdd, getHotelData, updateHotel } from '@/api/grogshop'
+
+import { hotelRoom, hotelRoomAdd, hotelRoomEdit, getRoomId, hotelRoomRoomStatus, getHotelData, updateHotel } from '@/api/grogshop'
 
 const grogshop = {
   actions: {
@@ -20,6 +21,16 @@ const grogshop = {
         })
       })
     },
+
+    HotelRoomEdit({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        hotelRoomEdit(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     GetHotelData({ commit }, data) {
       return new Promise((resolve, reject) => {
         getHotelData(data).then(response => {
@@ -29,6 +40,24 @@ const grogshop = {
         })
       })
     },
+    GetRoomId({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        getRoomId(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    HotelRoomRoomStatus({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        hotelRoomRoomStatus(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     UpdateHotel({ commit }, data) {
       return new Promise((resolve, reject) => {
         updateHotel(data).then(response => {

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoom.vue

@@ -36,9 +36,9 @@
 
       <el-row>
       <el-button type="success" @click="addHotelRoom()">新增</el-button>
-      <el-button type="info">编辑</el-button>
-       <el-button type="primary">上架状态</el-button>
-      <el-button type="danger">下架房间</el-button>
+      <el-button type="info" @click="addHotelEndit()">编辑</el-button>
+       <el-button type="primary" @click="addHotelEnditRoom(1)">上架房间</el-button>
+      <el-button type="danger" @click="addHotelEnditRoom(2)">下架房间</el-button>
       </el-row>
 
     </el-form>
@@ -54,10 +54,16 @@
         type="selection"
         width="55"/>
       <el-table-column prop="roomNo" label="编号" align="center"/>
-      <el-table-column prop="roomName" label="房间名称" align="center"/>
+      <el-table-column prop="roomName" label="房间名称" align="center">
+         <template slot-scope="scope" >
+        <a :title="scope.row.roomName" @click="clickTitle(scope.row.id)" style="color: #009FCC">
+           {{ scope.row.roomName}}
+        </a>
+      </template>
+      </el-table-column>
       <el-table-column prop="sort" label="权重" align="center"/>
       <el-table-column prop="price" label="房间价格" align="center"/>
-      <el-table-column prop="roomStatus" label="上架状态" align="center"/>
+      <el-table-column prop="roomStatus" label="上架状态" align="center"><template slot-scope="scope">{{ scope.row.roomStatus=='1'?'已上架':'已下架' }}</template></el-table-column>
       <el-table-column prop="editUser" label="编辑人" align="center"/>
       <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
 
@@ -134,10 +140,12 @@ export default {
       this.dataQuery()
     },
     handleFilter() {
-      this.listQuery.messageContent = ''
-      this.listQuery.status = ''
-      this.listQuery.messageType = ''
-      this.listQuery.dataValue = ''
+      this.listQuery.price = ''
+      this.listQuery.roomName = ''
+      this.listQuery.roomNo = ''
+      this.listQuery.roomStatus = ''
+      this.listQuery.endTime = ''
+      this.listQuery.beginTime = ''
       this.listQuery.pageNum = 1
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 10
@@ -172,9 +180,43 @@ export default {
     addHotelRoom(){
       this.$router.push({ name: 'grogshop-grogshopRoomAdd' })
     },
+    addHotelEndit(){
+      const ids = this.deleteIds
+      if (ids.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      console.log(ids[0])
+       this.$router.push({ name: 'grogshop-grogshopRoomEdit', query: { id: ids[0] }})
+      
+      
+      
+    },
+    clickTitle(ids){
+    this.$router.push({ name: 'grogshop-grogshopRoomEdit', query: { id: ids}})
+    },
+    addHotelEnditRoom(ides){
+       const SID = this.deleteIds
+      if (SID.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      console.log('ides',ides)
+        const ids = this.deleteIds[0]
+         this.listQuery.id = ids
+         this.listQuery.roomStatus = ides
+         this.$store.dispatch('HotelRoomRoomStatus', this.listQuery).then((res) => {
+         this.$message({
+          message: '成功',
+          type: 'success'
+         })
+        this.listQuery.roomStatus = ''
+        this.dataQuery()   
+      }).catch(() => {
+        console.log('error HotelRoom')
+      })
+    }
   }
-
-
 }
 </script>
 

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomAdd.vue

@@ -23,7 +23,7 @@
         <el-input v-model="ruleForm.sort" placeholder="权重"/>
       </el-form-item>  
       <el-form-item>
-        <el-button type="primary" @click="submitForm()">立即创建</el-button>
+        <el-button type="primary" @click="submitForm()">保存</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -58,21 +58,29 @@ export default {
   },
   methods: {
     submitForm(){
-      if(this.ruleForm.roomNo =='null'){
+      if(this.ruleForm.roomNo ===''){
         this.$message.error('请输入房间号');
+        return
       }
-      if(this.ruleForm.roomName =='null'){
+      if(this.ruleForm.roomName ===''){
         this.$message.error('请输入房间名称');
+        return
       }
-      if(this.ruleForm.roomNo =='null'){
-        this.$message.error('请输入房间号');
+      if(this.ruleForm.price ===''){
+        this.$message.error('房间价格');
+        return
       }
+    
       this.$store.dispatch('HotelRoomAdd', this.ruleForm).then((res) => {
+        if(res.code === '1'){
+          this.$message.error(res.message);
+        }else{
         this.$router.push({ name: 'grogshop-grogshopRoom' })
          this.$message({
           message: '新增房间成功',
           type: 'success'
-        });
+         })
+        }
       }).catch(() => {
         console.log('error HotelRoom')
       })

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomEdit.vue

@@ -0,0 +1,116 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm"  label-width="100px" class="demo-ruleForm">
+      <el-form-item label="房间名称" >
+        <el-input v-model="ruleForm.roomName" placeholder="房间名称"/>
+      </el-form-item>
+       <el-form-item label="房间号" >
+        <el-input v-model="ruleForm.roomNo" placeholder="房间号"/>
+      </el-form-item>
+     <el-form-item class="filter-item" label="房间描述" prop="remark" >
+        <el-input v-model.trim="ruleForm.remark" placeholder="房间描述"/>
+      </el-form-item>
+      <el-form-item label="房间价格">
+        <el-input v-model="ruleForm.price" placeholder="房间价格"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="上架状态">
+        <el-select v-model="ruleForm.roomStatus" placeholder="上架">
+         <el-option label="上架" value="1"/>
+         <el-option label="下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="ruleForm.sort" placeholder="权重"/>
+      </el-form-item>  
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+            id:'',
+            price: '',
+           remark: '',
+         roomName: '',
+       roomStatus: '',
+             sort: '',
+           roomNo: ''
+      }
+      // rules: {
+      //   userName: [
+      //     { required: true, message: '请输入姓名', trigger: 'blur' }
+      //   ],
+      //   price: [
+      //     { required: true, message: '请输入价格', trigger: 'blur' }
+      //   ],
+      //   menuArray: [
+      //     { required: true, message: '请选择角色', trigger: 'blur' }
+      //   ],       
+      // }
+    }
+  },
+  mounted() {
+    this.getRoom(this.$route.query.id)
+  },
+  methods: {
+    submitForm(){
+      if(this.ruleForm.roomNo ===''){
+        this.$message.error('请输入房间号');
+        return
+      }
+      if(this.ruleForm.roomName ===''){
+        this.$message.error('请输入房间名称');
+        return
+      }
+      if(this.ruleForm.price ===''){
+        this.$message.error('房间价格');
+        return
+      }
+    
+      this.$store.dispatch('HotelRoomEdit', this.ruleForm).then((res) => {
+        if(res.code === '1'){
+          this.$message.error(res.message);
+        }else{
+        this.$router.push({ name: 'grogshop-grogshopRoom' })
+         this.$message({
+          message: '修改房间成功',
+          type: 'success'
+         })
+        }
+      }).catch(() => {
+        console.log('error HotelRoom')
+      })
+    },
+    getRoom(id){
+      console.log('id',id)
+      this.ruleForm.id = id
+      console.log('this.ruleForm.id',this.ruleForm.id)
+      this.$store.dispatch('GetRoomId', this.ruleForm).then((res) => {
+      this.ruleForm.roomName = res.data.roomName
+      this.ruleForm.roomNo = res.data.roomNo
+      this.ruleForm.roomStatus = res.data.roomStatus
+      this.ruleForm.sort = res.data.sort
+      this.ruleForm.remark = res.data.remark
+      this.ruleForm.price = res.data.price
+      }).catch(() => {
+        console.log('error GetRoomId')
+      })
+    }
+   }
+  }
+</script>
+
+<style scoped>
+.demo-ruleForm {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>