Skip to content

S
SuperMan
Commit 1389e377 authored by 黄奎's avatar 黄奎
Browse files
Options

机票调整

parent c9f55d1d
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 47 deletions
src/components/Hotel/DiDa/HotelDetails.vue
View file @ 1389e377
......@@ -528,10 +528,10 @@
</div>
</div>
<div
v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.HotelList&&DidaHotelRoomDetails.HotelList.length>0&&DidaHotelRoomDetails.HotelList[0].LowestPrice">
v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.LowestPrice">
<span class="text-orange text-weight-bold fz18 q-pl-lg ">
{{ DidaHotelRoomDetails.HotelList[0].LowestPrice.Currency }}
{{ DidaHotelRoomDetails.HotelList[0].LowestPrice.Value }}
{{ DidaHotelRoomDetails.LowestPrice.Currency }}
{{ DidaHotelRoomDetails.LowestPrice.Value }}
</span>
<span class="text-grey-8 q-pl-xs">/{{$t('op.Qi')}}</span>
</div>
......@@ -767,7 +767,7 @@
</div>
<div v-loading="loading" style="width:100%;min-height:100px;">
<template
v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.HotelList&&DidaHotelRoomDetails.HotelList.length>0&&DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList&&DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList.length>0 ">
v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.HotelList&&DidaHotelRoomDetails.HotelList.length>0 ">
<div class="q-card row q-cardradius " v-for="(item, index) in getQueryData" :key="`dh_`+index">
<div class="col q-pa-sm q-pr-lg col-3 row no-wrap justify-between"
style="border-right: 1px solid rgb(238, 238, 238);width:15%;height:auto;">
......@@ -1173,9 +1173,8 @@
var tempData = [];
_this.loading = true;
if (_this.DidaHotelRoomDetails && _this.DidaHotelRoomDetails.HotelList && _this.DidaHotelRoomDetails
.HotelList
.length > 0 && _this.DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList) {
tempData = JSON.parse(JSON.stringify(_this.DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList));
.HotelList .length > 0) {
tempData = JSON.parse(JSON.stringify(_this.DidaHotelRoomDetails.HotelList));
if (_this.qMsg.RoomTypeName && _this.qMsg.RoomTypeName != '') {
tempData = tempData.filter(qitem => qitem.RoomName_CN == _this.qMsg.RoomTypeName);
}
......@@ -1319,45 +1318,18 @@
if (res.data.resultCode == 1) {
var tempData = res.data.data;
this.DidaHotelRoomDetails = tempData;
if (tempData) {
if (tempData.HotelList && tempData.HotelList.length > 0) {
tempData.HotelList.forEach(rootItem => {
if (rootItem && rootItem.GroupRoomTypeList && rootItem.GroupRoomTypeList.length > 0) {
rootItem.GroupRoomTypeList.forEach(rItem => {
if (rItem.RoomName_CN && rItem.RoomName_CN != '') {
this.qRoomTypeList.push({
RoomName_CN: rItem.RoomName_CN
});
}
})
}
if (rootItem && rootItem.RatePlanList && rootItem.RatePlanList.length > 0) {
rootItem.RatePlanList.forEach(pItem => {
if (pItem && pItem.PriceList && pItem.PriceList.length > 0) {
pItem.PriceList.forEach(mItem => {
var MTypeName = that.getMealtype(mItem.MealType);
if (mItem.MealAmount > 0) {
MTypeName += mItem.MealAmount + "份";
}
var mObj = {
MTypeName: MTypeName,
MealAmount: mItem.MealAmount,
MealType: mItem.MealType
};
var qObj = that.qMealTypeList.find((qMItem) => {
return qMItem.MealType === mObj.MealType && qMItem.MealAmount == mObj
.MealAmount;
})
if (!qObj) {
that.qMealTypeList.push(mObj);
}
})
}
});
}
});
}
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;
}
}, null)
},
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 1389e377
......@@ -1660,7 +1660,28 @@
}}</a>
</div>
</div>
<div class="clearfix TCL-redType" v-if=" item.TicketList && item.TicketList.length>0">
<div class="TCL_remarkTitle">票务备注：</div>
<div class="TCL_Content">
<template v-for="(subItem,subIndex) in item.TicketList">
<font :key="`p_`+subIndex">
<template v-if="subItem.TravelTicketType==1">
<font style="color:#47BF8C;"> {{$t('objFill.v101.tuanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==2">
<font style="color:blue;"> {{$t('objFill.v101.shanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template>
{{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】
</font>
</template>
</div>
</div>
</div>
<div class="TC_remarkContent" v-if="item.BranchAuditState > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 1389e377
......@@ -1138,6 +1138,26 @@
v-if="item.HotelDiningBus.ResultBusTypeStr!=''">{{$t('Operation.Op_carType')}}:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
</div>
</div>
<div class="clearfix TCL-redType" v-if=" item.TicketList && item.TicketList.length>0">
<div class="TCL_remarkTitle">票务备注：</div>
<div class="TCL_Content">
<template v-for="(subItem,subIndex) in item.TicketList">
<font :key="`p_`+subIndex">
<template v-if="subItem.TravelTicketType==1">
<font style="color:#47BF8C;"> {{$t('objFill.v101.tuanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==2">
<font style="color:blue;"> {{$t('objFill.v101.shanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template>
{{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】
</font>
</template>
</div>
</div>
</div>
<div class="TC_remarkContent" v-if="item.BranchAuditState>0">
<div class="clearfix TCL-redType">
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 1389e377
......@@ -412,7 +412,7 @@
v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
<span @click="GoShoupei(outItem)"
style="cursor:pointer;text-decoration:underline;display:block;color:#666;font-size:12px;">{{$t('ground.cheliangxinxi')}}</span>
<template v-if="(item.LineId==14||item.LineId==118) &&(item.CarIsPush==0||item.CarIsPush==2)">
<!-- <template v-if="(item.LineId==14||item.LineId==118) &&(item.CarIsPush==0||item.CarIsPush==2)">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dmc.tongbucxxdch')"
placement="top-start">
<div slot="content">
......@@ -432,7 +432,7 @@
style="cursor:pointer;text-decoration:underline;display:block;color:red;font-size:12px;padding-top:2px;"
@click="PushMessage(outItem,item)">{{$t('objFill.v101.dmc.quxiaotongbu')}}</span>
</el-tooltip>
</template>
</template> -->
</div>
</td>
<td>
......
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