Skip to content

S
SuperMan
Commit 2ccd2e4f authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent 73eac736
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 49 deletions
src/components/Ticketing/TicketManager.vue
View file @ 2ccd2e4f
......@@ -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>
......@@ -2098,7 +2097,7 @@
<tr :key="rootIndex">
<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"
:key="subItem.TCID+`_`+subIndex" :value="subItem.TCID"
:label="subItem.TCNUM+`(`+subItem.TCID+`)`"></el-option>
......@@ -2985,7 +2984,6 @@
TCIDList: [], //已绑定的团期(TCID)
PriceList: [], //已绑团期列表{TCID,TCNUM等}
ChangeList: [], //变更列表
},
//去程
addGoFlight: {
......@@ -3057,9 +3055,7 @@
addShow: false,
command: false,
sanmai: false,
uploadDoc: true,
//散卖obj
sales: {
AirTicketId: 0,
......@@ -3190,7 +3186,7 @@
AirticketId: 0,
ChangType: 1,
ChangeValue: 0,
RelationTCID: 0,
RelationTCID: "",
}
this.addMsg.ChangeList.push(tempObj);
}
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 2ccd2e4f
......@@ -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 @ 2ccd2e4f
......@@ -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 @ 2ccd2e4f
......@@ -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