Skip to content

S
SuperMan
Commit 50def612 authored by 黄奎's avatar 黄奎
Browse files
Options

机票查询新增出发地

parent 790c336a
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 98 deletions
src/components/Ticketing/TicketManager.vue
View file @ 50def612
...@@ -1256,11 +1256,11 @@ ...@@ -1256,11 +1256,11 @@
<li> <li>
<span> <span>
<em>航班日期</em> <em>航班日期</em>
<el-date-picker class="w135" v-model="msg.QFlightDateStart" type="date" <el-date-picker class="w135" v-model="msg.QFlightDateStart" type="date" :picker-options="beforeCheck"
:picker-options="beforeCheck" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"> value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
</el-date-picker> </el-date-picker>
<span class="_ln">-</span> <span class="_ln">-</span>
<el-date-picker class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck" <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> value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</span> </span>
</li> </li>
...@@ -1290,6 +1290,16 @@ ...@@ -1290,6 +1290,16 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span>
<em>出发地</em>
<el-select v-model="msg.Departure_city" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in ChinaCityList" :label="item.Name" :value="item.ID" :key="item.ID">
</el-option>
</el-select>
</span>
</li>
<li style="margin-right:50px;"> <li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button> <button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="addShow=true,command=false,sanmai=false,initAddMsg()"> <button class="normalBtn" type="button" @click="addShow=true,command=false,sanmai=false,initAddMsg()">
...@@ -1340,15 +1350,15 @@ ...@@ -1340,15 +1350,15 @@
{{$t('Airticket.Air_EconomyClass')}} {{$t('Airticket.Air_EconomyClass')}}
</li> </li>
<li> <span style="color:#4BCA81 ;">√：</span> <li> <span style="color:#4BCA81 ;">√：</span>
<span >全部出票</span> <span>全部出票</span>
</li> </li>
<li> <li>
<span style="color: #E95252;">O：</span> <span style="color: #E95252;">O：</span>
<span > 已出中段/部分出票</span> <span> 已出中段/部分出票</span>
</li> </li>
<li> <li>
<span style="color:#E95252 ;">X：</span> <span style="color:#E95252 ;">X：</span>
<span >未处理</span> <span>未处理</span>
</li> </li>
</ul> </ul>
<div class="_ol_info" :class="addShow==true||command==true?'_edHeight':''"> <div class="_ol_info" :class="addShow==true||command==true?'_edHeight':''">
...@@ -1468,18 +1478,20 @@ ...@@ -1468,18 +1478,20 @@
</div> </div>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<div><ul> <div>
<!--出票状态--> <ul>
<li style="font-size:18px;"> <!--出票状态-->
<span style="color: #4BCA81;" v-if="item.TicketState==1">√</span> <li style="font-size:18px;">
<span class="colorE95252" v-else>{{item.TicketState=='0'?"x":"O"}}</span> <span style="color: #4BCA81;" v-if="item.TicketState==1">√</span>
<span class="colorE95252" v-else>{{item.TicketState=='0'?"x":"O"}}</span>
</li> </li>
</ul></div> </ul>
</div>
</el-col> </el-col>
<el-col :span="4" class="vmiddle"> <el-col :span="4" class="vmiddle">
<div class="TK_raduis"> <div class="TK_raduis">
<ul> <ul>
<!--一定--> <!--一定-->
<li v-if="item.FirstDeposit!=''"> <li v-if="item.FirstDeposit!=''">
<div @click="goFinacePage(item,1)" :class="getClass(item.FirstDepositStatus)"> <div @click="goFinacePage(item,1)" :class="getClass(item.FirstDepositStatus)">
...@@ -1551,7 +1563,8 @@ ...@@ -1551,7 +1563,8 @@
</div> </div>
</li> --> </li> -->
<li v-else-if="item.FinalPayment!=''"> <li v-else-if="item.FinalPayment!=''">
<div @click="goCustomList('PassengerList',item, 5,'旅客名单')" :class="getClass(item.FinalPaymentStatus)"> <div @click="goCustomList('PassengerList',item, 5,'旅客名单')"
:class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"> <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span> <span>尾</span>
</el-tooltip> </el-tooltip>
...@@ -1584,73 +1597,77 @@ ...@@ -1584,73 +1597,77 @@
</div> </div>
</el-col> </el-col>
<el-col :span="3" class=""> <el-col :span="3" class="">
<div> <div>
<el-button-group size="mini"> <el-button-group size="mini">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="iconfont icon-Edit" @click="getEntityExtend(item.ID)"></el-button> <el-button type="primary" icon="iconfont icon-Edit" @click="getEntityExtend(item.ID)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="旅客名单" placement="top-start"> <el-tooltip class="item" effect="dark" content="旅客名单" placement="top-start">
<el-button type="primary" icon="iconfont icon-lists" @click="goUrl('PassengerList',item,'旅客名单')"> <el-button type="primary" icon="iconfont icon-lists" @click="goUrl('PassengerList',item,'旅客名单')">
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="联运设置" placement="top-start" style="display:none;"> <el-tooltip class="item" effect="dark" content="联运设置" placement="top-start" style="display:none;">
<el-button type="primary" icon="iconfont icon-ico_shezhi" <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>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start"> <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-button type="primary" icon="iconfont icon-img_delete_small" @click="DeleteAirticket(item.ID)" <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>
<el-tooltip class="item" effect="dark" :content="item.TripItinerary==''?'行程单上传':'行程单下载'" <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" <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;" <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>
<el-tooltip class="item" effect="dark" content="散卖" placement="top-start"> <el-tooltip class="item" effect="dark" content="散卖" placement="top-start">
<el-button type="primary" icon="iconfont icon-maichu" @click="sanSale(item)"></el-button> <el-button type="primary" icon="iconfont icon-maichu" @click="sanSale(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="日志" placement="top-start"> <el-tooltip class="item" effect="dark" content="日志" placement="top-start">
<el-popover popper-class="Journal" width="400" trigger="click"> <el-popover popper-class="Journal" width="400" trigger="click">
<div class="InfoChangeLog"> <div class="InfoChangeLog">
<div class="changLog"> <div class="changLog">
<ul v-if="orderlogList.length!=0" class="changLogList"> <ul v-if="orderlogList.length!=0" class="changLogList">
<li v-for="item in orderlogList" class="changLogList_l"> <li v-for="item in orderlogList" class="changLogList_l">
<span class="_radius_green" <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="changLog_time">{{item.UpdateDateStr}}</p>
<p class="TM_UPdate">{{item.UpdateName}} {{item.UpdateTypeStr}}</p> <p class="TM_UPdate">{{item.UpdateName}} {{item.UpdateTypeStr}}</p>
</li> </li>
</ul> </ul>
<ul v-else> <ul v-else>
<li>{{$t('hotel.hotel_zanwu')}}</li> <li>{{$t('hotel.hotel_zanwu')}}</li>
</ul> </ul>
</div>
</div> </div>
</div> <el-button type="primary" slot="reference" icon="iconfont icon-rizhi"
<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-popover> </el-tooltip>
</el-tooltip> </el-button-group>
</el-button-group> </div>
</div> <div style="margin-top:5px;">
<div style="margin-top:5px;" > <el-button-group size="mini">
<el-button-group size="mini"> <el-tooltip class="item" effect="dark" content="部分出票" placement="top-start"
<el-tooltip class="item" effect="dark" content="部分出票" placement="top-start" v-show="item.TicketState==0"> v-show="item.TicketState==0">
<el-button type="primary" class="iconfont icon-icon_status-half-dot" <el-button type="primary" class="iconfont icon-icon_status-half-dot"
@click="UpdateTicketState(item.ID,3)" ></el-button> @click="UpdateTicketState(item.ID,3)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="已出中段" placement="top-start" v-show="item.TicketState==0"> <el-tooltip class="item" effect="dark" content="已出中段" placement="top-start"
<el-button type="primary" class="iconfont icon-zhongzhuan" @click="UpdateTicketState(item.ID,2)"> v-show="item.TicketState==0">
</el-button> <el-button type="primary" class="iconfont icon-zhongzhuan" @click="UpdateTicketState(item.ID,2)">
</el-tooltip> </el-button>
<el-tooltip class="item" effect="dark" content="出票完成" placement="top-start" v-show="item.TicketState!=1"> </el-tooltip>
<el-button type="primary" class="iconfont icon-duigou" @click="UpdateTicketState(item.ID,1)"></el-button> <el-tooltip class="item" effect="dark" content="出票完成" placement="top-start"
</el-tooltip> v-show="item.TicketState!=1">
</el-button-group> <el-button type="primary" class="iconfont icon-duigou" @click="UpdateTicketState(item.ID,1)">
</div> </el-button>
</el-tooltip>
</el-button-group>
</div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -2210,7 +2227,8 @@ ...@@ -2210,7 +2227,8 @@
LineId: 0, //线路编号 LineId: 0, //线路编号
ID: 0, ID: 0,
TicketType: 0, //定金类型(1定，2定等) TicketType: 0, //定金类型(1定，2定等)
IsLimit:1 IsLimit: 1,
Departure_city:0//出发地
}, },
addMsg: { addMsg: {
ID: "0", ID: "0",
...@@ -2288,6 +2306,8 @@ ...@@ -2288,6 +2306,8 @@
AirportNameList: [], AirportNameList: [],
//回程航班列表 //回程航班列表
BackAirportNameList: [], BackAirportNameList: [],
//国内城市列表
ChinaCityList:[],
//线路列表 //线路列表
LineList: [], LineList: [],
returnTrip: [], returnTrip: [],
...@@ -2324,9 +2344,8 @@ ...@@ -2324,9 +2344,8 @@
disabledDate: time => { disabledDate: time => {
if (this.msg.QFlightDateEnd) { if (this.msg.QFlightDateEnd) {
let endTime = new Date(this.msg.QFlightDateEnd); let endTime = new Date(this.msg.QFlightDateEnd);
return time&&endTime.getTime() < time.getTime(); return time && endTime.getTime() < time.getTime();
}else } else {
{
return false; return false;
} }
} }
...@@ -2336,10 +2355,8 @@ ...@@ -2336,10 +2355,8 @@
if (this.msg.QFlightDateStart) { if (this.msg.QFlightDateStart) {
let startTime = new Date(this.msg.QFlightDateStart); let startTime = new Date(this.msg.QFlightDateStart);
//可以选择当天 //可以选择当天
return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000; return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000;
} } else {
else
{
return false; return false;
} }
} }
...@@ -2555,12 +2572,12 @@ ...@@ -2555,12 +2572,12 @@
}); });
}, },
//跳转至旅客名单 //跳转至旅客名单
goCustomList(path, obj, type, title){ goCustomList(path, obj, type, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
blank: 'y', blank: 'y',
isFromTk:true, isFromTk: true,
id: obj.ID, id: obj.ID,
Obj: JSON.stringify({ Obj: JSON.stringify({
Type: type Type: type
...@@ -2827,17 +2844,17 @@ ...@@ -2827,17 +2844,17 @@
}, },
err => {} err => {}
); );
}, // 修改 根据ID获取信息 }, // 修改 根据ID获取信息
UpdateTicketState(ID,TicketState) { UpdateTicketState(ID, TicketState) {
this.apipost( this.apipost(
"AirTicket_get_UpdateTicketState", { "AirTicket_get_UpdateTicketState", {
ID: ID, ID: ID,
TicketState:TicketState TicketState: TicketState
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success("操作成功"); this.Success("操作成功");
this.getList(); this.getList();
} else { } else {
this.Warning(res.data.message); this.Warning(res.data.message);
} }
...@@ -3226,7 +3243,22 @@ ...@@ -3226,7 +3243,22 @@
}, },
err => {} err => {}
); );
},
//获取中国下面的所有城市
GetChinaCityList() {
this.apipost(
"Destination_get_GetCityListByCountryId", {
Id: 2
},
res => {
if (res.data.resultCode == 1) {
this.ChinaCityList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
} }
}, },
mounted() { mounted() {
...@@ -3234,6 +3266,7 @@ ...@@ -3234,6 +3266,7 @@
if (id) { if (id) {
this.msg.ID = id; this.msg.ID = id;
} }
this.GetChinaCityList();
this.GetLineList(); this.GetLineList();
this.getList(); this.getList();
this.initAirlines(); this.initAirlines();
......
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