Skip to content

S
SuperMan
Commit 4684967b authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent af4ec97b
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 45 deletions
src/components/Hotel/DiDa/HotelDetails.vue
View file @ 4684967b
......@@ -1295,7 +1295,6 @@
this.apipost('dmc_post_GetDidaHotelDetails', this.hotelMsg, res => {
if (res.data.resultCode == 1) {
var tempObj = res.data.data;
console.log("tempObj", tempObj);
this.DidaHotelDetails = tempObj;
this.hotelMapUrl = `http://api.weboss.hk/baidu_map/api.php?prop1=` + this.DidaHotelDetails
.Name_CN + `&prop2=` + this.DidaHotelDetails.Address_CN + `&prop3=` + this.DidaHotelDetails
......@@ -1337,17 +1336,7 @@
var tempData = res.data.data;
this.DidaHotelRoomDetails = tempData;
this.qRoomTypeList = tempData.qRoomTypeList;
var tempMealArray = tempData.qMealTypeList;
if (tempMealArray && tempMealArray.length > 0) {
tempMealArray.forEach(qitem => {
var MTypeName = that.getMealtype(qitem.MealType);
if (qitem.MealAmount > 0) {
MTypeName += qitem.MealAmount + "份";
}
qitem.MTypeName = MTypeName
});
}
this.qMealTypeList = tempMealArray;
this.qMealTypeList = tempData.qMealTypeList;
}
}, null)
},
......
src/components/Hotel/DiDa/HotelSure.vue
View file @ 4684967b
......@@ -525,7 +525,8 @@
<span class="text-grey-6 q-pr-lg">{{$t('objFill.ruzhurenshu')}}</span>
<span class="text-grey-9">
<span>{{$t('salesModule.Adult')}} {{ auditNum }} {{$t('hotel.hotel_people')}} </span>
<span class="q-pl-lg" v-if="childNum > 0"> {{$t('sm.ertong')}}{{ childNum }} {{$t('hotel.hotel_people')}} </span>
<span class="q-pl-lg" v-if="childNum > 0"> {{$t('sm.ertong')}}{{ childNum }}
{{$t('hotel.hotel_people')}} </span>
<span class="q-pl-lg" v-if="isBaoChild"> {{$t('objFill.v101.hote.bunengbet')}}</span>
</span>
</div>
......@@ -534,21 +535,20 @@
<div style="padding-bottom: 8px;">
<div style=" display: flex;">
<template v-if="roomRateDetails.RatePlanList && roomRateDetails.RatePlanList.length > 0">
<div style="width:50%;"
v-for="(item, index) in roomRateDetails.RatePlanList" :key="`rd_rp_`+index">
<div class="q-pt-xs col q-px-lg q-mb-md8">
<span class="text-grey-6 q-pr-lg"> {{$t('objFill.fangjianshul')}}</span>
<span class="text-grey-9"> {{ item.RoomOccupancy.RoomNum }} </span>
<span class="text-grey-9"><i class="text-grey-13 q-mr-xs el-icon-warning-outline text-orange-6"
name="place" size="xs"></i>
{{$t('objFill.jinsheng')}}
<span class="text-orange text-orange-6">{{
<div style="width:50%;" v-for="(item, index) in roomRateDetails.RatePlanList" :key="`rd_rp_`+index">
<div class="q-pt-xs col q-px-lg q-mb-md8">
<span class="text-grey-6 q-pr-lg"> {{$t('objFill.fangjianshul')}}</span>
<span class="text-grey-9"> {{ item.RoomOccupancy.RoomNum }} </span>
<span class="text-grey-9"><i class="text-grey-13 q-mr-xs el-icon-warning-outline text-orange-6"
name="place" size="xs"></i>
{{$t('objFill.jinsheng')}}
<span class="text-orange text-orange-6">{{
item.InventoryCount
}}</span>
{{$t('hotel.hotel_room')}}
</span>
{{$t('hotel.hotel_room')}}
</span>
</div>
</div>
</div>
</template>
<div class="q-pt-xs col q-px-lg q-mb-md8" style="width:50%;">
<div>
......@@ -608,7 +608,8 @@
style="width:100%;background:#e1f5fe!important;font-weight:700;border-radius:4px;height:53px;padding-left:10px; align-items: center;">
<span style="float: left; padding-top: 16px; display: block;">{{$t('objFill.v101.hote.ruzhuxx')}}</span>
<span style="float: right; padding-top: 16px; padding-right:16px; display: block;" class="text-orange-6">
<i class="text-grey-13 q-mr-xs el-icon-warning-outline" name="place" size="xs"></i>{{$t('objFill.v101.hote.suotxmxyzjyz')}}</span>
<i class="text-grey-13 q-mr-xs el-icon-warning-outline" name="place"
size="xs"></i>{{$t('objFill.v101.hote.suotxmxyzjyz')}}</span>
</div>
</div>
<div class="row q-px-lg q-py-lg8 row justify-between" style="width: 100%; display: block;">
......@@ -664,7 +665,8 @@
</el-col>
<el-col :gutter="35" style="width:30%;">
<el-form-item label="">
<el-input type="number" v-model="itemguest.Age" :min="0" :max="12" :placeholder="$t('objFill.v101.hote.niannetbt')">
<el-input type="number" v-model="itemguest.Age" :min="0" :max="12"
:placeholder="$t('objFill.v101.hote.niannetbt')">
</el-input>
</el-form-item>
</el-col>
......@@ -679,15 +681,17 @@
roomRateDetails.CancellationPolicyList.length > 0
">
<div style="width:100%;" v-for="(itemCancella, index1) in roomRateDetails.CancellationPolicyList">
<p v-if="index1==0">{{ getformatDateStr(itemCancella.FromDate) }}{{$t('objFill.v101.hote.zhiqmfqx')}}</p>
<p v-if="index1==0">{{ getformatDateStr(itemCancella.FromDate) }}{{$t('objFill.v101.hote.zhiqmfqx')}}
</p>
<div v-if="itemCancella.Amount==roomRateDetails.TotalPrice">
<p>{{ getformatDateStr(itemCancella.FromDate) }}{{$t('objFill.v101.hote.qibkqxqxsqe')}}</p>
</div>
<div v-else>
<p>{{ getformatDateStr(itemCancella.FromDate) }}
<span v-if="index1!=(roomRateDetails.CancellationPolicyList.length-1)">-
{{ getformatDateStr(roomRateDetails.CancellationPolicyList[index1+1].FromDate) }} {{$t('objFill.v101.hote.zhijian')}}</span>
{{$t('objFill.v101.hote.quxiaosf')}}{{DanWei}}{{getPrice(itemCancella.Amount)}};</p>
{{ getformatDateStr(roomRateDetails.CancellationPolicyList[index1+1].FromDate) }}
{{$t('objFill.v101.hote.zhijian')}}</span>
{{$t('objFill.v101.hote.quxiaosf')}}{{DanWei}}{{getPrice(itemCancella.Amount)}};</p>
</div>
</div>
</div>
......@@ -846,8 +850,6 @@
trigger: "blur",
}],
},
};
},
methods: {
......@@ -902,12 +904,9 @@
},
null
);
}
})
},
//获取道旅餐食类型
getdidaMealType() {
this.apipost('dmc_post_GetDidaMealType', this.hotelMsg, res => {
......@@ -948,7 +947,6 @@
}
}
}
});
return IsCancel;
},
......@@ -956,12 +954,9 @@
getWeek() {
let CheckInDate = new Date(this.params.CheckInDate).getDay();
let CheckOutDate = new Date(this.params.CheckOutDate).getDay();
this.checkInWeek = this.WeekList[CheckInDate];
this.checkOutWeek = this.WeekList[CheckOutDate];
},
//通过日期得到周几
getWeekD(dateTime) {
let dt = new Date(dateTime);
......@@ -970,7 +965,6 @@
let date = (dt.getDate() + 1).toString().padStart(2, "0");
return month + "-" + date + "(" + this.WeekList[dt.getDay()] + ")";
},
//日期格式化
getformatDateStr(value) {
var dt = new Date(value);
......@@ -1006,7 +1000,6 @@
dateRangeHandler3(e) {
if (qDateProxy3.value) qDateProxy3.value.hide();
},
initHotel() {
this.getWeek();
this.loading = true;
......@@ -1014,6 +1007,7 @@
"dmc_post_GetDiDaPriceConfirm",
this.params,
res => {
console.log("dmc_post_GetDiDaPriceConfirm",res.data);
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.PriceDetails;
......@@ -1096,13 +1090,10 @@
created() {
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
if (this.$route.query.StartDate) {
// this.dateList.push(this.$route.query.StartDate)
this.params.CheckInDate = this.$route.query.StartDate;
}
if (this.$route.query.EndDate) {
// this.dateList.push(this.$route.query.EndDate)
this.params.CheckOutDate = this.$route.query.EndDate;
}
if (this.$route.query.auditNum) {
......@@ -1113,7 +1104,6 @@
this.params.childNum = this.$route.query.childNum;
}
if (this.$route.query.searchroomGroup) {
//JSON.parse(JSON.stringify(this.currentEditItemData))
this.params.searchroomGroup = JSON.parse(
decodeURIComponent(this.$route.query.searchroomGroup)
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment