Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/GnHotelInfo.vue

@@ -108,7 +108,7 @@
                   </div>
                 </div>
                 <div class="add-img">
-                  <button class="save-Btn" @click="isShowHotelImg=true">新增图片</button>
+                  <el-button type="primary" @click="isShowHotelImg=true" icon="el-icon-plus" circle></el-button>
                 </div>
               </div>
             </div>
@@ -174,16 +174,15 @@
             </el-form-item>
             <el-form-item label="订房须知">
               <el-select multiple :placeholder="$t('pub.pleaseSel')" filterable class='multiple_input w300'
-                v-model="chooseObj.Bookings" @change="changeBooking">
+                v-model="checkedRoom" @change="changeBooking">
                 <el-option v-for="subitem in dropdownObj.BookingList" :key="subitem.ID" :label="subitem.Name"
                   :value="subitem.ID">
                 </el-option>
               </el-select>
             </el-form-item>
-            <template v-if="chooseObj.Bookings && chooseObj.Bookings.length>0"
-              v-for="(item,index) in chooseObj.Bookings">
-              <el-form-item :label="item.Name" :key="index">
-                <el-input placeholder="联系方式" v-model="item.Content"></el-input>
+            <template v-if="chooseObj.Bookings && chooseObj.Bookings.length>0">
+              <el-form-item v-for="(item,index) in chooseObj.Bookings" :label="item.Name" :key="index+1">
+                <el-input placeholder="联系方式" class='w300' v-model="item.Content"></el-input>
               </el-form-item>
             </template>
           </template>
@@ -363,6 +362,7 @@
         inputValue: '',
         serviceCked: [],
         isShowHotelImg: false,
+        checkedRoom:[],
       };
     },
     components: {
@@ -371,8 +371,15 @@
       comImgList: comImgList
     },
     methods: {
-      changeBooking() {
-
+      changeBooking(val) {
+        this.chooseObj.Bookings=[];
+        this.dropdownObj.BookingList.forEach(x=>{
+          this.checkedRoom.forEach(y=>{
+            if(x.ID==y){
+              this.chooseObj.Bookings.push(x);
+            } 
+          })
+        })
       },
       //新增交通
       addTraffic() {
@@ -663,6 +670,7 @@
                 this.dropdownObj.BookingList = sItem.SubList
               }
             });
+            console.log(this.dropdownObj, 'this.dropdownObj');
           }
         });
       }