Skip to content

B
bigwood
Commit fabf903f authored by youjie's avatar youjie
Browse files
Options

no message

parent 22db63b2
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 122 deletions
src/components/vehicle/list/ListTable.vue
View file @ fabf903f
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
<!-- {{ $t('v102.vehicle.tatle.th3') }}: --> <!-- {{ $t('v102.vehicle.tatle.th3') }}: -->
{{ x.UseTypeName }} </span> {{ x.UseTypeName }} </span>
<span class="q-mr-md">{{ $t('v102.vehicle.tatle.th4') }}: {{x.TripInfo}}</span> <span class="q-mr-md">{{ $t('v102.vehicle.tatle.th4') }}: {{x.TripInfo}}</span>
<span class="q-mr-md" v-if="x.UnitPrice>0">{{ $t('v102.vehicle.list2.s21') }} {{x.UnitPrice}}</span> <span class="q-mr-md" v-if="x.UnitPrice>0">{{ $t('v102.vehicle.list2.s21') }}: {{x.UnitPrice}}</span>
<span class="q-mr-md" v-if="x.StopBusPrice>0">{{ $t('v102.vehicle.list2.s22') }} {{x.StopBusPrice}}</span> <span class="q-mr-md" v-if="x.StopBusPrice>0">{{ $t('v102.vehicle.list2.s22') }}: {{x.StopBusPrice}}</span>
<span class="q-mr-md" v-if="x.RoomPrice>0">{{ $t('v102.vehicle.list2.s23') }} {{x.RoomPrice}}</span> <span class="q-mr-md" v-if="x.RoomPrice>0">{{ $t('v102.vehicle.list2.s23') }}: {{x.RoomPrice}}</span>
<span class="q-mr-md"> {{ $t('hotelorder.xj') }}: {{ x.Money ?? 1 }} </span> <span class="q-mr-md"> {{ $t('hotelorder.xj') }}: {{ x.Money ?? 1 }} </span>
</div> </div>
</q-td> </q-td>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<template v-slot:body-cell-HandFittingFee="props"> <template v-slot:body-cell-HandFittingFee="props">
<q-td :props="props" :colspan="x.DetailList.length" v-if="props.rowIndex == 0" > <q-td :props="props" :colspan="x.DetailList.length" v-if="props.rowIndex == 0" >
{{ moneyFormat(x.ShouPeiFee) }} {{ moneyFormat(x.ShouPeiFee) }}
<div class="q-mt-sm" v-if="x.OfferState == 2"> <div class="q-mt-sm" v-if="x.ShouPeiFee<0">
<q-btn size="sm" dense outline color="primary" v-if="x.ContractUrl"> <q-btn size="sm" dense outline color="primary" v-if="x.ContractUrl">
<a class="text-primary" style="text-decoration:none" <a class="text-primary" style="text-decoration:none"
:href="x.ContractUrl">{{ $t('v101.downloadHands') }}</a> :href="x.ContractUrl">{{ $t('v101.downloadHands') }}</a>
......
src/components/vehicle/vehicleDetails.vue
View file @ fabf903f
<template> <template>
<q-card flat class="" style="width: 60vw;"> <q-card class="bg-white q-pa-lg column" style="max-width: 600px; min-width: 375px; width: 50%;">
<q-card-section class="q-pa-sm"> <div>
<div class="text-h6">{{ $t('v102.vehicle.list.s9') }}</div> <div class="text-h6 q-mb-md">{{ $t('v102.vehicle.list.s9') }}</div>
</q-card-section> <q-table separator="cell" :hide-bottom="postMsg&&postMsg.details?true:false" :pagination="{ rowsPerPage: 100000 }" :rows="postMsg.details" bordered :columns="cols" class="sticky-right-column-table light-border col no-shadow">
<q-card-section> <template v-slot:body-cell-UseDate="props">
<div style="font-weight: bold; <q-td :props="props" style="width: 130px;">
font-size: 18px; <div class="room-item f12 text-grey-6">
display: inline-block; <span class="q-mr-md">
margin-bottom: 20px;"> {{ props.row.UseDate }}</span>
{{ $t('v102.vehicle.list2.s20') }} <span class="q-mr-md"> {{ $t('v102.vehicle.di') }}{{props.row.DayNum}}{{ $t('v102.vehicle.tian') }} </span>
</div> </div>
<!-- 表格 --> </q-td>
<table width="100%" border="1" style="text-align:left; border-collapse:collapse;table-layout:fixed;word-break:break-all;border: 1px solid rgba(0, 0, 0, 0.12);
margin: auto;">
<tr>
<th width="15%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th1') }}</th>
<th width="15%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th2') }}</th>
<th width="15%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th3') }}</th>
<th width="23%" align="center" class="td-title">{{ $t('v102.vehicle.tatle.th4') }}</th>
<th width="10%" align="center" class="td-title">{{ $t('v102.vehicle.list2.s21') }}</th>
<th width="10%" align="center" class="td-title">{{ $t('v102.vehicle.list2.s22') }}</th>
<th width="12%" align="center" class="td-title">{{ $t('v102.vehicle.list2.s23') }}</th>
</tr>
<template v-for="(item, i) in postMsg.details" :key="i">
<tr>
<td align="center">
{{ item.UseDate }}
</td>
<td align="center">
DAY{{ item.DayNum }}
</td>
<td align="center">
{{ item.UseTypeName }}
</td>
<td>
{{ item.TripInfo }}
</td>
<td align="center">
{{ item.UnitPrice }}
</td>
<td align="center">
{{ item.StopBusPrice }}
</td>
<td align="center">
{{ item.RoomPrice }}
</td>
</tr>
</template> </template>
<tr> </q-table>
<th align="center">{{ $t('v102.vehicle.list2.s24') }}</th> <div class="row justify-between q-py-lg">
<td></td>
<td></td>
<td></td>
<th align="center"> {{ subUnitPrice }}</th>
<th align="center"> {{ subStopBusPrice }}</th>
<th align="center"> {{ subRoomPrice }}</th>
</tr>
</table>
<!-- 表格结束 -->
<div class="total">
<span>
{{ $t('v102.vehicle.list2.s29') }}
<span> <span>
<span class="text-grey-6">{{ $t('v102.vehicle.list2.s29') }}：</span>
<span class="fz16 text-light-blue-6">
{{ postMsg.ShouPeiFee }} {{ postMsg.ShouPeiFee }}
</span> </span>
<span style="margin-left: 10px;">
{{ $t('v102.vehicle.list2.s25') }}{{ postMsg.TotalPrice }}
</span> </span>
<span>
{{ $t('v102.vehicle.list2.s25') }}：
<span class="fz18 text-red">{{postMsg.CurrencyId?postMsg.CurrencyId:''}} {{ postMsg.TotalPrice }} </span>
</span> </span>
</div> </div>
<!-- 状态 --> <div class="row">
<div class="flex"> <span class="col-6" v-if="postMsg.Remark">
<span class="flex2"> <span class="text-grey-6">{{ $t('v102.vehicle.list2.s26') }}：</span>
<span style="width: 42px;">{{ $t('v102.vehicle.list2.s26') }}</span>
{{ postMsg.Remark }} {{ postMsg.Remark }}
</span> </span>
<span class="flex2"> <span class="col-6" v-if="postMsg.AttentionInfo">
<span>{{ $t('v102.vehicle.list2.s27') }}</span> <span class="text-grey-6">{{ $t('v102.vehicle.list2.s27') }}：</span>
{{ postMsg.AttentionInfo }} {{ postMsg.AttentionInfo }}
</span> </span>
<span class="flex2">
<span style="width: 42px;">{{ $t('v102.vehicle.list2.s28') }}</span>
{{ postMsg.OfferStateName }}
</span>
</div> </div>
</q-card-section> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn flat dense color="dark" :label="$t('close')" class="q-mr-sm" @click="down()" v-close-popup /> <q-btn flat dense color="dark" :label="$t('close')" class="q-mr-sm" @click="down()" v-close-popup />
</q-card-actions> </q-card-actions>
...@@ -116,7 +67,15 @@ export default defineComponent({ ...@@ -116,7 +67,15 @@ export default defineComponent({
subStopBusPrice: 0 as any, subStopBusPrice: 0 as any,
subRoomPrice: 0 as any, subRoomPrice: 0 as any,
postMsg: { postMsg: {
} as any } as any,
cols: [
{ name: 'UseDate', label: t('v102.vehicle.tatle.th1'), field: (row: any) => row.UseDate, align: 'left' },
{ name: 'UseType', label: t('v102.vehicle.tatle.th3'), field: (row: any) => row.UseTypeName, align: 'left' },
{ name: 'TripInfo', label: t('v102.vehicle.tatle.th4'), field: (row: any) => row.TripInfo, align: 'left' },
{ name: 'UnitPrice', label: t('v102.vehicle.list2.s21'), field: (row: any) => row.UnitPrice, align: 'left' },
{ name: 'StopBusPrice', label: t('v102.vehicle.list2.s22'), field: (row: any) => row.StopBusPrice, align: 'left' },
{ name: 'RoomPrice', label: t('v102.vehicle.list2.s23'), field: (row: any) => row.RoomPrice, align: 'left' }
] as any[],
}) })
onMounted(() => { onMounted(() => {
if (props.Id && props.Id > 0) { if (props.Id && props.Id > 0) {
......
src/i18n/zh-TW/index.ts
View file @ fabf903f
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
hotelRate: '酒店星級', hotelRate: '酒店星級',
minPrice: '最低價格', minPrice: '最低價格',
maxPrice: '最高價格', maxPrice: '最高價格',
waringTips: '注意：以下計費與報價均是按照人數進行計費', waringTips: '注意以下計費與報價均是按照人數進行計費',
inHouseDate: '入住日期', inHouseDate: '入住日期',
inhouseDays: '共計', inhouseDays: '共計',
bigTips: '本房型不同的酒店入住人數限制不同，系統默認該房型只能入住一人', bigTips: '本房型不同的酒店入住人數限制不同，系統默認該房型只能入住一人',
...@@ -944,37 +944,37 @@ export default { ...@@ -944,37 +944,37 @@ export default {
s10: '確認報價', s10: '確認報價',
}, },
list2: { list2: {
s1: '下單人：', s1: '下單人',
s2: '下單時間：', s2: '下單時間',
s3: '訂車公司：', s3: '訂車公司',
s4: '訂車人：', s4: '訂車人',
s5: '團體名稱：', s5: '團體名稱',
s6: '人數：', s6: '人數',
s7: '日期：', s7: '日期',
s8: '天數：', s8: '天數',
s9: '去程航班：', s9: '去程航班',
s10: '回程航班：', s10: '回程航班',
s11: '用車類型：', s11: '用車類型',
s12: '導遊信息：', s12: '導遊信息',
s13: '確認狀態：', s13: '確認狀態',
s14: '接機信息：', s14: '接機信息',
s15: '確認狀態：', s15: '確認狀態',
s16: '確認', s16: '確認',
s17: '已確認', s17: '已確認',
s18: '確認人：', s18: '確認人',
s19: '確認時間：', s19: '確認時間',
s20: '行程信息', s20: '行程信息',
s21: '價格：', s21: '價格',
s22: '停車費：', s22: '停車費',
s23: '司機住宿費：', s23: '司機住宿費',
s24: '小計：', s24: '小計',
s25: '合計：', s25: '合計',
s26: '備註：', s26: '備註',
s27: '注意事項：', s27: '注意事項',
s28: '狀態：', s28: '狀態',
s29: '手配費：', s29: '手配費',
s30: '司機：', s30: '司機',
s31: '車牌號：', s31: '車牌號',
}, },
tabtitle0: '團隊訂單', tabtitle0: '團隊訂單',
tabtitle1: '接機訂單', tabtitle1: '接機訂單',
...@@ -1110,8 +1110,8 @@ export default { ...@@ -1110,8 +1110,8 @@ export default {
day: '天', day: '天',
above: '天以上', above: '天以上',
recommend: '強力推薦', recommend: '強力推薦',
ascendingorder: '價格：低到高', ascendingorder: '價格低到高',
descendingorder: '價格：高到低', descendingorder: '價格高到低',
sightseeingitinerary: '觀光行程', sightseeingitinerary: '觀光行程',
daytrip: '半/一日遊', daytrip: '半/一日遊',
multiday: '多日遊', multiday: '多日遊',
...@@ -1149,7 +1149,7 @@ export default { ...@@ -1149,7 +1149,7 @@ export default {
d9: '所选日期 4 ~ 7 天之间取消，收取手续费 50%', d9: '所选日期 4 ~ 7 天之间取消，收取手续费 50%',
d10: '所选日期 1 ~ 3 天之间取消，收取手续费 80%', d10: '所选日期 1 ~ 3 天之间取消，收取手续费 80%',
d11: '所选日期 0 ~ 0 天之间取消，收取手续费 100%', d11: '所选日期 0 ~ 0 天之间取消，收取手续费 100%',
d12: '注意：由于站内商品来自全球各地，订单取消时间将依该供应商所在时区判定。供应商需 2-5 个工作天进行取消流程，依照您购买的商品取消政策收取手续费，并于取消流程完成后14 个工作天内退款。', d12: '注意由于站内商品来自全球各地，订单取消时间将依该供应商所在时区判定。供应商需 2-5 个工作天进行取消流程，依照您购买的商品取消政策收取手续费，并于取消流程完成后14 个工作天内退款。',
}, },
warnbuytext:{ warnbuytext:{
d1: '未满 2 岁幼儿不占位可免费参加（不含座位，餐点，门票，床位），请先于下订时在「备注栏」告知。', d1: '未满 2 岁幼儿不占位可免费参加（不含座位，餐点，门票，床位），请先于下订时在「备注栏」告知。',
......
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