update

src/components/assetsman/RoomList.vue

@@ -95,12 +95,14 @@
               <span v-if="item.WindoWCut && item.WindoWCut!=''">、窓型:{{item.WindoWCut}}</span>
               <span v-if="item.Landscape && item.Landscape!=''">、屋外景観:{{item.Landscape}}</span>
               <span v-if="item.BedType && item.BedType!=''">、ベッド型:{{item.BedType}}</span>
-              <span v-if="item.BroadBand && item.BroadBand!=''">、ブロードバンド:{{item.BroadBand}}</span>
-              <span>、加床可能かどうか:<span v-if="item.BroadBand==1">は</span><span v-if="item.BroadBand==2">いいえ</span></span>
+              <span v-if="item.BroadBandName && item.BroadBandName!=''">、ブロードバンド:{{item.BroadBandName}}</span>
+              <span>、加床可能かどうか:<span v-if="item.IsExtraBed==1">は</span><span v-if="item.IsExtraBed==2">いいえ</span></span>
               <span v-if="item.ExtraBedMoney && item.ExtraBedMoney!=''">、プレス価格:{{item.ExtraBedMoney}}（ベッド/毎夜）</span>
               <span>喫煙室かどうか:<span v-if="item.IsSmoke==1">は</span><span v-if="item.IsSmoke==2">いいえ</span></span>
-              <span v-if="item.Meals && item.Meals!=''">、食事:{{item.Meals}}</span>
-              <span v-if="item.RoomFacility && item.RoomFacility!=''">、客室施設:{{item.RoomFacility}}</span>
+              <span v-if="item.MealsName && item.MealsName!=''">、食事:{{item.MealsName}}</span>
+              <span v-if="item.RoomFacility && item.RoomFacility!=''">,客室施設:
+                <span v-for="name in item.FacilityList">{{name.HName}} </span>
+              </span>
             </td>
           </tr>
         </tbody>
@@ -121,7 +123,11 @@
           <div class="baseform">
             <el-form-item label="" prop="RoomName" title="房间名称">
               <span class="label">部屋の名前</span>
-              <el-input size="small" v-model="addMsg.RoomName" placeholder="入力してください"></el-input>
+              <!-- <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>
@@ -165,7 +171,9 @@
             </el-form-item>
             <el-form-item label="" title="宽带">
               <span class="label">ブロードバンド</span>
-              <el-input size="mini" v-model="addMsg.BroadBand" placeholder="入力してください"></el-input>
+              <el-select size="mini" v-model="addMsg.BroadBand" placeholder="入力してください" clearable filterable>
+                <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="楼层">
               <span class="label">フロア</span>
@@ -178,7 +186,9 @@
             </el-form-item>
             <el-form-item label="" title="餐食">
               <span class="label">食</span>
-              <el-input size="mini" v-model="addMsg.Meals" placeholder="入力してください"></el-input>
+              <el-select size="mini" v-model="addMsg.Meals" placeholder="入力してください" clearable filterable>
+                <el-option v-for="(item,index) in FoodList" :key="index" :label="item.Name" :value="item.ID"></el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="" prop="IsExtraBed" title="是否是吸烟房1是2否">
               <span class="label">喫煙所かどうか</span>
@@ -197,7 +207,19 @@
             </el-form-item>
             <el-form-item label="" prop="RoomFacility" title="客房设施">
               <span class="label">客室施設</span>
