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

src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue

@@ -189,28 +189,28 @@
       return {
         //其他餐食
         otherDinner: [{
-            Id: 1,
+            ID: 1,
             Name: this.$t('sm.jiudiannxyzc'),
             City: 0,
             About: "",
             PicPath: ""
           },
           {
-            Id: 2,
+            ID: 2,
             Name: this.$t('sm.jiudianwxyzc'),
             City: 0,
             About: "",
             PicPath: ""
           },
           {
-            Id: 3,
+            ID: 3,
             Name: this.$t('sm.fangbywjqzl'),
             City: 0,
             About: "",
             PicPath: ""
           },
           {
-            Id: 4,
+            ID: 4,
             Name: this.$t('sm.jisjchzl'),
             City: 0,
             About: "",

src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue

@@ -288,6 +288,7 @@
       },
       //酒店选择改变
       changeHotelList() {
+        this.isShowEdit = false
         var that = this;
         if (that.subItemObj.childItem.HotelId != 0) {
           //获取当前选中的对象
@@ -346,6 +347,7 @@
                 that.Diner.UseDinerCked = obj.UseDinnerType.split(",");
               }
             }
+            this.$nextTick(() => {this.isShowEdit = true})
             let useDinnerTypeArry = [];
             if (obj.UseDinnerType != null && obj.UseDinnerType.length > 0) {
               useDinnerTypeArry = obj.UseDinnerType.split(",");