Merge branch 'master' of http://gitlab.oytour.com/zk123/hotelproject

src/components/assetsman/RoomList.vue

@@ -116,13 +116,13 @@
                 placeholder="入力してください"
               ></el-input>
             </el-form-item>
-            <el-form-item label="" prop="HotelId">
+            <!-- <el-form-item label="" prop="HotelId">
               <span class="label">ホテル</span>
                 <el-select size="small" v-model="addMsg.HotelId" placeholder="ホテル" clearable filterable>
                   <el-option v-for="item in HotelList" :key="item.SID" :label="item.SHotelName" :value="item.SID">
                   </el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="" prop="RoomType">
               <span class="label">部屋のタイプ</span>
                 <el-select size="small" v-model="addMsg.RoomType" placeholder="部屋のタイプ" clearable filterable>
@@ -253,13 +253,14 @@
           ]
       },
 
-
+      HotelId:'',
       };
     },
     mounted() {
       
       if(this.$route.query.SID){
           this.msg.HotelId=Number(this.$route.query.SID);
+          this.HotelId=Number(this.$route.query.SID);
       }
       this.getList();
       this.getRoomType();
@@ -432,7 +433,7 @@
         this.addMsg={
           Id:0,
           RoomName:'',
-          HotelId:'',
+          HotelId:this.HotelId,
           RoomType:'',
           Money:'',
           CostPrice:'',