Skip to content

S
SuperMan
Commit 940d7e3b authored by 黄奎's avatar 黄奎
Browse files
Options

时间选择修改

parent d77fe838
Hide whitespace changes
Inline Side-by-side
Showing with 267 additions and 277 deletions
src/components/Ticketing/TicketManager.vue
View file @ 940d7e3b
......@@ -9,8 +9,6 @@
.TicketManager ._ol_info {
font-size: 12px;
/* width: 100%;
overflow-x: auto; */
height: 100%;
}
......@@ -68,19 +66,17 @@
min-height: 500px;
}
.TicketManager ._ol_list > li {
/* height: 107px; */
.TicketManager ._ol_list>li {
margin: 20px 0 0px 0px;
transition: linear all 0.5s;
background-color: #fff;
border: 1px solid #dddddd;
border-left: 0;
/* overflow: hidden; */
position: relative;
padding-top:10px;
padding-top: 10px;
}
.TicketManager ._ol_list > li:hover {
.TicketManager ._ol_list>li:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
......@@ -125,8 +121,6 @@
}
.TicketManager ._oll_info {
/* padding-left: 20px;
width: 200px; */
max-width: 100%;
}
......@@ -268,24 +262,22 @@
}
.TicketManager .TK_SeatList {
/* width: 245px; */
height: 60px;
background-color: #f9f9f9;
/* margin-top: 9px; */
padding-right: 3px;
}
.TicketManager .TK_SeatList > ul > li:nth-child(1) {
.TicketManager .TK_SeatList>ul>li:nth-child(1) {
margin-left: 5px;
}
.TicketManager .TK_SeatList > ul > li {
.TicketManager .TK_SeatList>ul>li {
float: left;
text-align: center;
margin: 5px 4px 0 0;
}
.TicketManager .TK_SeatList > ul > li:last-child {
.TicketManager .TK_SeatList>ul>li:last-child {
margin-right: 0;
}
......@@ -327,32 +319,26 @@
text-decoration: underline;
}
.TMA_raduis > ul {
.TMA_raduis>ul {
display: -webkit-box;
align-items: center;
}
.TMA_raduis > ul > li {
.TMA_raduis>ul>li {}
}
/* .TMA_raduis > ul > li:not(._head) {
background-color: #bcbcbc;
color: #909090;
} */
.TMA_raduis > ul > li._head {
.TMA_raduis>ul>li._head {
display: flex;
align-items: center;
}
.TMA_raduis > ul > li._head img {
.TMA_raduis>ul>li._head img {
height: 26px;
width: 26px;
border-radius: 50%;
margin-left: 15px;
}
.TMA_raduis > ul > li._head span {
.TMA_raduis>ul>li._head span {
padding-left: 7px;
display: inline-block;
margin-right: 25px;
......@@ -422,17 +408,17 @@
border: none !important;
}
._add_sel > ul > li {
._add_sel>ul>li {
margin-right: 15px;
float: left;
}
._add_sel > ul > li input,
._add_ret > ul > li input {
._add_sel>ul>li input,
._add_ret>ul>li input {
height: 30px;
}
._add_ret > ul > li {
._add_ret>ul>li {
margin-bottom: 20px;
}
......@@ -447,18 +433,18 @@
border-bottom: 1px dashed #dadada;
}
._add_hangban > li {
._add_hangban>li {
float: left;
display: -webkit-box;
padding: 20px 0;
overflow: auto;
}
._add_hangban > li > div {
._add_hangban>li>div {
margin-right: 20px;
}
._add_hangban > li:nth-child(2) {
._add_hangban>li:nth-child(2) {
border-left: 1px dashed #dadada;
padding-left: 10px;
}
......@@ -467,13 +453,13 @@
display: flex;
}
._add_go > span {
._add_go>span {
font-size: 14px;
color: #000000;
padding-right: 15px;
}
._add_go > div {
._add_go>div {
font-size: 12px;
color: #666666;
background-color: #e0f4ff;
......@@ -482,7 +468,7 @@
border-radius: 4px;
}
._add_go > div > p:nth-child(1) {
._add_go>div>p:nth-child(1) {
padding: 0 13px;
color: #387ea5;
background-color: #cbe9fa;
......@@ -490,14 +476,14 @@
line-height: 34px;
}
._add_go > div > p:nth-child(1) .icon-xingzhuang {
._add_go>div>p:nth-child(1) .icon-xingzhuang {
float: right;
font-size: 12px;
margin-top: 2px;
cursor: pointer;
}
._add_go > div > p:nth-child(1) .icon-xingzhuang:hover {
._add_go>div>p:nth-child(1) .icon-xingzhuang:hover {
color: #e95252;
}
......@@ -537,7 +523,8 @@
font-size: 12px;
border-color: #5395b9 !important;
}
._add_go .el-input .el-input__inner{
._add_go .el-input .el-input__inner {
height: 30px;
}
......@@ -603,12 +590,6 @@
margin-top: 8px;
}
._command_box {
}
._command_tb {
}
._command_tb {
width: -webkit-fill-available;
margin-top: 10px;
......@@ -646,9 +627,6 @@
table-layout: fixed;
}
._command_tb tbody {
}
._tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
......@@ -751,7 +729,7 @@
font-size: 14px;
}
._allWidth > span {
._allWidth>span {
padding-right: 10px;
}
......@@ -829,17 +807,16 @@
.TicketManager .InfoChangeLog .changLog::-webkit-scrollbar,
.TicketManager ._ol_info::-webkit-scrollbar,
.addTicketManager::-webkit-scrollbar,
._add_hangban > li::-webkit-scrollbar,
._add_hangban>li::-webkit-scrollbar,
.Journal .changLogList::-webkit-scrollbar {
/*滚动条整体样式*/
width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
width: 4px;
height: 8px;
}
.TicketManager .InfoChangeLog .changLog::-webkit-scrollbar-thumb,
.TicketManager ._ol_info::-webkit-scrollbar-thumb,
.addTicketManager::-webkit-scrollbar-thumb,
._add_hangban > li::-webkit-scrollbar-thumb,
._add_hangban>li::-webkit-scrollbar-thumb,
.Journal .changLogList::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
border-radius: 4px;
......@@ -850,7 +827,7 @@
.TicketManager .InfoChangeLog .changLog::-webkit-scrollbar-track,
.TicketManager ._ol_info::-webkit-scrollbar-track,
.addTicketManager::-webkit-scrollbar-track,
._add_hangban > li::-webkit-scrollbar-track,
._add_hangban>li::-webkit-scrollbar-track,
.Journal .changLogList::-webkit-scrollbar-track {
/*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
......@@ -897,7 +874,7 @@
}
._pingtai .el-form-item,
._add_ret > ul > li .el-form-item {
._add_ret>ul>li .el-form-item {
display: flex;
}
......@@ -1051,7 +1028,8 @@
.TicketManager .addTicketManager::-webkit-scrollbar {
/*滚动条整体样式*/
width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
width: 4px;
/*高宽分别对应横竖滚动条的尺寸*/
height: 8px;
}
......@@ -1129,7 +1107,6 @@
.TicketManager .vmiddle {
display: flex;
align-items: Center;
/* height: 78px; */
}
.Plan_Query .el-button--primary {
......@@ -1189,14 +1166,13 @@
}
.Ticket_TCID {
margin:5px 25px 5px 0;
margin: 5px 25px 5px 0;
display: inline-block;
}
/*航班详情*/
.TicketManager .FlightDivDetails {
width: 100%;
/* height: 65px; */
overflow: auto;
}
......@@ -1228,19 +1204,21 @@
}
.TicketManager .TK_raduis ul li {
margin-left:10px;
margin-left: 10px;
float: left;
}
.FinaceDanList {
cursor: pointer;
}
.teamTitle{
text-indent:10px;
min-height:28px;
border-top:1px solid #ccc;
line-height:28px;
.teamTitle {
text-indent: 10px;
min-height: 28px;
border-top: 1px solid #ccc;
line-height: 28px;
}
</style>
<template>
<div class="flexOne TicketManager">
......@@ -1260,8 +1238,8 @@
<em>线路</em>
<el-select v-model="msg.LineId" :placeholder="$t('pub.pleaseSel')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName"
:value="item.LineID"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</span>
</li>
......@@ -1270,20 +1248,20 @@
<em>航空公司</em>
<el-select v-model="msg.AirLineID" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId" :key="item.AirLineId">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>航班日期</em>
<el-date-picker clearable class="w135" v-model="msg.QFlightDateStart" type="date"
:picker-options="beforeCheck"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
<el-date-picker class="w135" v-model="msg.QFlightDateStart" type="date"
:picker-options="beforeCheck" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
</el-date-picker>
<span class="_ln">-</span>
<el-date-picker clearable class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
<el-date-picker class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</span>
</li>
<li>
......@@ -1292,14 +1270,14 @@
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>编号</em>
<el-input v-model="msg.ID" placeholder="机票编号" @keyup.native="checkInteger(msg,'ID')"></el-input>
<el-input v-model="msg.ID" placeholder="机票编号" @keyup.native="checkInteger(msg,'ID')"></el-input>
</span>
</li>
<li>
......@@ -1307,8 +1285,8 @@
<em>定金类型</em>
<el-select v-model="msg.DepositType" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in DepositTypeArray" :label="item.Name" :value="item.Id"
:key="item.Id"></el-option>
<el-option v-for="item in DepositTypeArray" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</span>
</li>
......@@ -1380,7 +1358,7 @@
<el-col :span="2" class="vmiddle" style="width:85px;">
<div class="_oll_info">
<el-tooltip class="item" effect="dark" :content="item.AirlineName" placement="top-start"
popper-class="max-w250">
popper-class="max-w250">
<p class="_oll_tit">{{item.AirlineName}}</p>
</el-tooltip>
<span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
......@@ -1490,7 +1468,8 @@
</div>
<div class="FinaDetailContent">
<span v-if="item.FirstAuditList!=null" v-for="childItem in item.FirstAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
<span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
......@@ -1503,7 +1482,8 @@
</div>
<div class="FinaDetailContent">
<span v-if="item.SecondAuditList!=null" v-for="childItem in item.SecondAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
<span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
......@@ -1516,7 +1496,8 @@
</div>
<div class="FinaDetailContent">
<span v-if="item.ThirdAuditList!=null" v-for="childItem in item.ThirdAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
<span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
......@@ -1529,7 +1510,8 @@
</div>
<div class="FinaDetailContent">
<span v-if="item.FourthAuditList!=null" v-for="childItem in item.FourthAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
<span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
......@@ -1542,7 +1524,8 @@
</div>
<div class="FinaDetailContent">
<span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
<span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
......@@ -1572,25 +1555,23 @@
<el-button type="primary" icon="iconfont icon-Edit" @click="getEntityExtend(item.ID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="旅客名单" placement="top-start">
<el-button type="primary" icon="iconfont icon-lists"
@click="goUrl('PassengerList',item,'旅客名单')"></el-button>
<el-button type="primary" icon="iconfont icon-lists" @click="goUrl('PassengerList',item,'旅客名单')">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="联运设置" placement="top-start" style="display:none;">
<el-button type="primary" icon="iconfont icon-ico_shezhi"
@click="goUrl('ThroughSetting',item,'联运设置')"
style="margin-left:0;"></el-button>
@click="goUrl('ThroughSetting',item,'联运设置')" style="margin-left:0;"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-button type="primary" icon="iconfont icon-img_delete_small" @click="DeleteAirticket(item.ID)"
style="margin-left:0;"></el-button>
style="margin-left:0;"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.TripItinerary==''?'行程单上传':'行程单下载'"
placement="top-start">
placement="top-start">
<el-button v-if="item.TripItinerary==''" type="primary" icon="iconfont icon-upload"
style="margin-left:0;"
@click="outerVisible1=true,UploadItineraryMsg.ID=item.ID"></el-button>
style="margin-left:0;" @click="outerVisible1=true,UploadItineraryMsg.ID=item.ID"></el-button>
<el-button v-else type="primary" icon="iconfont icon-xiazai2" style="margin-left:0;"
@click="DownLoad(3,item.TripItinerary)"></el-button>
@click="DownLoad(3,item.TripItinerary)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="散卖" placement="top-start">
......@@ -1604,7 +1585,7 @@
<ul v-if="orderlogList.length!=0" class="changLogList">
<li v-for="item in orderlogList" class="changLogList_l">
<span class="_radius_green"
:style="item.EndValue>item.StartValue?'background-color: #47BF8C':'background-color: #E95252'"></span>
:style="item.EndValue>item.StartValue?'background-color: #47BF8C':'background-color: #E95252'"></span>
<p class="changLog_time">{{item.UpdateDateStr}}</p>
<p class="TM_UPdate">{{item.UpdateName}} {{item.UpdateTypeStr}}</p>
</li>
......@@ -1615,7 +1596,7 @@
</div>
</div>
<el-button type="primary" slot="reference" icon="iconfont icon-rizhi"
@click="InfoChangeLogShow(item.ID)"></el-button>
@click="InfoChangeLogShow(item.ID)"></el-button>
</el-popover>
</el-tooltip>
</el-button-group>
......@@ -1624,13 +1605,14 @@
<el-row :gutter="0">
<el-col :span="1">
<div class="teamTitle">团期：</div>
<div class="teamTitle">团期：</div>
</el-col>
<el-col :span="15">
<div class="TCID_cont PingFangSC">
<span v-show="item.PriceList==null ||item.PriceList.length==0">暂无</span>
<span class="Ticket_TCID" v-for="subItem in item.PriceList">
<a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",subItem.TCID,"报名清单")'> ({{subItem.TCID}}){{subItem.TCNUM}} </a>
<a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",subItem.TCID,"报名清单")'>
({{subItem.TCID}}){{subItem.TCNUM}} </a>
<a style="color:red;cursor:pointer;" @click="goUrlTicketUnion(subItem.TCID,item.ID)">设置联运</a>
</span>
</div>
......@@ -1643,35 +1625,34 @@
</ul>
<div class="noData" v-show="noData">{{$t('system.content_noData')}}</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total="total"></el-pagination>
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
</div>
</div>
<el-form class="addTicketManager" :class="addShow==true?'edHeight':''" :model="addMsg" :rules="rules" ref="addMsg"
label-width="100px">
label-width="100px">
<p class="_add_t">{{$t('Airticket.Air_AddTickets')}}</p>
<div class="_add_sel">
<ul class="clearfix">
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_positions')" prop="FreightSpace">
<el-select v-model="addMsg.FreightSpace" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in FreightSpaceList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option>
<el-option v-for="item in FreightSpaceList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_TicketType')" prop="TicketType">
<el-select v-model="addMsg.TicketType" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in TicketTypeList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option>
<el-option v-for="item in TicketTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_TicketDeadLine')" prop="TicketDeadline">
<el-date-picker v-model="addMsg.TicketDeadline" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -1681,35 +1662,36 @@
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_unitPrice')" prop="CostPrice">
<el-input v-model="addMsg.CostPrice" placeholder="0.0"
@keyup.native="checkPrice(addMsg,'CostPrice')"></el-input>
<el-input v-model="addMsg.CostPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'CostPrice')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_salesPrice')" prop="SalePrice">
<el-input v-model="addMsg.SalePrice" placeholder="0.0"
@keyup.native="checkPrice(addMsg,'SalePrice')"></el-input>
<el-input v-model="addMsg.SalePrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'SalePrice')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_b2bPrice')" prop="B2BPrice">
<el-input v-model="addMsg.B2BPrice" placeholder="0.0"
@keyup.native="checkPrice(addMsg,'B2BPrice')"></el-input>
<el-input v-model="addMsg.B2BPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'B2BPrice')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_b2cPrice')" prop="B2CPrice">
<el-input v-model="addMsg.B2CPrice" placeholder="0.0"
@keyup.native="checkPrice(addMsg,'B2CPrice')"></el-input>
<el-input v-model="addMsg.B2CPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'B2CPrice')">
</el-input>
</el-form-item>
</el-col>
</ul>
</div>
<!--添加修改航班-->
<ul class="_add_hangban clearfix">
<li v-if="addMsg.TicketType" :class="addMsg.TicketType==1?'_allWidth':''">
<span class="_add_go_label">{{$t('Airticket.Air_go')}}</span>
<div class="_add_go" v-for="(item,index) in addMsg.flightList"
v-if="addMsg.flightList&&item.FlightSubType==1">
v-if="addMsg.flightList&&item.FlightSubType==1">
<div>
<p>
<span class="iconfont icon-hangban"></span>
......@@ -1717,28 +1699,30 @@
<span class="iconfont icon-xingzhuang" @click="deletFlightInfo(item.ID,index)"></span>
</p>
<el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
popper-class="max-w250">
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">
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">
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
</p>
</el-tooltip>
<div style="margin:10px 0 0 12px;">
<el-input type="text" class="w80" v-model="item.TicketDepartureTime" @keyup.native="checkTime(item,'TicketDepartureTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input> -
<el-input type="text" class="w80" v-model="item.TicketArrivalTime" @keyup.native="checkTime(item,'TicketArrivalTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input>
<el-input type="text" class="w80" v-model="item.TicketDepartureTime"
@keyup.native="checkTime(item,'TicketDepartureTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input> -
<el-input type="text" class="w80" v-model="item.TicketArrivalTime"
@keyup.native="checkTime(item,'TicketArrivalTime')" maxlength="5" :placeholder="$t('system.ph_time')">
</el-input>
</div>
</div>
</div>
......@@ -1751,25 +1735,24 @@
<span class="_add_hbh">
<em class>航空公司</em>
<el-select v-model="addGoFlight.AirLineID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getAirportNameList(addGoFlight.AirLineID,1)"
class="w150">
@change="getAirportNameList(addGoFlight.AirLineID,1)" class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option>
:key="item.AirLineId"></el-option>
</el-select>
</span>
<span class="_add_hbh">
<em class>{{$t('system.query_flightNum')}}</em>
<el-select v-model="addGoFlight.FlightID" filterable :placeholder="$t('system.ph_choice')" class="w150">
<el-option v-for="item in AirportNameList" :key="item.ID" :label="item.Flight_number"
:value="item.ID"></el-option>
:value="item.ID"></el-option>
</el-select>
</span>
<span class="_add_hbh">
<em class="demonstration">{{$t('pub.date')}}</em>
<el-date-picker class="w150 _add_date" v-model="addGoFlight.FlightDate" type="date"
:placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
:placeholder="$t('admin.admin_choDate')" value-format="yyyy-MM-dd" :picker-options="pickerOptions1">
</el-date-picker>
</span>
</div>
</div>
......@@ -1777,7 +1760,7 @@
<li v-if="addMsg.TicketType==2">
<span class="_add_go_label">{{$t('Airticket.Air_returnTrip')}}</span>
<div class="_add_go" v-for="(item,index) in addMsg.flightList"
v-if="addMsg.flightList&&item.FlightSubType==3">
v-if="addMsg.flightList&&item.FlightSubType==3">
<div>
<p>
<span class="iconfont icon-hangban"></span>
......@@ -1785,28 +1768,30 @@
<span class="iconfont icon-xingzhuang" @click="deletFlightInfo(item.ID,index)"></span>
</p>
<el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
popper-class="max-w250">
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">
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">
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_arrivalAir')}}：{{item.aName}}</span>
</p>
</el-tooltip>
<div style="margin:10px 0 0 12px;">
<el-input type="text" class="w80" v-model="item.TicketDepartureTime" @keyup.native="checkTime(item,'TicketDepartureTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input> -
<el-input type="text" class="w80" v-model="item.TicketArrivalTime" @keyup.native="checkTime(item,'TicketArrivalTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input>
<el-input type="text" class="w80" v-model="item.TicketDepartureTime"
@keyup.native="checkTime(item,'TicketDepartureTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input> -
<el-input type="text" class="w80" v-model="item.TicketArrivalTime"
@keyup.native="checkTime(item,'TicketArrivalTime')" maxlength="5" :placeholder="$t('system.ph_time')">
</el-input>
</div>
</div>
</div>
......@@ -1819,26 +1804,25 @@
<span class="_add_hbh">
<em class>航空公司</em>
<el-select v-model="returnTripData.AirLineID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getAirportNameList(returnTripData.AirLineID,2)"
class="w150">
@change="getAirportNameList(returnTripData.AirLineID,2)" class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option>
:key="item.AirLineId"></el-option>
</el-select>
</span>
<span class="_add_hbh">
<em class>{{$t('system.query_flightNum')}}</em>
<el-select v-model="returnTripData.FlightID" filterable :placeholder="$t('system.ph_choice')"
class="w150">
class="w150">
<el-option v-for="item in BackAirportNameList" :key="item.ID" :label="item.Flight_number"
:value="item.ID"></el-option>
:value="item.ID"></el-option>
</el-select>
</span>
<span class="_add_hbh">
<em class="demonstration">{{$t('pub.date')}}</em>
<el-date-picker class="w150 _add_date" v-model="returnTripData.FlightDate" type="date"
:placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
:placeholder="$t('admin.admin_choDate')" value-format="yyyy-MM-dd" :picker-options="pickerOptions1">
</el-date-picker>
</span>
</div>
</div>
......@@ -1848,31 +1832,31 @@
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_yiding')">
<el-date-picker v-model="addMsg.FirstDeposit" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_erding')">
<el-date-picker v-model="addMsg.SecondDeposit" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_sanding')">
<el-date-picker v-model="addMsg.ThirdDeposit" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_siding')">
<el-date-picker v-model="addMsg.FourthDeposit" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_lastPayment')">
<el-date-picker v-model="addMsg.FinalPayment" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -1891,8 +1875,8 @@
<el-form-item label="线路" prop="LineId">
<el-select v-model="addMsg.LineId" :placeholder="$t('pub.pleaseSel')" class="multiple_input">
<el-option label='不限' :value='comdefaultSelect'></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName"
:value="item.LineID"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -1905,42 +1889,42 @@
</div>
</div>
</el-form>
<el-form class="addTicketManager" :class="command==true?'edHeight':''" :model="addMsg" :rules="rules" ref="addMsgCmd"
label-width="100px">
<el-form class="addTicketManager" :class="command==true?'edHeight':''" :model="addMsg" :rules="rules"
ref="addMsgCmd" label-width="100px">
<div class="combottomTitle">{{$t('Airticket.Air_orderImport')}}</div>
<div class="_command_box">
<table class="_command_tb" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>{{$t('Airticket.Air_segment')}}</th>
<th>{{$t('system.query_flightNum')}}</th>
<th>{{$t('Airticket.Air_positionLevel')}}</th>
<th>{{$t('Airticket.Air_flightDate')}}</th>
<th>{{$t('Airticket.Air_Trip')}}</th>
<th>{{$t('Airticket.Air_Number')}}</th>
<th>{{$t('system.query_flightAir')}}</th>
<th>{{$t('system.ph_flightTime')}}</th>
<th>{{$t('system.query_arrivalAir')}}</th>
<th>{{$t('system.query_arrivalTime')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr>
<th>{{$t('Airticket.Air_segment')}}</th>
<th>{{$t('system.query_flightNum')}}</th>
<th>{{$t('Airticket.Air_positionLevel')}}</th>
<th>{{$t('Airticket.Air_flightDate')}}</th>
<th>{{$t('Airticket.Air_Trip')}}</th>
<th>{{$t('Airticket.Air_Number')}}</th>
<th>{{$t('system.query_flightAir')}}</th>
<th>{{$t('system.ph_flightTime')}}</th>
<th>{{$t('system.query_arrivalAir')}}</th>
<th>{{$t('system.query_arrivalTime')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in TicketOrderList">
<td v-if="index<1">{{$t('Airticket.Air_go')}}</td>
<td v-else-if="index!==TicketOrderList.length-1">{{$t('Airticket.Air_transit')}}</td>
<td v-else-if="index==TicketOrderList.length-1">{{$t('Airticket.Air_returnTrip')}}</td>
<td>{{item.FlightCode}}</td>
<td>{{item.FreightSpaceStr}}</td>
<td>{{item.FlightDate}}</td>
<td>{{item.StartCityName}}-{{item.ArrivalCityName}}</td>
<td>{{item.Num}}</td>
<td>{{item.StartAirport}}</td>
<td>{{item.StartTime}}</td>
<td>{{item.ArrivalAirport}}</td>
<td>{{item.ArrivalTime}}</td>
<td class="_delete_cmd" @click="deleteCmd(index)">{{$t('system.ph_shanchu')}}</td>
</tr>
<tr v-for="(item,index) in TicketOrderList">
<td v-if="index<1">{{$t('Airticket.Air_go')}}</td>
<td v-else-if="index!==TicketOrderList.length-1">{{$t('Airticket.Air_transit')}}</td>
<td v-else-if="index==TicketOrderList.length-1">{{$t('Airticket.Air_returnTrip')}}</td>
<td>{{item.FlightCode}}</td>
<td>{{item.FreightSpaceStr}}</td>
<td>{{item.FlightDate}}</td>
<td>{{item.StartCityName}}-{{item.ArrivalCityName}}</td>
<td>{{item.Num}}</td>
<td>{{item.StartAirport}}</td>
<td>{{item.StartTime}}</td>
<td>{{item.ArrivalAirport}}</td>
<td>{{item.ArrivalTime}}</td>
<td class="_delete_cmd" @click="deleteCmd(index)">{{$t('system.ph_shanchu')}}</td>
</tr>
</tbody>
</table>
</div>
......@@ -1948,31 +1932,31 @@
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_yiding')">
<el-date-picker v-model="addMsg.FirstDeposit" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_erding')">
<el-date-picker v-model="addMsg.SecondDeposit" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_sanding')">
<el-date-picker v-model="addMsg.ThirdDeposit" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_siding')">
<el-date-picker v-model="addMsg.FourthDeposit" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_lastPayment')">
<el-date-picker v-model="addMsg.FinalPayment" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -1983,31 +1967,31 @@
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_TicketDeadLine')" prop="TicketDeadline">
<el-date-picker v-model="addMsg.TicketDeadline" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_unitPrice')" prop="CostPrice">
<el-input v-model="addMsg.CostPrice" placeholder="0.0"
@keyup.native="checkPrice(addMsg,'CostPrice')"></el-input>
<el-input v-model="addMsg.CostPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'CostPrice')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_salesPrice')" prop="SalePrice">
<el-input v-model="addMsg.SalePrice" placeholder="0.0"
@keyup.native="checkPrice(addMsg,'SalePrice')"></el-input>
<el-input v-model="addMsg.SalePrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'SalePrice')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_b2bPrice')" prop="B2BPrice">
<el-input v-model="addMsg.B2BPrice" placeholder="0.0"
@keyup.native="checkPrice(addMsg,'B2BPrice')"></el-input>
<el-input v-model="addMsg.B2BPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'B2BPrice')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('Airticket.Air_b2cPrice')" prop="B2CPrice">
<el-input v-model="addMsg.B2CPrice" placeholder="0.0"
@keyup.native="checkPrice(addMsg,'B2CPrice')"></el-input>
<el-input v-model="addMsg.B2CPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'B2CPrice')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -2025,8 +2009,8 @@
<el-col :span="5">
<el-form-item label="线路">
<el-select v-model="addMsg.LineId" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName"
:value="item.LineID"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -2036,8 +2020,8 @@
<i class="iconfont icon-arrow1"></i>
</span>
<el-input type="textarea" :autosize="{minRows: 1, maxRows: 8 }" resize="none"
:placeholder="$t('Airticket.Air_inputOrder')"
v-model="TicketOrder" class="cmd_input" @keyup.enter.native="getPostTicketOrder()"></el-input>
:placeholder="$t('Airticket.Air_inputOrder')" v-model="TicketOrder" class="cmd_input"
@keyup.enter.native="getPostTicketOrder()"></el-input>
</div>
<div class="TM_OrderRemind">输入完成后回车即可导入</div>
</el-col>
......@@ -2057,41 +2041,34 @@
<p class="_add_t">散卖机票</p>
</el-col>
<el-col :span="4">
<button
type="button"
class="normalBtn"
@click="saveSales()"
>{{$t('pub.saveBtn')}}</button>
<button
class="hollowFixedBtn"
type="button"
@click="resetForm('addMsg'),sanmai=false"
>{{$t('pub.cancelBtn')}}</button>
<button type="button" class="normalBtn" @click="saveSales()">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="resetForm('addMsg'),sanmai=false">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<div class="_add_sel">
<ul class="clearfix">
<el-col :span="5">
<el-form-item label="人数" prop="AirTicketNum">
<el-input v-model="sales.AirTicketNum" @keyup.native="checkInteger(sales,'AirTicketNum')"></el-input>
<el-input v-model="sales.AirTicketNum" @keyup.native="checkInteger(sales,'AirTicketNum')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="B2B单价" prop="B2BPrice">
<el-input v-model="sales.B2BPrice" @keyup.native="checkPrice(sales,'B2BPrice')"></el-input>
<el-input v-model="sales.B2BPrice" @keyup.native="checkPrice(sales,'B2BPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="B2C单价" prop="B2CPrice">
<el-input v-model="sales.B2CPrice" @keyup.native="checkPrice(sales,'B2CPrice')"></el-input>
<el-input v-model="sales.B2CPrice" @keyup.native="checkPrice(sales,'B2CPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="是否特惠" prop="IsDiscounts">
<el-select v-model="sales.IsDiscounts" :placeholder="$t('pub.pleaseSel')">
<el-option label="否" value="0" selected></el-option>
<el-option label="是" value="1"></el-option>
</el-select>
<el-select v-model="sales.IsDiscounts" :placeholder="$t('pub.pleaseSel')">
<el-option label="否" value="0" selected></el-option>
<el-option label="是" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
</ul>
......@@ -2101,7 +2078,7 @@
<el-dialog custom-class="w700" :title="importFileTitle" :visible.sync="outerVisible" center>
<el-upload v-if="uploadDoc" ref="ticketUpload" drag class="upload-demo" :action="getImportFileUrl()"
:on-success="handleAvatarSuccess">
:on-success="handleAvatarSuccess">
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处，或
......@@ -2113,7 +2090,7 @@
<el-dialog custom-class="w400" title="行程单上传" :visible.sync="outerVisible1" center>
<el-upload v-if="uploadDoc" ref="ticketUploadItinerary" drag class="upload-demo" :http-request="uploadItinerary"
:on-success="handleAvatarItinerarySuccess" action>
:on-success="handleAvatarItinerarySuccess" action>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处，或
......@@ -2271,17 +2248,17 @@
dataList: [],
addShow: false,
command: false,
sanmai:false,
sanmai: false,
uploadDoc: true,
//散卖obj
sales:{
AirTicketId:0,
AirTicketNum:0,
B2BPrice:'',
B2CPrice:'',
IsDiscounts:'0'
sales: {
AirTicketId: 0,
AirTicketNum: 0,
B2BPrice: '',
B2CPrice: '',
IsDiscounts: '0'
},
//1-一般导入，2-多航段导入
......@@ -2293,14 +2270,26 @@
},
beforeCheck: {
disabledDate: time => {
let endTime = new Date(this.msg.QFlightDateEnd);
return endTime.getTime() < time.getTime();
if (this.msg.QFlightDateEnd != '') {
let endTime = new Date(this.msg.QFlightDateEnd);
return time&&endTime.getTime() < time.getTime();
}else
{
return false;
}
}
},
afterCheck: {
disabledDate: time => {
let startTime = new Date(this.msg.QFlightDateStart);
return startTime.getTime() >= time.getTime();
if (this.msg.QFlightDateStart != '') {
let startTime = new Date(this.msg.QFlightDateStart);
//可以选择当天
return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000;
}
else
{
return false;
}
}
},
rules: {
......@@ -2361,7 +2350,7 @@
required: true,
}],
},
salerules:{
salerules: {
AirTicketNum: [{
required: true,
message: "请填写人数",
......@@ -2383,12 +2372,26 @@
methods: {
//页面跳转
goUrlT(path, obj, title) {
this.$router.push({name: path, query: {"id": obj, blank: 'y', tab: title}})
this.$router.push({
name: path,
query: {
"id": obj,
blank: 'y',
tab: title
}
})
},
//联运跳转
goUrlTicketUnion(TCID,AirticketId)
{
this.$router.push({name: "TicketTransport", query: {"tcid": TCID,"AirticketId":AirticketId, blank: 'y', tab: "设置联运"}})
goUrlTicketUnion(TCID, AirticketId) {
this.$router.push({
name: "TicketTransport",
query: {
"tcid": TCID,
"AirticketId": AirticketId,
blank: 'y',
tab: "设置联运"
}
})
},
//上传行程单
uploadItinerary(item) {
......@@ -2436,7 +2439,7 @@
case 4:
classStr = "_bg_gre";
break;
//审核中样式
//审核中样式
case 2:
classStr = "bg_auditing";
break;
......@@ -2505,8 +2508,7 @@
this.outerVisible = true;
},
//下载(不要删除)
getDownLoad() {
},
getDownLoad() {},
//下载文件
DownLoad(Type, str) {
if (Type == 1) {
......@@ -2545,8 +2547,7 @@
this.msg.ID = "";
}
},
err => {
}
err => {}
);
},
//初始化航空公司下拉
......@@ -2558,8 +2559,7 @@
this.airlineList = res.data.data;
}
},
err => {
}
err => {}
);
},
//获取舱位列表
......@@ -2571,8 +2571,7 @@
this.FreightSpaceList = res.data.data;
}
},
err => {
}
err => {}
);
},
//获取机票类型
......@@ -2584,8 +2583,7 @@
this.TicketTypeList = res.data.data;
}
},
err => {
}
err => {}
);
},
//新增去程
......@@ -2617,6 +2615,8 @@
newList.AirLineTicketId = this.addGoFlight.AirLineTicketId;
newList.AirLineID = this.addGoFlight.AirLineID;
newList.FlightSubType = this.addGoFlight.FlightSubType;
newList.TicketDepartureTime = x.DepartureTime;
newList.TicketArrivalTime = x.ArrivalTime;
newList.ID = this.addGoFlight.ID;
this.addMsg.flightList.push(newList);
}
......@@ -2656,6 +2656,8 @@
newList.AirLineTicketId = this.returnTripData.AirLineTicketId;
newList.FlightSubType = this.returnTripData.FlightSubType;
newList.AirLineID = this.returnTripData.AirLineID;
newList.TicketDepartureTime = x.DepartureTime;
newList.TicketArrivalTime = x.ArrivalTime;
newList.ID = this.returnTripData.ID;
this.addMsg.flightList.push(newList);
}
......@@ -2733,7 +2735,7 @@
this.chengeDelIdList = [];
this.apipost(
"ticket_get_GetEntityExtend", {
ID:ID
ID: ID
},
res => {
if (res.data.resultCode == 1) {
......@@ -2754,8 +2756,7 @@
this.Warning(res.data.message);
}
},
err => {
}
err => {}
);
},
//根据航空公司ID 获取机场列表
......@@ -2782,8 +2783,7 @@
}
}
},
err => {
}
err => {}
);
},
......@@ -2842,8 +2842,7 @@
this.Warning(res.data.message);
}
},
err => {
}
err => {}
);
},
//删除
......@@ -2862,10 +2861,8 @@
"AirticketFlight_Post_RemoveByIds", {
TicketFlightId: chengeDelIdList.toString()
},
res => {
},
err => {
}
res => {},
err => {}
);
});
},
......@@ -2878,10 +2875,8 @@
"AirticketFlight_Post_Remove", {
TicketFlightId: id
},
res => {
},
err => {
}
res => {},
err => {}
);
});
},
......@@ -2915,7 +2910,8 @@
delete x.aName;
delete x.dName;
});
if (newList.flightList != null && newList.flightList.length > 0 && newList.flightList[0].AirLineID != undefined) {
if (newList.flightList != null && newList.flightList.length > 0 && newList.flightList[0].AirLineID !=
undefined) {
this.addMsg.AirLineID = newList.flightList[0].AirLineID;
}
// if (!this.addMsg.AirLineID) {
......@@ -2938,8 +2934,7 @@
this.command = false;
this.isSubmit = true;
},
err => {
}
err => {}
);
}
},
......@@ -2973,8 +2968,7 @@
res => {
this.orderlogList = res.data.data;
},
err => {
}
err => {}
);
},
//获取开放平台
......@@ -3051,8 +3045,7 @@
this.Error(res.data.message);
}
},
err => {
}
err => {}
);
},
goUrl(path, obj, name) {
......@@ -3102,8 +3095,7 @@
this.EmployeeList = res.data.data;
}
},
err => {
}
err => {}
);
},
//获取线路列表
......@@ -3115,12 +3107,11 @@
this.LineList = res.data.data;
}
},
err => {
}
err => {}
);
},
//散卖机票
sanSale(item){
sanSale(item) {
this.sanmai = true;
this.addShow = false;
this.command = false;
......@@ -3128,14 +3119,14 @@
this.sales.AirTicketNum = item.AirTicketScatterNum;
this.sales.B2BPrice = item.ScatterB2BPrice;
this.sales.B2CPrice = item.ScatterB2CPrice;
if(item.IsDiscounts!=null){
this.sales.IsDiscounts=item.IsDiscounts.toString();
}else{
this.sales.IsDiscounts='0';
if (item.IsDiscounts != null) {
this.sales.IsDiscounts = item.IsDiscounts.toString();
} else {
this.sales.IsDiscounts = '0';
}
},
//保存
saveSales(){
saveSales() {
this.apipost(
"ticket_post_SetAirTicketScattering", this.sales,
res => {
......@@ -3143,12 +3134,11 @@
this.Success(res.data.message);
this.getList();
this.sanmai = false;
}else{
} else {
this.Error(res.data.message);
}
},
err => {
}
err => {}
);
}
......
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