Skip to content

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

11

parent 73eac736
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 49 deletions
src/components/Ticketing/TicketManager.vue
View file @ 2ccd2e4f
...@@ -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>
...@@ -2098,7 +2097,7 @@ ...@@ -2098,7 +2097,7 @@
<tr :key="rootIndex"> <tr :key="rootIndex">
<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 addMsg.PriceList"
: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>
...@@ -2985,7 +2984,6 @@ ...@@ -2985,7 +2984,6 @@
TCIDList: [], //已绑定的团期(TCID) TCIDList: [], //已绑定的团期(TCID)
PriceList: [], //已绑团期列表{TCID,TCNUM等} PriceList: [], //已绑团期列表{TCID,TCNUM等}
ChangeList: [], //变更列表 ChangeList: [], //变更列表
}, },
//去程 //去程
addGoFlight: { addGoFlight: {
...@@ -3057,9 +3055,7 @@ ...@@ -3057,9 +3055,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,
...@@ -3190,7 +3186,7 @@ ...@@ -3190,7 +3186,7 @@
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);
} }
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 2ccd2e4f
...@@ -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 @ 2ccd2e4f
...@@ -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 @ 2ccd2e4f
...@@ -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