Skip to content

S
SuperMan
Commit b779eacd authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents d66c2b25 04338c5b
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 29 deletions
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @ b779eacd
...@@ -213,39 +213,37 @@ ...@@ -213,39 +213,37 @@
<el-col :span="12"> <el-col :span="12">
<!--添加修改航班--> <!--添加修改航班-->
<ul class="_add_hangban clearfix"> <ul class="_add_hangban clearfix">
<li v-if="addMsg.TicketType" :class="addMsg.TicketType == 1 ? '_allWidth' : ''"> <li :class="addMsg.TicketType == 1 ? '_allWidth' : ''">
<span class="_add_go_label">{{ $t("Airticket.Air_go") }}</span> <span class="_add_go_label">{{ $t("Airticket.Air_go") }}</span>
<div class="_add_go" v-for="(item, index) in addMsg.flightList" :key="index"> <div class="_add_go" v-for="(item, index) in addMsg.flightList" :key="index">
<template v-if="addMsg.flightList && item.TicketType == 1"> <template v-if="item.TicketType == 1">
<div> <div>
<p> <p>
<span class="iconfont icon-hangban"></span> <span class="iconfont icon-hangban"></span>
<span>{{ item.Flight_number }}</span> <span>{{ item.Flight_number }} {{item.Departure_time }}~{{item.Arrival_time}}</span>
<span class="iconfont icon-xingzhuang" @click="deletFlightInfo(item.ID, index)"></span> <span class="iconfont icon-xingzhuang" @click="deletFlightInfo(item.ID, index)"></span>
</p> </p>
<el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start" <p class="_add_info">是否中转：{{ item.IsTransfer === 1 ? "是" : "否" }}</p>
popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="item.DepartureAirPortName" placement="top-start"
</el-tooltip>
<span class="transform">是否中转：{{ item.IsTransfer === 1 ? "是" : "否" }}</span>
<el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
<p class="_add_info"> <p class="_add_info">
<span>{{ $t("system.query_flightAir") }}：{{ <span>{{ $t("system.query_flightAir") }}：{{
item.dName item.DepartureAirPortName
}}</span> }}</span>
</p> </p>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start" <el-tooltip class="item" effect="dark" :content="item.ArrivalAirPortName" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
<p class="_add_info"> <p class="_add_info">
<span>{{ $t("system.query_arrivalAir") }}：{{ <span>{{ $t("system.query_arrivalAir") }}：{{
item.aName item.ArrivalAirPortName
}}</span> }}</span>
</p> </p>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
</div> </div>
<!--添加去程-->
<div class="_add_go _new_go"> <div class="_add_go _new_go">
<div> <div>
<p> <p>
...@@ -283,41 +281,41 @@ ...@@ -283,41 +281,41 @@
</ul> </ul>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!--添加修改航班--> <!--回程-->
<ul class="_add_hangban clearfix"> <ul class="_add_hangban clearfix">
<li v-if="addMsg.TicketType&& addMsg.TicketType == 2"> <li>
<span class="_add_go_label">{{ <span class="_add_go_label">{{
$t("Airticket.Air_returnTrip") $t("Airticket.Air_returnTrip")
}}</span> }}</span>
<div class="_add_go" v-for="(item, index) in addMsg.flightList" :key="index"> <div class="_add_go" v-for="(item, index) in addMsg.flightList" :key="index">
<template v-if="addMsg.flightList && item.TicketType == 2"> <template v-if="item.TicketType == 2">
<div> <div>
<p> <p>
<span class="iconfont icon-hangban"></span> <span class="iconfont icon-hangban"></span>
<span>{{ item.Flight_number }} <span>{{ item.Flight_number }} {{item.Departure_time }}~{{item.Arrival_time}}</span>
{{ item.Departure_time }}</span>
<span class="iconfont icon-xingzhuang" @click="deletFlightInfo(item.ID, index)"></span> <span class="iconfont icon-xingzhuang" @click="deletFlightInfo(item.ID, index)"></span>
</p> </p>
<span class="transform">是否中转：{{ item.IsTransfer === 1 ? "是" : "否" }}</span> <p class="_add_info">是否中转：{{ item.IsTransfer === 1 ? "是" : "否" }}</p>
<el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start" <el-tooltip class="item" effect="dark" :content="item.DepartureAirPortName" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
<p class="_add_info"> <p class="_add_info">
<span>{{ $t("system.query_flightAir") }}：{{ <span>{{ $t("system.query_flightAir") }}：{{
item.dName item.DepartureAirPortName
}}</span> }}</span>
</p> </p>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start" <el-tooltip class="item" effect="dark" :content="item.ArrivalAirPortName" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
<p class="_add_info"> <p class="_add_info">
<span>{{ $t("system.query_arrivalAir") }}：{{ <span>{{ $t("system.query_arrivalAir") }}：{{
item.aName item.ArrivalAirPortName
}}</span> }}</span>
</p> </p>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
</div> </div>
<!--添加回程-->
<div class="_add_go _new_go"> <div class="_add_go _new_go">
<div> <div>
<p> <p>
...@@ -575,8 +573,8 @@ ...@@ -575,8 +573,8 @@
FlightId: "", FlightId: "",
IsTransfer: 0, IsTransfer: 0,
FlightDate: "", FlightDate: "",
aName: "", ArrivalAirPortName: "",
dName: "", DepartureAirPortName: "",
TicketType: 1, TicketType: 1,
ID: 0, ID: 0,
AirLineID: "", AirLineID: "",
...@@ -587,8 +585,8 @@ ...@@ -587,8 +585,8 @@
FlightId: "", FlightId: "",
IsTransfer: 0, IsTransfer: 0,
FlightDate: "", FlightDate: "",
aName: "", ArrivalAirPortName: "",
dName: "", DepartureAirPortName: "",
TicketType: 2, TicketType: 2,
ID: 0, ID: 0,
AirLineID: "", AirLineID: "",
...@@ -646,6 +644,7 @@ ...@@ -646,6 +644,7 @@
item.TicketType = Math.random() > 0.5 ? 1 : 2; item.TicketType = Math.random() > 0.5 ? 1 : 2;
}); });
this.addMsg.flightList = TravelTeamFlightList; this.addMsg.flightList = TravelTeamFlightList;
console.log("this.addMsg",this.addMsg);
this.friendList = TravelTeamPartnerList; this.friendList = TravelTeamPartnerList;
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
...@@ -695,8 +694,8 @@ ...@@ -695,8 +694,8 @@
this.AirportNameList.forEach((x) => { this.AirportNameList.forEach((x) => {
if (x.ID == this.addGoFlight.FlightId) { if (x.ID == this.addGoFlight.FlightId) {
newList.TicketType = 1; newList.TicketType = 1;
newList.aName = x.aName; newList.ArrivalAirPortName = x.aName;
newList.dName = x.dName; newList.DepartureAirPortName = x.dName;
newList.Flight_number = x.Flight_number; newList.Flight_number = x.Flight_number;
newList.FlightId = this.addGoFlight.FlightId; newList.FlightId = this.addGoFlight.FlightId;
newList.AirLineTicketId = this.addGoFlight.AirLineTicketId; newList.AirLineTicketId = this.addGoFlight.AirLineTicketId;
...@@ -718,8 +717,8 @@ ...@@ -718,8 +717,8 @@
this.BackAirportNameList.forEach((x) => { this.BackAirportNameList.forEach((x) => {
if (x.ID == this.returnTripData.FlightId) { if (x.ID == this.returnTripData.FlightId) {
newList.TicketType = 2; newList.TicketType = 2;
newList.aName = x.aName; newList.ArrivalAirPortName = x.aName;
newList.dName = x.dName; newList.DepartureAirPortName = x.dName;
newList.Flight_number = x.Flight_number; newList.Flight_number = x.Flight_number;
newList.FlightDate = newDate; newList.FlightDate = newDate;
newList.FlightId = this.returnTripData.FlightId; newList.FlightId = this.returnTripData.FlightId;
......
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