酒店、餐详情调整

src/components/Hotel/HotelInfo.vue

@@ -98,7 +98,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6" :gutter="35" v-if="index==0">
-
               </el-col>
               <el-col :span="6" :gutter="35">
                 <el-button icon="el-icon-minus" circle @click="deleteAir(index)"> </el-button>
@@ -958,7 +957,7 @@
       let userInfo = this.getLocalStorage()
       //有权限操作的部门
       if (userInfo.RB_Department_Id == 240 || userInfo.RB_Department_Id == 1 || userInfo.RB_Department_Id == 3 ||
-        userInfo.RB_Branch_id == 49||userInfo.RB_Group_id==100) {
+        userInfo.RB_Branch_id == 49 || userInfo.RB_Group_id == 100) {
         this.IsHaveAuth = 1;
       }
       this.GetPayList();

src/components/Restaurant/restaurantInfoManage.vue

@@ -704,12 +704,9 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('hotel.hotel_website')">
-            <div>
-              <span class="resource-net">
-                <span class="resource-http">https://</span>
-                <input type="text" v-model="addMsg.URL" maxlength="100" class="resource-name R1" />
-              </span>
-            </div>
+            <el-input readonly v-model="addMsg.URL" maxlength="100" class="w300">
+              <template slot="prepend">https://</template>
+            </el-input>
           </el-form-item>
           <el-form-item :label="$t('system.table_country')">
             <el-select :placeholder="$t('visaT.qxzguojia')" filterable v-model="addMsg.Country"
@@ -753,7 +750,7 @@
             </el-input>
           </el-form-item>
           <el-form-item :label="$t('restaurant.res_BusinessHours')" prop="OpeningHours">
-            <el-input type="text" v-model="addMsg.OpeningHours" maxlength="20" class="w300"></el-input>
+            <el-input type="text" v-model="addMsg.OpeningHours" maxlength="50" class="w300"></el-input>
           </el-form-item>
           <el-form-item :label="$t('restaurant.res_ContactNumber')" prop="Tel">
             <el-input type="text" maxlength="20" v-model="addMsg.Tel" class="w300"></el-input>
@@ -772,16 +769,13 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('restaurant.res_bookCapacity')" prop="SupportCount">
-            <el-input-number v-model="addMsg.SupportCount" class="w300" :min="0"></el-input-number>
+            <el-input-number v-model="addMsg.SupportCount" style="width:298px;" :min="0"></el-input-number>
+          </el-form-item>
+          <el-form-item :label="$t('restaurant.res_advanceDays')" prop="SupportCount">
+            <el-input v-model="addMsg.DieLine" maxlength="10" class="w300" onkeyup="value=value.replace(/[^\d]/g,'')">
+              <template slot="append">{{$t('hotel.hotel_day')}}</template>
+            </el-input>
           </el-form-item>
-          <div class="RabateDiv clearfix">
-            <div class="RebateCount reTwo dayLi">
-              <div class="tiqianDay">{{$t('restaurant.res_advanceDays')}}</div>
-              <input type="text" class="dayNum" v-model="addMsg.DieLine" maxlength="10"
-                onkeyup="value=value.replace(/[^\d]/g,'')">
-              <div class="percentCon">{{$t('hotel.hotel_day')}}</div>
-            </div>
-          </div>
           <el-form-item :label="$t('ground.shifouyuyue')">
             <el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive">
             </el-switch>
@@ -963,7 +957,7 @@
         totalimg: "",
         selecnum: 0,
         ID: "",
-        foodTagList: [],//实物标签
+        foodTagList: [], //实物标签
         tipsItem: "",
         Geographic: [],
         GeoItem: "",
@@ -1333,8 +1327,7 @@
       },
       showFoodTag() {
         this.inputVisible = true;
-        if(this.foodTagList&&this.foodTagList.length==0)
-        {
+        if (this.foodTagList && this.foodTagList.length == 0) {
           this.foodTagList.push("徐總推薦")
         }
         this.$nextTick(_ => {

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -570,11 +570,16 @@
           res => {
             this.saveLoading = false;
             if (res.data.resultCode == 1) {
+              console.log("111")
               //配置编号
               TripFeature.ConfigId = res.data.data;
-              this.$refs.TravelFeature.getHtml(TripFeature, SaveType, this.TeamType);
+              console.log("222")
               this.$refs.TravelPrice.closeHotelDialog();
+              console.log("333")
               this.$refs.TravelPrice.initStatus();
+              console.log("444")
+              this.$refs.TravelFeature.getHtml(TripFeature, SaveType, this.TeamType);
+              console.log("555")
             } else if (res.data.resultCode == 10009) {
               this.FeatureData.IsSave = false;
               //表单重复提交

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -1936,6 +1936,7 @@
       },
       //关闭弹窗方法
       closeHotelDialog() {
+        console.log("111");
         this.outerVisible = false;
       },
       //保存完成初始化