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

src/components/assetsman/RoomList.vue

@@ -123,10 +123,6 @@
             <el-form-item label="" prop="RoomName" title="房间名称">
               <span class="label">部屋の説明</span>
               <el-input size="small" v-model="addMsg.RoomName" placeholder="入力してください"></el-input>
-              <!-- <el-select size="small" v-model="addMsg.RoomName" placeholder="部屋のタイプ" clearable filterable>
-                <el-option v-for="item in dataList" :key="item.RoomName" :label="item.RoomName" :value="item.RoomName">
-                </el-option>
-              </el-select> -->
             </el-form-item>
             <el-form-item label="" prop="RoomType" title="房间类型">
               <span class="label">部屋の名前</span>
@@ -135,17 +131,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label=""  title="价格" style="display:none;">
-              <span class="label">販売価格</span>
-              <el-input size="mini" @keyup.native="checkInteger(addMsg,'Money')" v-model="addMsg.Money"
-                placeholder="入力してください"></el-input>
-            </el-form-item>
-            <el-form-item label=""  title="成本价" style="display:none;">
-              <span class="label">原価</span>
-              <el-input @keyup.native="checkInteger(addMsg,'CostPrice')" size="mini" v-model="addMsg.CostPrice"
-                placeholder="入力してください"></el-input>
-            </el-form-item> -->
-            
+ 
             <el-form-item label="" title="床型" prop="BedType">
               <span class="label">部屋タイプ</span>
               <el-input size="mini" v-model="addMsg.BedType" placeholder="入力してください"></el-input>
@@ -154,7 +140,7 @@
               <span class="label">部屋の面積</span>
               <el-input size="mini" v-model="addMsg.Area" placeholder="入力してください"></el-input>
             </el-form-item>
-            <el-form-item label="" title="是否可加床1是2否">
+            <el-form-item label="" title="是否可加床1是2否" style="display:none;">
               <span class="label">ベット同伴（はい、いいえ）</span>
               <el-select size="small" v-model="addMsg.IsExtraBed" placeholder="選んでください" filterable>
                 <el-option label="は" :value="1"></el-option>
@@ -171,7 +157,7 @@
                 <el-option v-for="(item,index) in wifiList" :key="index" :label="item.Name" :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="" title="楼层">
+            <el-form-item label="" title="楼层" style="display:none;">
               <span class="label">フロア</span>
               <el-input size="mini" v-model="addMsg.Floor" @keyup.native="checkInteger(addMsg,'Floor')" placeholder="入力してください"></el-input>
             </el-form-item>
@@ -197,7 +183,7 @@
               <span class="label">屋外の景観</span>
               <el-input size="mini" v-model="addMsg.Landscape" placeholder="入力してください"></el-input>
             </el-form-item>
-            <el-form-item label="" title="窗型">
+            <el-form-item label="" title="窗型" style="display:none;">
               <span class="label">窓型</span>
               <el-input size="mini" v-model="addMsg.WindoWCut" placeholder="入力してください"></el-input>
             </el-form-item>
@@ -455,7 +441,6 @@
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data.pageData;
               this.total = res.data.data.count;
-              console.log(this.dataList,'datalist');
             } else {
               this.Error(res.data.message);
             }
@@ -620,7 +605,6 @@
       },
       //修改
       Edit(item) {
-        console.log(item,'itemmm');
         this.addMsg = {
           Id: item.Id,
           RoomName: item.RoomName,