Skip to content

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

解决冲突

parents 62fedaa4 ed623665
Expand all Show 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/SalesModule/passengerSaleList.vue
View file @ 30e913f7
......@@ -4,7 +4,9 @@
<template v-if="isOrder==0">
<span style="color:red;">{{$t('objFill.opygbddcz')}}</span>
</template>
<template v-if="isOrder==1 && !isDis" > <div v-show="tableList.length<guestNum&&IsLeaderOrder>0" @click="showSetLeader=true;getBranchList()">{{$t('objFill.v101.Rest.xuanzhelddy')}}</div>
<template v-if="isOrder==1 && !isDis">
<div v-show="tableList.length<guestNum&&IsLeaderOrder>0" @click="showSetLeader=true;getBranchList()">
{{$t('objFill.v101.Rest.xuanzhelddy')}}</div>
<div v-show="tableList.length<guestNum" @click="goUrlA(0)">{{$t('pub.addBtn')}}</div>
</template>
......@@ -57,15 +59,18 @@
<td style="color:red;">{{item.IsHightSchool==1?$t('objFill.xuesheng'):""}}</td>
<td>
<el-button-group>
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('pub.updateMsg')"
placement="top-start">
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-bianji-smal" @click="goUrlA(item.Id)"></el-button>
</el-tooltip>
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<el-button type="primary" style='background:#e95252; border-color:#e95252'
icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button>
</el-tooltip>
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('objFill.xiazasqb')" placement="top-start">
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('objFill.xiazasqb')"
placement="top-start">
<el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3'
icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
</el-tooltip>
......@@ -80,7 +85,6 @@
</tbody>
</table>
</div>
<div class="combottomDiv" v-if="showSetLeader" v-loading="loadingSet">
<div class="combottomTitle">{{ $t("ground.szlindui") }}</div>
<div class="clearfix">
......@@ -103,7 +107,8 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('system.query_name')" prop="lineCode">
<el-input v-model="leaderQueryMsg.LeaderName" @keyup.enter.native="getLeaderList" :placeholder="$t('tips.srgjzjxguolv')"></el-input>
<el-input v-model="leaderQueryMsg.LeaderName" @keyup.enter.native="getLeaderList"
:placeholder="$t('tips.srgjzjxguolv')"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -123,7 +128,7 @@
</div>
<div class="RL_ListDiv">
<div class="LeaderSpan" :class="{ ckedClass: ckedIndex == index }" v-for="(item, index) in leaderListArr"
:key="item.subCode" @click="getLeaderInfo(index, item.LeaderId)" style="margin:5px 0px 0px 5px;" >
:key="item.subCode" @click="getLeaderInfo(index, item.LeaderId)" style="margin:5px 0px 0px 5px;">
<span class="RL_LeaderName">{{ item.LeaderName }}:{{item.IdCard }}/ {{item.Passport }} /{{item.MobilePhone }}【{{
getLeaderTypeStr(item.Type, item.LeaderGuidClass)
}}】</span>
......@@ -133,9 +138,8 @@
</div>
</div>
<div class="clearfix " style="float: left;width: 5%;">
<div >
<input type="button" class="normalBtn" @click="setTheLeader"
:value="$t('pub.sureBtn')" />
<div>
<input type="button" class="normalBtn" @click="setTheLeader" :value="$t('pub.sureBtn')" />
</div>
</div>
</div>
......@@ -155,10 +159,10 @@
tcid: '0',
tcnum: '0'
},
setMsg:{
OrderId:0,
TCID:0,
NewGuestId:0,
setMsg: {
OrderId: 0,
TCID: 0,
NewGuestId: 0,
},
guestNum: 0,
isOrder: 0,
......@@ -167,7 +171,7 @@
LineId: 0,
EndDateStr: "",
isDis: false,
IsLeaderOrder:0,
IsLeaderOrder: 0,
leaderQueryMsg: {
QTCID: 0,
CountryID: 0,
......@@ -177,13 +181,13 @@
},
//验证重复提交
isSubmit: true,
ckedIndex:-1,
ckedIndex: -1,
//领队或者领兼地
isLeaderType: "",
leaderTypeArray: [{
Id: 0,
Text: this.$t('objFill.qingxuanzhe'),
},{
}, {
Id: 2,
Text: this.$t('objFill.lingduijdy'),
},
......@@ -198,8 +202,8 @@
],
//分公司列表
BranchList: [],
showSetLeader:false,
loadingSet:false,
showSetLeader: false,
loadingSet: false,
leaderListArr: [],
};
},
......@@ -229,17 +233,16 @@
}
},
//点击选中名单
getLeaderInfo(index,LeaderId) {
getLeaderInfo(index, LeaderId) {
this.ckedIndex = index;
this.setMsg.NewGuestId=LeaderId
this.setMsg.NewGuestId = LeaderId
},
getLeaderTypeStr: function (type, clas) {
if (type == 2) {
return this.$t('leader.leader_leaderDi');
} else if (type ==3) {
} else if (type == 3) {
return this.$t('leader.leader_Guide');
}
else if (type == 1 && clas == 0) {
} else if (type == 1 && clas == 0) {
return this.$t('leader.leader_Leader');
} else if (type == 1 && clas == 1) {
return this.$t('op.THLeader');
......@@ -275,11 +278,11 @@
if (res.data.resultCode == 1) {
this.leaderListArr = res.data.data.LeaderData;
this.ScheduleArray = res.data.data.ScheduleData;
if (this.leaderQueryMsg.LeaderType == 1) {//1领队2领队兼导游3导游
if (this.leaderQueryMsg.LeaderType == 1) { //1领队2领队兼导游3导游
this.isLeaderType = this.$t('leader.leader_Leader');
} else if (this.leaderQueryMsg.LeaderType == 2){
} else if (this.leaderQueryMsg.LeaderType == 2) {
this.isLeaderType = this.$t('leader.leader_leaderDi');
}else if (this.leaderQueryMsg.LeaderType == 3){
} else if (this.leaderQueryMsg.LeaderType == 3) {
this.isLeaderType = this.$t('leader.leader_Guide');
}
}
......@@ -298,8 +301,8 @@
this.isOneDay = res.data.data.IsOneDay;
this.LineId = res.data.data.LineId;
this.EndDateStr = res.data.data.EndDateStr;
this.IsLeaderOrder= res.data.data.IsLeaderOrder;
this.leaderQueryMsg.QTCID= res.data.data.TCID;
this.IsLeaderOrder = res.data.data.IsLeaderOrder;
this.leaderQueryMsg.QTCID = res.data.data.TCID;
} else {
this.$message.error(res.data.message)
}
......@@ -307,19 +310,20 @@
});
},
pal_del: function (item) {
var that = this;
this.$confirm(this.$t('objFill.shifouscglvke'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('sellorder_post_DelTravelGuestInfo', {
that.apipost('sellorder_post_DelTravelGuestInfo', {
GuestId: item.Id
}, res => {
if (res.data.resultCode == 1) {
this.$message.Success(this.$t('tips.shanchuchenggong'))
this.getData()
that.Success(that.$t('tips.shanchuchenggong'))
that.getData()
} else {
this.$message.error(res.data.message)
that.Error(res.data.message)
}
}, err => {})
})
......@@ -377,17 +381,20 @@
background-color: #e95252 !important;
color: #fff;
}
.RL_ListDiv {
width: 100%;
height: 174px;
overflow: auto;
}
.RL_LeaderListDiv {
width: 200px;
height: 206px;
margin-left: 30px;
border: 1px solid #d1d1d1;
}
.RL_infoDiv {
width: 260px;
height: 140px;
......@@ -395,6 +402,7 @@
padding: 10px;
font-size: 14px;
}
.RL_LeaderTitle {
width: 100%;
height: 30px;
......@@ -404,6 +412,7 @@
line-height: 30px;
font-size: 14px;
}
.RL_LeaderName {
display: inline-block;
min-width: 50px;
......@@ -414,6 +423,7 @@
float: left;
margin-right: 20px;
}
.passengerSaleList {
width: 100%;
}
......@@ -479,7 +489,7 @@
}
/*拒签人员*/
.passengerSaleList_table .redTr td{
.passengerSaleList_table .redTr td {
color: #E95252;
}
......
src/components/Ticketing/TicketManager.vue
View file @ 30e913f7
......@@ -1532,8 +1532,7 @@
<span class="iconfont icon-img_yizi"></span>
</li>
<li>
<p class="_num3">{{item.TicketNum==null?'0':item.TicketNum}}
<template v-if="item.ChangeNum!=0">
<p class="_num3">
<el-popover placement="top-start" title="变更记录" width="250" trigger="hover">
<table>
<template v-for="(cItem,cIndex) in item.ChangeList">
......@@ -1545,10 +1544,10 @@
</tr>
</template>
</table>
<font style="color:blue" slot="reference"> {{item.ChangeNum>0?'+':''}}{{item.ChangeNum}}
<font style="color:blue" slot="reference">
{{item.TicketNum==null?'0':item.TicketNum+item.ChangeNum}}
</font>
</el-popover>
</template>
</p>
<p class="_wz">{{$t('Airticket.Air_reservation')}}</p>
</li>
......@@ -2091,21 +2090,21 @@
:disabled="addMsg.TCIDList&&addMsg.TCIDList.length>0">
<template v-if="addMsg.TCIDList&&addMsg.TCIDList.length>0">
<el-button slot="append">
<el-popover width="450">
<el-popover width="460">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tbody>
<template v-for="(rootItem,rootIndex) in addMsg.ChangeList">
<tr :key="rootIndex">
<tr :key="rootIndex" style="padding-top:5px;">
<td>
团号:
<el-select v-model="rootItem.RelationTCID" filterable class="w180">
<el-option v-for="(subItem,subIndex) in addMsg.PriceList"
<el-select v-model="rootItem.RelationTCID" filterable class="w180" :suffix-icon="''">
<el-option v-for="(subItem,subIndex) in choosePriceList"
:key="subItem.TCID+`_`+subIndex" :value="subItem.TCID"
:label="subItem.TCNUM+`(`+subItem.TCID+`)`"></el-option>
</el-select>
</td>
<td>
人数:
变更人数:
<el-input v-model="rootItem.ChangeValue" class="w80"
@keyup.native="checkInteger(rootItem,'ChangeValue',true)">
</el-input>
......@@ -2122,12 +2121,18 @@
</tbody>
<tfoot>
<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">
<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>
</td>
</tr>
<tr>
<td colspan="3" style="text-align:left;color:red;">
请填写团队变更人数,不是本团机位数,比如:新增机位填2,减少机位填-2.
</td>
</tr>
</tfoot>
</table>
<p slot="reference" class="_wz _yiyong">机位变更</p>
......@@ -2985,7 +2990,6 @@
TCIDList: [], //已绑定的团期(TCID)
PriceList: [], //已绑团期列表{TCID,TCNUM等}
ChangeList: [], //变更列表
},
//去程
addGoFlight: {
......@@ -3057,9 +3061,7 @@
addShow: false,
command: false,
sanmai: false,
uploadDoc: true,
//散卖obj
sales: {
AirTicketId: 0,
......@@ -3179,6 +3181,7 @@
},
userInfo: {}, //当前登录用户
BranchList: [], //出团公司
choosePriceList: [],
};
},
methods: {
......@@ -3190,31 +3193,35 @@
AirticketId: 0,
ChangType: 1,
ChangeValue: 0,
RelationTCID: 0,
RelationTCID: "",
}
this.addMsg.ChangeList.push(tempObj);
}
},
//删除绑定数据
deleteChangeTicketNum(rootItem, index) {
var that = this;
that.Confirm("是要要删除?", function () {
if (rootItem.ChangeId > 0) {
var dMsg = {
AirticketId: rootItem.AirticketId,
ChangeId: rootItem.ChangeId,
};
this.apipost(
that.apipost(
"AirTicket_post_DeleteAirticketChange", dMsg,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
that.Success(res.data.message);
that.getList();
} else {
this.Error(res.data.message);
that.Error(res.data.message);
}
},
err => {}
);
}
this.addMsg.ChangeList.splice(index, 1);
that.addMsg.ChangeList.splice(index, 1);
});
},
//生成虚拟团
createTravel(item) {
......@@ -4078,6 +4085,7 @@
res => {
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
this.getPriceList(this.addMsg)
if (this.addMsg.OpenPlatform != null) {
if (this.addMsg.OpenPlatform != "") {
this.OpenPlatformStrings = this.addMsg.OpenPlatform.split(
......@@ -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() {
this.userInfo = this.getLocalStorage();
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 30e913f7
......@@ -782,7 +782,7 @@
<span class="iconfont icon-img_yizi"></span>
</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>
</li>
<li>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 30e913f7
......@@ -1173,12 +1173,12 @@
<div class="TC_SeatList" v-if="item.BindNum > 0" style="color: red">
{{ $t("Operation.Op_bindNum") }}: {{ item.BindNum }}
</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>
<template v-for="(subItem,subIndex) in item.TicketList">
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<tr :key="`d_`+index+`s_`+subIndex+`t_`+changeIndex">
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':''}}
......@@ -1189,8 +1189,7 @@
</template>
</template>
</table>
<div class="TC_SeatList" v-if="item.NoBindNum > 0"
style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
<div class="TC_SeatList" style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
尚未绑定: {{ item.NoBindNum }}
</div>
</el-popover>
......@@ -1722,14 +1721,22 @@
<template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font>
<font>
总机位：<font style="font-weight:bold;">{{item.TicketNum}}</font>
<template v-if="subItem.ChangeNum!=0">
<font style="font-weight:bold;">{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}={{item.TicketNum}}</font>
<font style="font-weight:bold;">
=[{{subItem.TicketNum}}{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}]</font>
</template>
</font>
;
<template v-for="thirdItem in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;">
{{thirdItem.BindNum}}</font>,
<template v-for="(thirdItem,thirdIndex) in subItem.SubList">
<font style="color:blue;cursor:pointer;" @click="gotoTCList(thirdItem)">【
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定:<font style="font-weight:bold;">
{{thirdItem.BindNum}}】</font>
</font>
<template v-if="thirdIndex!=subItem.SubList.Length-1">
,
</template>
</template>
{{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 30e913f7
......@@ -776,17 +776,15 @@
<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_EconomyClass')}}：{{item.YSeat}}</div>
<div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}:
{{item.BindNum}}</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>
<template v-for="(subItem,subIndex) in item.TicketList">
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<tr :key="`d_`+index+`s_`+subIndex+`t_`+changeIndex">
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}}
{{changeItem.ChangeModel.ChangeValue>0?'+':''}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
......@@ -794,8 +792,7 @@
</template>
</template>
</table>
<div class="TC_SeatList" v-if="item.NoBindNum > 0"
style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
<div class="TC_SeatList" style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
尚未绑定: {{ item.NoBindNum }}
</div>
</el-popover>
......@@ -844,7 +841,7 @@
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}}
{{changeItem.ChangeModel.ChangeValue>0?'+':''}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
......@@ -1225,14 +1222,22 @@
<template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font>
<font>
总机位：<font style="font-weight:bold;">{{item.TicketNum}}</font>
<template v-if="subItem.ChangeNum!=0">
<font style="font-weight:bold;">{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}={{item.TicketNum}}</font>
<font style="font-weight:bold;">
=[{{subItem.TicketNum}}{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}]</font>
</template>
</font>
;
<template v-for="thirdItem in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;">
{{thirdItem.BindNum}}</font>,
<template v-for="(thirdItem,thirdIndex) in subItem.SubList">
<font style="color:blue;cursor:pointer;" @click="gotoTCList(thirdItem)">【
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定:<font style="font-weight:bold;">
{{thirdItem.BindNum}}】</font>
</font>
<template v-if="thirdIndex!=subItem.SubList.Length-1">
,
</template>
</template>
{{subItem.TicketOpRemark}}
【{{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