Skip to content

S
SuperMan
Commit 73c4a3f6 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 81c70800 996f6345
Hide whitespace changes
Inline Side-by-side
Showing with 249 additions and 84 deletions
src/components/SalesModule/productQuery.vue
View file @ 73c4a3f6
......@@ -664,7 +664,7 @@
</td>
<td>{{ds.StopoverName}}</td>
<td>
<span v-if="ds.FlightState==1" style="color: rgb(71, 191, 140)!important;">正常</span>
<span v-if="item.OutNotice==1" style="color: rgb(71, 191, 140)!important;">确定</span>
<span v-else style="color: red !important;">暂定</span>
</td>
</tr>
......
src/components/Ticketing/PassengerList.vue
View file @ 73c4a3f6
......@@ -66,10 +66,33 @@
border-top:1px dashed #d1d1d1;
padding-top:10px;
}
/* .PassengerList .el-input__inner{
.PassengerList .el-input__inner{
height:23px!important;
padding:0 5px;
} */
}
.Pgzhu{
display: inline-block;
width:30px;
height:30px;
background-color: #E95252;
border-radius: 50%;
text-align: center;
line-height: 30px;
color:#fff;
position: absolute;
top:-35px;
left:-20px;
}
.Pglian{
background-color: #47bf8c;
display: inline-block;
width:30px;
height:30px;
border-radius: 50%;
text-align: center;
line-height: 30px;
color:#fff;
}
</style>
<template>
......@@ -93,7 +116,7 @@
</table>
</li>
<li>
<input type="button" class="normalBtn" style="display:none;" value="导出报表" @click="getFlightInfo()" />
<!-- <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" /> -->
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
</li>
</ul>
......@@ -132,12 +155,15 @@
</el-pagination>
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
<div>
<div style="border-bottom:1px solid #d1d1d1;">
<table border=0 class="pg_table">
<tr>
<td width="50" style="vertical-align:top;">去程</td>
<td width="50" style="vertical-align:top;position:relative;" class="">
<span class="Pgzhu">票务信息</span>
</td>
<td>
<div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==1">
<div class="PgflightDiv" v-for="item in flightList">
<p>
<span class="iconfont icon-hangban"></span>
<span>{{item.Flight_number}}</span>
......@@ -167,8 +193,9 @@
</div>
</td>
</tr>
<tr>
<td width="50" style="vertical-align:top;">回程</td>
<td width="50" style="vertical-align:top;">联运信息</td>
<td>
<div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==3">
<p>
......@@ -203,8 +230,59 @@
</tr>
</table>
</div>
<div>
<table border=0 class="pg_table">
<tbody v-for="(item,index) in combineTeamList">
<tr>
<td colspan="2">
<span class="Pglian" v-if="index==0">联</span>
团号：{{item.TCNUM}}
</td>
</tr>
<tr v-for="subItem in item.List">
<td>{{subItem.CityName}}去程</td>
<td>
<div class="PgflightDiv" v-for="childItem in subItem.List" v-if="childItem.FlightSubType==1">
<p>
<span class="iconfont icon-hangban"></span>
<span>{{item.Flight_number}}</span>
<span>
<el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> -
<el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
</span>
</p>
<el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('Airticket.Air_StartTime')}}：{{item.FlightDate}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_flightAir')}}：{{item.dName}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
</p>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td>回程</td>
<td>
</td>
</tr>
</tbody>
</table>
</div>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="getCheckInfo()">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="normalBtn" type="primary" @click="getCheckInfo()">确认航班信息</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
......@@ -238,6 +316,7 @@
},
outerVisible:false,
flightList:[],
combineTeamList:[],
};
},
methods: {
......@@ -272,6 +351,7 @@
this.apipost("ticket_get_GetEntityExtend", msg,res => {
if (res.data.resultCode == 1) {
this.flightList = res.data.data.flightList;
console.log(this.flightList,'主团信息');
} else {
this.Error(res.data.message);
}
......@@ -279,6 +359,21 @@
);
this.outerVisible = true;
},
//获取联运团信息
getCombinTeam(){
let msg = {
AirTicketId:this.$route.query.id
}
this.apipost("ticket_get_GetUnionFlightAllInfo", msg,res => {
if (res.data.resultCode == 1) {
this.combineTeamList = res.data.data;
console.log(this.combineTeamList,'联运信息');
} else {
this.Error(res.data.message);
}
},err => {}
);
},
//确定
getCheckInfo(){
let FlightList = []
......
src/components/Ticketing/flightChild.vue
View file @ 73c4a3f6
......@@ -109,6 +109,8 @@
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
&nbsp;
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible = true,dialogTitle='新增效期'" />
&nbsp;
<input type="button" class="normalBtn" value="删除" @click="PostDeleteArray()" />
</li>
</ul>
</div>
......@@ -122,32 +124,39 @@
<th>操作</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index">
<td><input type="checkbox" :value="item.ID" /></td>
<td>
<label>
<input :value="item.ID" style="vertical-align: middle;" v-model="DeleteArray" type="checkbox">
</label>
</td>
<td>{{item.FDateStr}}</td>
<td>{{item.Flight_number}}}</td>
<td>{{item.CDepartTime}}}</td>
<td>{{item.CArrivalTime}}}</td>
<td>{{item.Flight_number}}</td>
<td>{{item.CDepartTime}}</td>
<td>{{item.CArrivalTime}}</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="outerVisible = true,dialogTitle='修改航班',updateData(item.ID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="el-icon-delete" circle @click="DeleteSingleChild(item)"></el-button>
</el-tooltip>
</el-row>
</td>
</tr>
</table>
<div class="noData" v-show="noData">
<div class="noData" v-show="DataList.length<=0">
{{$t('system.content_noData')}}
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total="msg.total">
</el-pagination>
<el-dialog custom-class='flightAddCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-dialog custom-class='flightAddCompany' :title="dialogTitle" :visible.sync="outerVisible" center>
<el-form>
<table class="flightChildTable" style="border-collapse: collapse;">
<tr>
<td width="350">
<div style="float:left;margin-left:30px;">
<div style="float:left;margin:20px 0 20px 30px;">
<div style="margin-bottom:5px;">开始日期：<el-date-picker clearable class="w135" v-model="PostData.StartDate"
type="date" :picker-options="beforeCheck" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</div>
......@@ -156,25 +165,21 @@
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</div>
</div>
<select v-model="PostData.UpdateType">
<el-option :value="1" :label="全部"></el-option>
<el-option :value="2" :label="星期"></el-option>
</select>
<el-select v-model="PostData.UpdateType" class="w100" style="margin-top:20px;">
<el-option :value="1" label="全部"></el-option>
<el-option :value="2" label="星期"></el-option>
</el-select>
</td>
<td>
<div v-if="PostData.UpdateType==2" class="FweekList" v-for="item in dateObj">
<el-input type="text" v-model="item.week" class="w60"></el-input>
<el-date-picker clearable class="w135" v-model="item.CDepartTime" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')"></el-date-picker>
<el-date-picker clearable class="w135" v-model="item.CArrivalTime" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')"></el-date-picker>
<div v-if="PostData.UpdateType==1" class="FweekList" v-for="subItem in dateObj2">
<span>{{subItem.WeekDayStr}}</span>
<el-input class="w135" v-model="subItem.CDepartTime"></el-input>
<el-input class="w135" v-model="subItem.CArrivalTime"></el-input>
</div>
<div v-else class="FweekList" v-for="item in dateObj2">
<el-checkbox type="text" v-model="item.CheckStatus" ></el-checkbox>
<el-date-picker clearable class="w135" v-model="item.CDepartTime" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')"></el-date-picker>
<el-date-picker clearable class="w135" v-model="item.CArrivalTime" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')"></el-date-picker>
<div v-if="PostData.UpdateType==2" class="FweekList" v-for="subItem in dateObj">
<el-checkbox @change='changeItem(subItem)' v-model='subItem.CheckStatus'>{{subItem.WeekDayStr}}</el-checkbox>
<el-input class="w135" v-model="subItem.CDepartTime"></el-input>
<el-input class="w135" v-model="subItem.CArrivalTime"></el-input>
</div>
</td>
</tr>
......@@ -182,7 +187,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
......@@ -204,64 +209,68 @@
currentPage: 1,
},
loading: true,
noData: false,
PostData: {
StartDate: "",
EndDate: "",
FlightId: this.$route.query.id,
//1-全部更新，2，按周一，周二更新
UpdateType: 1,
SubList: [{
CDepartTime: "09:00",
CArrivalTime: "16:40",
//0-全部，1周一...7周日
WeekDay: 0
}]
SubList: []
},
//删除数组
DeleteArray: [],
dialogTitle: '',
dateObj2: [{
week: '全部',
WeekDayStr: '全部',
WeekDay: 0,
CDepartTime: '',
CArrivalTime: ''
CArrivalTime: '',
}],
dateObj: [{
week: '周一',
WeekDayStr: '周一',
WeekDay: 1,
CDepartTime: '',
CArrivalTime: '',
CheckStatus: false
},
{
week: '周二',
WeekDayStr: '周二',
WeekDay: 2,
CDepartTime: '',
CArrivalTime: '',
CheckStatus: false
},
{
week: '周三',
WeekDayStr: '周三',
WeekDay: 3,
CDepartTime: '',
CArrivalTime: '',
CheckStatus: false
},
{
week: '周四',
WeekDayStr: '周四',
WeekDay: 4,
CDepartTime: '',
CArrivalTime: '',
CheckStatus: false
},
{
week: '周五',
WeekDayStr: '周五',
WeekDay: 5,
CDepartTime: '',
CArrivalTime: '',
CheckStatus: false
},
{
week: '周六',
WeekDayStr: '周六',
WeekDay: 6,
CDepartTime: '',
CArrivalTime: '',
CheckStatus: false
},
{
week: '周日',
WeekDayStr: '周日',
WeekDay: 7,
CDepartTime: '',
CArrivalTime: '',
CheckStatus: false
......@@ -270,21 +279,37 @@
beforeCheck: {
disabledDate: time => {
let endTime = new Date(this.msg.QEndDate);
let endTime = new Date(this.PostData.EndDate);
return endTime.getTime() < time.getTime();
}
},
afterCheck: {
disabledDate: time => {
let startTime = new Date(this.msg.QStartDate);
let startTime = new Date(this.PostData.StartDate);
return startTime.getTime() >= time.getTime();
}
},
airlineList: [],
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.QEndDate)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.QStartDate)
return startTime.getTime() >= time.getTime()
}
},
DataList: [],
};
},
methods: {
changeItem(subItem)
{
subItem.CheckStatus=!subItem.CheckStatus;
},
//获取列表数据
getList() {
this.loading = true;
......@@ -295,7 +320,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.msg.total = res.data.data.count;
this.noData = !this.total > 0;
this.noData = !this.msg.total > 0;
this.DataList = res.data.data.pageData;
} else {
this.Error(res.data.message);
......@@ -306,13 +331,42 @@
},
//提交创建、修改表单
submitForm(addMsg) {
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addGroupGuide();
} else {
return false;
}
});
this.SaveData();
},
SaveData() {
this.PostData.SubList = [];
if (this.PostData.UpdateType == 1) {
this.PostData.SubList.push(this.dateObj2[0]);
} else {
this.dateObj.forEach(item => {
if (item.CheckStatus) {
this.PostData.SubList.push(item);
}
});
}
this.apipost(
"flight_get_SetFlightChild",
this.PostData,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.PostData.StartDate = "";
this.PostData.EndDate = "";
this.PostData.UpdateType = 1;
this.dateObj2[0].CDepartTime = "";
this.dateObj2[0].CArrivalTime = "";
this.dateObj.forEach(item => {
item.CheckStatus = false;
item.CDepartTime = "";
item.CArrivalTime = "";
});
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//翻页功能按钮
handleCurrentChange(val) {
......@@ -324,15 +378,31 @@
this.msg.pageIndex = 1;
this.msg.currentPage = 1;
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
},
resetForm(formName) {
//弹出框取消 初始化谈框内表单
this.$refs[formName].clearValidate();
DeleteSingleChild(item) {
this.DeleteArray = [];
this.DeleteArray.push(item.ID);
this.PostDeleteArray();
},
//删除数组
PostDeleteArray() {
var that = this;
this.Confirm("是否删除", function () {
that.apipost(
"flight_get_RemoveFlightChild",
that.DeleteArray,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
that.DeleteArray = [];
} else {
that.Error(res.data.message);
}
},
err => {}
);
});
}
},
mounted() {
this.getList();
......
src/components/Ticketing/flightManagement.vue
View file @ 73c4a3f6
......@@ -230,8 +230,8 @@
<el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="效期维护" placement="top-start">
<el-button type="danger" icon="el-icon-delete" circle @click="gotoChild(item)"></el-button>
<el-tooltip class="item" effect="dark" content="效期维护" placement="top-start" style="display:none;">
<el-button type="primary" icon="iconfont icon-weihu" circle @click="gotoChild(item)"></el-button>
</el-tooltip>
</el-row>
</td>
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 73c4a3f6
......@@ -169,8 +169,8 @@
</span>利润
</div>
<div class="Team_Incontent">
<div>预计利润<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
<div>实际利润<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
<div>实际利润<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
<div>当前利润<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
</div>
</div>
</el-col>
......@@ -430,7 +430,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FiniceReciveList">
<tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'团款') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入') && NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<tr v-if="NotExists(item.CostTypeList,'团费')&& NotExists(item.CostTypeList,'小费')&&NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'团款') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入') && NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td>
......@@ -480,7 +480,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'邀请函费用') || isExists(item.CostTypeList,'名单表')">
<tr v-if="isExists(item.CostTypeList,'邀请函') || isExists(item.CostTypeList,'名单表')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -575,7 +575,7 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<!-- <tr v-if='item.OrderSource===4 || isExists(item.CostTypeList,'国际段机票')'> -->
<tr v-if="isExists(item.CostTypeList,'国际段机票') || item.OrderSource===4">
<tr v-if="(isExists(item.CostTypeList,'国际段机票') || item.OrderSource===4 || isExists(item.CostTypeList,'机票退税') || isExists(item.CostTypeList,'机票罚金') || isExists(item.CostTypeList,'机票税金')) || isExists(item.CostTypeList,'国内联运段机票')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -607,7 +607,7 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<!-- <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">国内联运机票：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
......@@ -622,7 +622,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'国内联运')">
<tr v-if="isExists(item.CostTypeList,'国内联运段机票')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -653,7 +653,7 @@
</td>
</tr>
</template>
</table>
</table> -->
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">签证：</div>
</div>
......@@ -763,7 +763,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'地接费（领取）')">
<tr v-if="(isExists(item.CostTypeList,'地接费（领取）') || (isExists(item.CostTypeList,'地接费（结算）'))) && item.Type==2">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -857,7 +857,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="NotExists(item.CostTypeList,'签证费') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
<tr v-if="NotExists(item.CostTypeList,'签证费') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函') && NotExists(item.CostTypeList,'名单表') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......
src/components/confirmationOrderDownLoad.vue
View file @ 73c4a3f6
......@@ -161,7 +161,7 @@
<td>{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="140">{{flight.alName}}</td>
<td width="90">{{flight.flightNumber}}</td>
<td width="110">{{flight.flightNumber}}({{(priceList.length>0&&priceList[0].outNotice==1)?"OK":"暂定"}})</td>
</tr>
</tbody>
<tbody v-else-if="priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0">
......@@ -173,7 +173,7 @@
<td>{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="140">{{flight.alName}}</td>
<td width="90">{{flight.flightNumber}}</td>
<td width="110">{{flight.flightNumber}}({{(priceList.length>0&&priceList[0].outNotice==1)?"OK":"暂定"}})</td>
</tr>
</tbody>
<tbody v-else>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 73c4a3f6
......@@ -715,7 +715,7 @@
</div>
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<table class="TphotelTable" border="0" cellspacing='1'>
<tr v-for="item in returnPriceList[0].PriceHotelList">
<!-- <tr v-if="returnPriceList" v-for="item in returnPriceList[0].PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
......@@ -724,7 +724,7 @@
</div>
</div>
</td>
</tr>
</tr> -->
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary">{{$t('pub.saveBtn')}}</button> &nbsp;
......
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