-              <el-input size="mini" v-model="addMsg.RoomFacility" placeholder="入力してください"></el-input>
+              <!-- <el-input size="mini" v-model="addMsg.RoomFacility" placeholder="入力してください"></el-input> -->
+              <!-- <el-select size="small" multiple collapse-tags v-model="addMsg.RoomFacility" placeholder="選んでください" clearable filterable>
+                <el-option label="电影点播服务" value="电影点播服务"></el-option>
+                <el-option label="24小时热水" value="24小时热水"></el-option>
+                <el-option label="洗衣机" value="洗衣机"></el-option>
+                <el-option label="电热水壶" value="电热水壶"></el-option>
+                <el-option label="浴缸" value="浴缸"></el-option>
+                <el-option label="书桌" value="书桌"></el-option>
+                <el-option label="免费wifi" value="免费wifi"></el-option>
+              </el-select> -->
+              <el-select size="mini" multiple collapse-tags v-model="addMsg.RoomFacility" placeholder="入力してください" clearable filterable>
+                <el-option v-for="(item,index) in shebeiList" :key="index" :label="item.HName" :value="item.HConfigId"></el-option>
+              </el-select>
             </el-form-item>
           </div>
         </div>
@@ -279,7 +301,7 @@
           IsSmoke: 2,
           Landscape: '',
           WindoWCut: '',
-          RoomFacility: '',
+          RoomFacility: [],
 
         },
         rules: {
@@ -293,12 +315,11 @@
             message: "部屋窓型を入力してください",
             trigger: "blur"
           }],
-          RoomFacility: [{
+           RoomFacility: [{
             required: true,
             message: "客室タイプを入力してください",
-            trigger: "blur"
+            trigger: "change"
           }],
-
           HotelId: [{
             required: true,
             message: "ホテルを選んでください",
@@ -312,6 +333,9 @@
         },
 
         HotelId: '',
+        FoodList:[],
+        wifiList:[],
+        shebeiList:[],
       };
     },
     mounted() {
@@ -323,6 +347,9 @@
       this.getList();
       this.getRoomType();
       this.getHotelList();
+      this.getFood();
+      this.getwifi();
+      this.getshebei();
     },
     methods: {
       goUrl(row) {
@@ -399,7 +426,42 @@
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data.pageData;
               this.total = res.data.data.count;
-              console.log("this.dataList", this.dataList)
+            } else {
+              this.Error(res.data.message);
+            }
+          });
+      },
+      getFood() {
+        this.apipost("scm_get_GetSCMHotelRoomMealsEnumList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.FoodList = res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          });
+      },
+      getwifi(){
+        this.apipost("scm_get_GetSCMHotelRoomWifiEnumList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.wifiList = res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          });
+      },
+      getshebei(){
+        this.apipost("scm_get_GetHotelConfigListService", {HType:2},
+          res => {
+            if (res.data.resultCode == 1) {
+              let data= res.data.data;
+              data.forEach(item=>{
+                if(item.Key==2){
+                  this.shebeiList = item.SubList;
+                }
+              })
+            
             } else {
               this.Error(res.data.message);
             }
@@ -450,6 +512,10 @@
         this.$refs[formName].validate(valid => {
           if (valid) {
             this.queryLoad = true;
+            let str='';
+            if(this.addMsg.RoomFacility.length>0){
+               this.addMsg.RoomFacility=this.addMsg.RoomFacility.toString();
+            }
             this.apipost("scm_post_SetSCMHotelRoomInfo", this.addMsg,
               res => {
                 this.queryLoad = false;
@@ -514,7 +580,7 @@
           IsSmoke: 2,
           Landscape: '',
           WindoWCut: '',
-          RoomFacility: '',
+          RoomFacility: [],
         }
         this.dialogState = true;
       },
@@ -543,8 +609,12 @@
           IsSmoke: item.IsSmoke,
           Landscape: item.Landscape,
           WindoWCut: item.WindoWCut,
-          RoomFacility: item.RoomFacility,
+          RoomFacility: [],
         }
+        let FacilityList=item.FacilityList;
+        FacilityList.forEach(item=>{
+          this.addMsg.RoomFacility.push(item.HConfigId)
+        })
         this.dialogState = true;
       },
     }
@@ -553,6 +623,9 @@
 </script>
 
 <style>
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected{
+  color: #089bab;
+}
   .RoomList {
     width: 100%;
     height: 100%;