Skip to content

S
SuperMan
Commit 30e913f7 authored by 吴春's avatar 吴春
Browse files
Options

解决冲突

parents 62fedaa4 ed623665
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 421 additions and 360 deletions
src/components/SalesModule/addPassenger.vue
View file @ 30e913f7
This diff is collapsed.
src/components/Ticketing/TicketManager.vue
View file @ 30e913f7
...@@ -1532,23 +1532,22 @@ ...@@ -1532,23 +1532,22 @@
<span class="iconfont icon-img_yizi"></span> <span class="iconfont icon-img_yizi"></span>
</li> </li>
<li> <li>
<p class="_num3">{{item.TicketNum==null?'0':item.TicketNum}} <p class="_num3">
<template v-if="item.ChangeNum!=0"> <el-popover placement="top-start" title="变更记录" width="250" trigger="hover">
<el-popover placement="top-start" title="变更记录" width="250" trigger="hover"> <table>
<table> <template v-for="(cItem,cIndex) in item.ChangeList">
<template v-for="(cItem,cIndex) in item.ChangeList"> <tr :key="`c_`+cIndex">
<tr :key="`c_`+cIndex"> <td>
<td> {{cItem.TCNUM}}({{cItem.RelationTCID}}){{cItem.ChangeValue>0?'新增':'减少'}}
{{cItem.TCNUM}}({{cItem.RelationTCID}}){{cItem.ChangeValue>0?'新增':'减少'}} <font style="color:blue;">{{cItem.ChangeValue}}</font>人;
<font style="color:blue;">{{cItem.ChangeValue}}</font>人; </td>
</td> </tr>
</tr> </template>
</template> </table>
</table> <font style="color:blue" slot="reference">
<font style="color:blue" slot="reference"> {{item.ChangeNum>0?'+':''}}{{item.ChangeNum}} {{item.TicketNum==null?'0':item.TicketNum+item.ChangeNum}}
</font> </font>
</el-popover> </el-popover>
</template>
</p> </p>
<p class="_wz">{{$t('Airticket.Air_reservation')}}</p> <p class="_wz">{{$t('Airticket.Air_reservation')}}</p>
</li> </li>
...@@ -2091,21 +2090,21 @@ ...@@ -2091,21 +2090,21 @@
:disabled="addMsg.TCIDList&&addMsg.TCIDList.length>0"> :disabled="addMsg.TCIDList&&addMsg.TCIDList.length>0">
<template v-if="addMsg.TCIDList&&addMsg.TCIDList.length>0"> <template v-if="addMsg.TCIDList&&addMsg.TCIDList.length>0">
<el-button slot="append"> <el-button slot="append">
<el-popover width="450"> <el-popover width="460">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tbody> <tbody>
<template v-for="(rootItem,rootIndex) in addMsg.ChangeList"> <template v-for="(rootItem,rootIndex) in addMsg.ChangeList">
<tr :key="rootIndex"> <tr :key="rootIndex" style="padding-top:5px;">
<td> <td>
团号: 团号:
<el-select v-model="rootItem.RelationTCID" filterable class="w180"> <el-select v-model="rootItem.RelationTCID" filterable class="w180" :suffix-icon="''">
<el-option v-for="(subItem,subIndex) in addMsg.PriceList" <el-option v-for="(subItem,subIndex) in choosePriceList"
:key="subItem.TCID+`_`+subIndex" :value="subItem.TCID" :key="subItem.TCID+`_`+subIndex" :value="subItem.TCID"
:label="subItem.TCNUM+`(`+subItem.TCID+`)`"></el-option> :label="subItem.TCNUM+`(`+subItem.TCID+`)`"></el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
人数: 变更人数:
<el-input v-model="rootItem.ChangeValue" class="w80" <el-input v-model="rootItem.ChangeValue" class="w80"
@keyup.native="checkInteger(rootItem,'ChangeValue',true)"> @keyup.native="checkInteger(rootItem,'ChangeValue',true)">
</el-input> </el-input>
...@@ -2122,12 +2121,18 @@ ...@@ -2122,12 +2121,18 @@
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="3" style="text-align:center;margin-top:10px;"> <td colspan="3" style="text-align:center;padding-top:10px;">
<el-tooltip class="item" effect="dark" content="点击添加" placement="top-start"> <el-tooltip class="item" effect="dark" content="点击添加" placement="top-start">
<i class="el-icon-plus" style="cursor:pointer;" @click="addChangeTicketNum()"></i> <i class="el-icon-plus" style="cursor:pointer;font-size:18px;"
@click="addChangeTicketNum()"></i>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
<tr>
<td colspan="3" style="text-align:left;color:red;">
请填写团队变更人数,不是本团机位数,比如:新增机位填2,减少机位填-2.
</td>
</tr>
</tfoot> </tfoot>
</table> </table>
<p slot="reference" class="_wz _yiyong">机位变更</p> <p slot="reference" class="_wz _yiyong">机位变更</p>
...@@ -2985,7 +2990,6 @@ ...@@ -2985,7 +2990,6 @@
TCIDList: [], //已绑定的团期(TCID) TCIDList: [], //已绑定的团期(TCID)
PriceList: [], //已绑团期列表{TCID,TCNUM等} PriceList: [], //已绑团期列表{TCID,TCNUM等}
ChangeList: [], //变更列表 ChangeList: [], //变更列表
}, },
//去程 //去程
addGoFlight: { addGoFlight: {
...@@ -3057,9 +3061,7 @@ ...@@ -3057,9 +3061,7 @@
addShow: false, addShow: false,
command: false, command: false,
sanmai: false, sanmai: false,
uploadDoc: true, uploadDoc: true,
//散卖obj //散卖obj
sales: { sales: {
AirTicketId: 0, AirTicketId: 0,
...@@ -3179,6 +3181,7 @@ ...@@ -3179,6 +3181,7 @@
}, },
userInfo: {}, //当前登录用户 userInfo: {}, //当前登录用户
BranchList: [], //出团公司 BranchList: [], //出团公司
choosePriceList: [],
}; };
}, },
methods: { methods: {
...@@ -3190,31 +3193,35 @@ ...@@ -3190,31 +3193,35 @@
AirticketId: 0, AirticketId: 0,
ChangType: 1, ChangType: 1,
ChangeValue: 0, ChangeValue: 0,
RelationTCID: 0, RelationTCID: "",
} }
this.addMsg.ChangeList.push(tempObj); this.addMsg.ChangeList.push(tempObj);
} }
}, },
//删除绑定数据 //删除绑定数据
deleteChangeTicketNum(rootItem, index) { deleteChangeTicketNum(rootItem, index) {
if (rootItem.ChangeId > 0) { var that = this;
var dMsg = { that.Confirm("是要要删除?", function () {
AirticketId: rootItem.AirticketId, if (rootItem.ChangeId > 0) {
ChangeId: rootItem.ChangeId, var dMsg = {
}; AirticketId: rootItem.AirticketId,
this.apipost( ChangeId: rootItem.ChangeId,
"AirTicket_post_DeleteAirticketChange", dMsg, };
res => { that.apipost(
if (res.data.resultCode == 1) { "AirTicket_post_DeleteAirticketChange", dMsg,
this.Success(res.data.message); res => {
} else { if (res.data.resultCode == 1) {
this.Error(res.data.message); that.Success(res.data.message);
} that.getList();
}, } else {
err => {} that.Error(res.data.message);
); }
} },
this.addMsg.ChangeList.splice(index, 1); err => {}
);
}
that.addMsg.ChangeList.splice(index, 1);
});
}, },
//生成虚拟团 //生成虚拟团
createTravel(item) { createTravel(item) {
...@@ -4078,6 +4085,7 @@ ...@@ -4078,6 +4085,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.addMsg = res.data.data; this.addMsg = res.data.data;
this.getPriceList(this.addMsg)
if (this.addMsg.OpenPlatform != null) { if (this.addMsg.OpenPlatform != null) {
if (this.addMsg.OpenPlatform != "") { if (this.addMsg.OpenPlatform != "") {
this.OpenPlatformStrings = this.addMsg.OpenPlatform.split( this.OpenPlatformStrings = this.addMsg.OpenPlatform.split(
...@@ -4550,6 +4558,44 @@ ...@@ -4550,6 +4558,44 @@
} }
); );
}, },
//获取团期列表
getPriceList(item) {
this.choosePriceList = [];
var qMsg = {
pageIndex: 1,
pageSize: 1000,
LineId: 0,
StartGroupDate: "",
EndGroupDate: "",
TeamType: 0,
QTeamType: "0,1,4,5"
}
if (item) {
if (item.LineId) {
qMsg.LineId = item.LineId;
}
if (item.PriceList && item.PriceList.length > 0) {
qMsg.StartGroupDate = item.PriceList[0].QStartDate;
qMsg.EndGroupDate = item.PriceList[0].QStartDate;
}
}
if (qMsg.StartGroupDate != '' && qMsg.EndGroupDate != '') {
this.apipost("travel_get_GetTravelPrciePageList_V2", qMsg, (res) => {
if (res.data.resultCode == 1) {
var tempArray = res.data.data.pageData;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(tItem => {
var pObj = {
TCID: tItem.TCID,
TCNUM: tItem.TCNUM,
}
this.choosePriceList.push(pObj);
})
}
}
});
}
}
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 30e913f7
...@@ -782,7 +782,7 @@ ...@@ -782,7 +782,7 @@
<span class="iconfont icon-img_yizi"></span> <span class="iconfont icon-img_yizi"></span>
</li> </li>
<li> <li>
<p class="_num1">{{item.TicketNum==null?'0':item.TicketNum}}</p> <p class="_num1">{{item.TicketNum+item.ChangeNum}}</p>
<p class="_wz">{{$t('Airticket.Air_reservation')}}</p> <p class="_wz">{{$t('Airticket.Air_reservation')}}</p>
</li> </li>
<li> <li>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 30e913f7
...@@ -1173,12 +1173,12 @@ ...@@ -1173,12 +1173,12 @@
<div class="TC_SeatList" v-if="item.BindNum > 0" style="color: red"> <div class="TC_SeatList" v-if="item.BindNum > 0" style="color: red">
{{ $t("Operation.Op_bindNum") }}: {{ item.BindNum }} {{ $t("Operation.Op_bindNum") }}: {{ item.BindNum }}
</div> </div>
<el-popover placement="top-start" title="变更记录" width="260" trigger="hover"> <el-popover placement="top-start" title="变更记录" width="260" trigger="hover" v-if="item.NoBindNum > 0">
<table> <table>
<template v-for="(subItem,subIndex) in item.TicketList"> <template v-for="(subItem,subIndex) in item.TicketList">
<template v-for="(changeItem,changeIndex) in subItem.SubList"> <template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0"> <template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr> <tr :key="`d_`+index+`s_`+subIndex+`t_`+changeIndex">
<td> <td>
{{changeItem.TCNUM}}({{changeItem.TCID}}) {{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':''}} {{changeItem.ChangeModel.ChangeValue>0?'+':''}}
...@@ -1189,8 +1189,7 @@ ...@@ -1189,8 +1189,7 @@
</template> </template>
</template> </template>
</table> </table>
<div class="TC_SeatList" v-if="item.NoBindNum > 0" <div class="TC_SeatList" style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
尚未绑定: {{ item.NoBindNum }} 尚未绑定: {{ item.NoBindNum }}
</div> </div>
</el-popover> </el-popover>
...@@ -1722,14 +1721,22 @@ ...@@ -1722,14 +1721,22 @@
<template v-else-if="subItem.TravelTicketType==3"> <template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font> <font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template> </template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font> <font>
<template v-if="subItem.ChangeNum!=0"> 总机位：<font style="font-weight:bold;">{{item.TicketNum}}</font>
<font style="font-weight:bold;">{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}={{item.TicketNum}}</font> <template v-if="subItem.ChangeNum!=0">
</template> <font style="font-weight:bold;">
=[{{subItem.TicketNum}}{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}]</font>
</template>
</font>
; ;
<template v-for="thirdItem in subItem.SubList"> <template v-for="(thirdItem,thirdIndex) in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;"> <font style="color:blue;cursor:pointer;" @click="gotoTCList(thirdItem)">【
{{thirdItem.BindNum}}</font>, {{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定:<font style="font-weight:bold;">
{{thirdItem.BindNum}}】</font>
</font>
<template v-if="thirdIndex!=subItem.SubList.Length-1">
,
</template>
</template> </template>
{{subItem.TicketOpRemark}} {{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】 【{{subItem.TicketCreateByName}}】
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 30e913f7
...@@ -776,17 +776,15 @@ ...@@ -776,17 +776,15 @@
<div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
<div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}: <el-popover placement="top-start" title="变更记录" width="260" trigger="hover" v-if="item.NoBindNum > 0">
{{item.BindNum}}</div>
<el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table> <table>
<template v-for="(subItem,subIndex) in item.TicketList"> <template v-for="(subItem,subIndex) in item.TicketList">
<template v-for="(changeItem,changeIndex) in subItem.SubList"> <template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0"> <template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr> <tr :key="`d_`+index+`s_`+subIndex+`t_`+changeIndex">
<td> <td>
{{changeItem.TCNUM}}({{changeItem.TCID}}) {{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}} {{changeItem.ChangeModel.ChangeValue>0?'+':''}}
{{changeItem.ChangeModel.ChangeValue}} 人 {{changeItem.ChangeModel.ChangeValue}} 人
</td> </td>
</tr> </tr>
...@@ -794,8 +792,7 @@ ...@@ -794,8 +792,7 @@
</template> </template>
</template> </template>
</table> </table>
<div class="TC_SeatList" v-if="item.NoBindNum > 0" <div class="TC_SeatList" style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
尚未绑定: {{ item.NoBindNum }} 尚未绑定: {{ item.NoBindNum }}
</div> </div>
</el-popover> </el-popover>
...@@ -844,7 +841,7 @@ ...@@ -844,7 +841,7 @@
<tr> <tr>
<td> <td>
{{changeItem.TCNUM}}({{changeItem.TCID}}) {{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}} {{changeItem.ChangeModel.ChangeValue>0?'+':''}}
{{changeItem.ChangeModel.ChangeValue}} 人 {{changeItem.ChangeModel.ChangeValue}} 人
</td> </td>
</tr> </tr>
...@@ -1225,14 +1222,22 @@ ...@@ -1225,14 +1222,22 @@
<template v-else-if="subItem.TravelTicketType==3"> <template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font> <font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template> </template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font> <font>
<template v-if="subItem.ChangeNum!=0"> 总机位：<font style="font-weight:bold;">{{item.TicketNum}}</font>
<font style="font-weight:bold;">{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}={{item.TicketNum}}</font> <template v-if="subItem.ChangeNum!=0">
</template> <font style="font-weight:bold;">
=[{{subItem.TicketNum}}{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}]</font>
</template>
</font>
; ;
<template v-for="thirdItem in subItem.SubList"> <template v-for="(thirdItem,thirdIndex) in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;"> <font style="color:blue;cursor:pointer;" @click="gotoTCList(thirdItem)">【
{{thirdItem.BindNum}}</font>, {{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定:<font style="font-weight:bold;">
{{thirdItem.BindNum}}】</font>
</font>
<template v-if="thirdIndex!=subItem.SubList.Length-1">
,
</template>
</template> </template>
{{subItem.TicketOpRemark}} {{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】 【{{subItem.TicketCreateByName}}】
......
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