Skip to content

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

机票新增备注，和机票类型

parent 1d70e6e4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2886 additions and 2807 deletions
src/assets/common/lang/EN/fill.js
View file @ d1192d1d
This diff is collapsed.
src/assets/common/lang/Japan/fill.js
View file @ d1192d1d
This diff is collapsed.
src/assets/common/lang/zhCN/fill.js
View file @ d1192d1d
......@@ -6944,8 +6944,9 @@ export const obj = {
qingsrskjipsl: '请输入散客机票数量',
qingsrskjplr: '请输入散客机票利润',
tuanpshanp: '团票/散票',
tuanpiao: '团票',
shanpiao: '散票',
tuanpiao: '系列票',
shanpiao: '散客票',
lspiao:"临时票",
weibangdt: '未绑定团期',
youjsdeqxtq: '有机损的取消团期',
danmaijipiao: '单卖机票',
......@@ -6956,7 +6957,7 @@ export const obj = {
xiaocxthjia: '小程序同行价',
xiaocxzkjia: '小程序直客价',
tuanduishiy: '团队使用',
keshoujpsltyzk: '可售机票数量(同业/直客)',
keshoujpsltyzk: '可售机票数量',
zhukpdjskpsljsczs: '注：开票单价*开票数量+升舱增收=总开票金额,',
cainwhkpfymyue: '才能维护开票费用,每月',
rizqianwhsydkpfy: '日之前维护上月的开票费用',
......
src/assets/common/lang/zhTW/fill.js
View file @ d1192d1d
This diff is collapsed.
src/components/Ticketing/TicketManager.vue
View file @ d1192d1d
This diff is collapsed.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d1192d1d
......@@ -1180,32 +1180,43 @@
<th width="70" style="text-align: center">
{{ $t("Operation.Op_price") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_tradePrice") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_directPrice") }}
<th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketType') }}
</th>
<th width="130" style="text-align: center">PNR</th>
<th width="130" style="text-align: center">
{{ $t("op.CenterPNR") }}
<th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketDeadLine') }}
</th>
<th width="100" style="text-align: center">
{{ $t("op.Tickets") }}
</th>
</tr>
<tr v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center">{{ subItem.B2BPrice }}</td>
<td style="text-align: center">{{ subItem.B2CPrice }}</td>
<td style="text-align: center">{{ subItem.PNR }}</td>
<td style="text-align: center">{{ subItem.MidpiecePNR }}</td>
<td style="text-align: center">
{{ subItem.TicketCreateByName }}
</td>
</tr>
<tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tr>
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center">
<template v-if="subItem.TravelTicketType==1">
{{$t('objFill.v101.tuanpiao')}}
</template>
<template v-else-if="subItem.TravelTicketType==2">
{{$t('objFill.v101.shanpiao')}}
</template>
<template v-else-if="subItem.TravelTicketType==3">
{{$t('objFill.v101.lspiao')}}
</template>
</td>
<td style="text-align: center">{{ subItem.TicketDeadline }}</td>
<td style="text-align: center">
{{ subItem.TicketCreateByName }}
</td>
</tr>
<tr>
<td colspan="6" style="text-align:left;">
对OP备注: {{subItem.TicketOpRemark}}
</td>
</tr>
</tbody>
</table>
<span slot="reference" :title="$t('objFill.dianjickxq')" class="price"
style="cursor: pointer; color: red; text-decoration: underline">{{ $t("op.FlightToNum") }}:
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d1192d1d
......@@ -770,25 +770,52 @@
<el-popover width="550" trigger="click">
<table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="90" style="text-align:center;">{{$t('Operation.Op_bindNum')}}</th>
<th width="90" style="text-align:center;">{{$t('op.TicketNum')}}</th>
<th width="70" style="text-align:center;">{{$t('Operation.Op_price')}}</th>
<th width="70" style="text-align:center;">{{$t('Operation.Op_tradePrice')}}</th>
<th width="70" style="text-align:center;">{{$t('Operation.Op_directPrice')}}</th>
<th width="130" style="text-align:center;">PNR</th>
<th width="130" style="text-align:center;">{{$t('op.CenterPNR')}}</th>
<th width="100" style="text-align:center;">{{$t('op.Tickets')}}</th>
</tr>
<tr v-for="(subItem,subIndex) in item.TicketList" :key="subIndex">
<td style="text-align:center;">{{subItem.BindNum}}</td>
<td style="text-align:center;">{{subItem.TicketNum}}</td>
<td style="text-align:center;">{{subItem.TicketPrice}}</td>
<td style="text-align:center;">{{subItem.B2BPrice}}</td>
<td style="text-align:center;">{{subItem.B2CPrice}}</td>
<td style="text-align:center;">{{subItem.PNR}}</td>
<td style="text-align:center;">{{subItem.MidpiecePNR}}</td>
<td style="text-align:center;">{{subItem.TicketCreateByName}}</td>
<th width="90" style="text-align: center">
{{ $t("Operation.Op_bindNum") }}
</th>
<th width="90" style="text-align: center">
{{ $t("op.TicketNum") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_price") }}
</th>
<th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketType') }}
</th>
<th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketDeadLine') }}
</th>
<th width="100" style="text-align: center">
{{ $t("op.Tickets") }}
</th>
</tr>
<tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tr>
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center">
<template v-if="subItem.TravelTicketType==1">
{{$t('objFill.v101.tuanpiao')}}
</template>
<template v-else-if="subItem.TravelTicketType==2">
{{$t('objFill.v101.shanpiao')}}
</template>
<template v-else-if="subItem.TravelTicketType==3">
{{$t('objFill.v101.lspiao')}}
</template>
</td>
<td style="text-align: center">{{ subItem.TicketDeadline }}</td>
<td style="text-align: center">
{{ subItem.TicketCreateByName }}
</td>
</tr>
<tr>
<td colspan="6" style="text-align:left;">
对OP备注: {{subItem.TicketOpRemark}}
</td>
</tr>
</tbody>
</table>
<span slot="reference" :title="$t('objFill.dianjickxq')" class="price"
style="cursor:pointer;color:red;text-decoration: underline;">{{$t('op.FlightToNum')}}:
......
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