Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/bigwood

parents ae7a9dce 8db2c2a8
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 64 deletions
src/assets/svg/Communication/Call#1.svg deleted 100644 → 0
View file @ ae7a9dce
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
<title>Stockholm-icons / Communication / Call#1</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Stockholm-icons-/-Communication-/-Call#1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<rect id="bound" x="0" y="0" width="24" height="24"></rect>
<path d="M11.914857,14.1427403 L14.1188827,11.9387145 C14.7276032,11.329994 14.8785122,10.4000511 14.4935235,9.63007378 L14.3686433,9.38031323 C13.9836546,8.61033591 14.1345636,7.680393 14.7432841,7.07167248 L17.4760882,4.33886839 C17.6713503,4.14360624 17.9879328,4.14360624 18.183195,4.33886839 C18.2211956,4.37686904 18.2528214,4.42074752 18.2768552,4.46881498 L19.3808309,6.67676638 C20.2253855,8.3658756 19.8943345,10.4059034 18.5589765,11.7412615 L12.560151,17.740087 C11.1066115,19.1936265 8.95659008,19.7011777 7.00646221,19.0511351 L4.5919826,18.2463085 C4.33001094,18.1589846 4.18843095,17.8758246 4.27575484,17.613853 C4.30030124,17.5402138 4.34165566,17.4733009 4.39654309,17.4184135 L7.04781491,14.7671417 C7.65653544,14.1584211 8.58647835,14.0075122 9.35645567,14.3925008 L9.60621621,14.5173811 C10.3761935,14.9023698 11.3061364,14.7514608 11.914857,14.1427403 Z" id="Path-76" fill="#000000"></path>
</g>
</svg>
\ No newline at end of file
src/assets/svg/General/Settings#3.svg deleted 100644 → 0
View file @ ae7a9dce
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
<title>Stockholm-icons / General / Settings#3</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Stockholm-icons-/-General-/-Settings#3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<rect id="bound" x="0" y="0" width="24" height="24"></rect>
<rect id="Combined-Shape" fill="#000000" opacity="0.3" x="2" y="6" width="21" height="12" rx="6"></rect>
<circle id="Oval" fill="#000000" cx="17" cy="12" r="4"></circle>
</g>
</svg>
\ No newline at end of file
src/components/hotel/order/list/OrderList.vue
View file @ caf3bea6
......@@ -10,7 +10,10 @@
<q-btn color="dark" flat size="sm" :label="$t('hotelorder.copy')" v-if="copyId != x.OrderId" @click="setCopyHandler(x)" />
<q-btn color="cyan" icon="check" outline size="sm" :label="$t('hotelorder.copyed')" v-else></q-btn>
</div>
<div class="col"></div>
<div class="col text-center f12 text-grey-6">
<span v-if="x.OrderType==1">{{$t('hotelorder.search.contactInfo')}}：{{x.ContactName}}/{{x.ContactNumber}}</span>
<span v-else>{{$t('hotelorder.search.tcNum')}}：{{x.TCNum}}</span>
</div>
<div class="f12 text-grey-6">{{ $t('hotelorder.createTime') }}：{{ x.CreateTime }}</div>
<div class="q-ml-md f12" :class="[x.typeInfo.Color]">
<q-icon :name="x.typeInfo.Icon" />
......@@ -35,6 +38,10 @@
<q-btn color="cyan" outline size="sm" :label="$t('hotelorder.copyed')" v-else></q-btn>
</div>
</div>
<div class="f12 text-grey-6">
<span v-if="x.OrderType==1">{{$t('hotelorder.search.contactInfo')}}：{{x.ContactName}}/{{x.ContactNumber}}</span>
<span v-else>{{$t('hotelorder.search.tcNum')}}：{{x.TCNum}}</span>
</div>
<div class="f12 text-grey-6">{{ $t('hotelorder.createTime') }}：{{ x.CreateTime }}</div>
</div>
</div>
......@@ -62,11 +69,11 @@
</template>
<template v-slot:body-cell-RoomNo="props">
<q-td :props="props">
<n-tag :bordered="false" size="small" type="error" v-if="props.row.HotelStatus == 2">
<n-tag :bordered="false" size="small" type="error" v-if="!props.row.ReserveRoomNo">
{{ $t('hotelorder.check.un') }}
</n-tag>
<n-tag :bordered="false" size="small" type="success" v-else>
{{ props.row.RoomNo ?? 'JVS2022141325K' }}
{{ props.row.ReserveRoomNo}}
</n-tag>
</q-td>
</template>
......@@ -77,14 +84,6 @@
</q-td>
</template>
</q-table>
<!-- <div class="q-ml-md q-pl-md" style="border-left:1px dashed var(--q-accent);">
<div class="f12 text-grey-6">{{$t('hotelorder.orderMoney')}}</div>
<div class="text-subtitle1 text-negative">
<span class="f12">{{$t('unit.jpc')}}</span>
<span>{{x.Money.toFixed(2)}}</span>
<span class="f12">{{$t('unit.jp')}}</span>
</div>
</div> -->
</div>
<div class="q-mt-md" :class="{ row: $q.platform.is.desktop, 'column reverse': $q.platform.is.mobile }">
<div class="pay row text-grey rounded-borders q-pa-md" v-if="$q.platform.is.desktop || ($q.platform.is.mobile && expendsOrderId == x.OrderId)" :class="{ 'bg-grey-2': $q.platform.is.mobile }">
......@@ -109,42 +108,32 @@
<q-btn color="grey" @click="setShowWarnHander(x.OrderId)" dense size="sm" flat :label="expendsOrderId == x.OrderId ? $t('expends.off') : $t('expends.on')" />
</div>
<div class="col desktop-only"></div>
<div class="rounded-borders bg-grey-2 q-pa-md" :class="{ 'q-mx-md': $q.platform.is.desktop, 'q-my-md row items-center justify-between': $q.platform.is.mobile }">
<div>
<div class="rounded-borders bg-grey-2 q-pa-md" :class="{ 'q-mx-md': $q.platform.is.desktop, 'q-mt-md': $q.platform.is.mobile }">
<div class="row items-center justify-between q-mb-sm q-pb-sm" style="border-bottom:1px dashed #ddd;">
<div class="f12 text-grey">{{ $t('hotelorder.orderMoney') }}</div>
<div class="dark">
<div class="dark q-ml-xl">
<span class="f12">{{ $t('unit.jpc') }}</span>
<span class="din text-h6">{{ x.Money.toFixed(2) }}</span>
<span class="din text-subtitle1">{{ x.Money.toFixed(2) }}</span>
<span class="f12">{{ $t('unit.jp') }}</span>
</div>
</div>
<div class="row q-mt-sm">
<div class="q-mr-lg">
<div class="f12 text-grey">{{ $t('hotelorder.payType.t1') }}</div>
<div class="dark">
<span class="din text-subtitle1">{{ (x.Money ?? 1999).toFixed(2) }}</span>
<span class="f12">{{ $t('unit.jp') }}</span>
</div>
<div class="row items-center justify-between q-mb-sm q-pb-sm" style="border-bottom:1px dashed #ddd;" v-if="x.CustomerPayType==1 ||x.CustomerPayType==3">
<div class="f12 text-grey">{{ $t('hotelorder.payType.t1') }}</div>
<div class="dark">
<span class="f12">{{ (x.SelfPayMoney ?? 1999).toFixed(2) }}</span>
<span class="f12">{{ $t('unit.jp') }}</span>
</div>
<div>
</div>
<div class="row items-center justify-between" v-if="x.CustomerPayType==2 ||x.CustomerPayType==3">
<div class="f12 text-grey">{{ $t('hotelorder.payType.t2') }}</div>
<div class="dark">
<span class="din text-subtitle1">{{ (x.Money ?? 1999).toFixed(2) }}</span>
<span class="f12">{{ (x.BeforeMoney ?? 0).toFixed(2) }}</span>
<span class="f12">{{ $t('unit.jp') }}</span>
</div>
</div>
</div>
</div>
<div class="bg-green-1 rounded-borders q-pa-md justify-between" :class="{ column: $q.platform.is.desktop, 'row items-center': $q.platform.is.mobile }">
<div>
<div class="f12 text-green-4">{{ $t('hotelorder.payed') }}</div>
<div class="text-subtitle1 din text-green-14">
50000.00
<span class="text-green-4 f12">{{ $t('unit.jp') }}</span>
</div>
</div>
<q-btn-dropdown unelevated color="green" :label="$t('hotelorder.opera.normal')">
<q-list>
<div class="rounded-borders q-pa-md justify-between" :class="{'column': $q.platform.is.desktop, 'row items-center': $q.platform.is.mobile,'bg-green-1':x.OrderStatus!=1,'bg-grey-2':x.OrderStatus==1 }">
<q-list v-if="x.OrderStatus==1" :class="{'row items-center justify-between full-width':$q.platform.is.mobile}">
<q-item class="text-negative" clickable v-close-popup>
<q-item-section>
<q-item-label>{{ $t('hotelorder.opera.cancel') }}</q-item-label>
......@@ -161,7 +150,13 @@
</q-item-section>
</q-item> -->
</q-list>
</q-btn-dropdown>
<div v-else>
<div class="f12 text-green-4">{{ $t('hotelorder.payed') }}</div>
<div class="text-subtitle1 din text-green-14">
0.00
<span class="text-green-4 f12">{{ $t('unit.jp') }}</span>
</div>
</div>
</div>
</div>
</q-card>
......@@ -222,9 +217,10 @@ export default defineComponent({
{ name: 'HotelName', label: t('hotelorder.col.hn'), field: (row: any) => row.HotelName, align: 'left' },
{ name: 'Room', label: t('hotelorder.col.r'), align: 'left' },
{ name: 'RoomNo', label: t('hotelorder.col.n'), align: 'left' },
{ name: 'Tax', label: t('hotelorder.col.t'), field: (row: any) => (row.TaxesPrice ? row.TaxesPrice : t('hotelorder.col.noneTax')), align: 'left' },
{ name: 'Tax', label: t('hotelorder.col.t'), field: (row: any) => (row.TaxesPrice ? (`${(row.PeopleNum*row.TaxesPrice).toFixed(2)}`) : t('hotelorder.col.noneTax')), align: 'left' },
{ name: 'Tax2', label: t('hotelorder.col.t2'), field: (row: any) => (row.PriceInTangTax ? (`${(row.PeopleNum*row.PriceInTangTax).toFixed(2)}`) : t('hotelorder.col.noneTax')), align: 'left' },
{ name: 'Money', label: t('hotelorder.col.m'), field: (row: any) => (row.HotelMoeny + row.TaxesPrice).toFixed(2), align: 'left' },
{ name: 'PayType', label: t('hotelorder.col.m'), field: (row: any) => (row.PayType == 1 ? t('hotelorder.payType.t1') : t('hotelorder.payType.t2')), align: 'left' }
{ name: 'PayType', label: t('hotelorder.col.pt'), field: (row: any) => (row.PayType == 1 ? t('hotelorder.payType.t1') : t('hotelorder.payType.t2')), align: 'left' }
] as any
})
......@@ -238,9 +234,13 @@ export default defineComponent({
r.data.data.pageData.forEach((x: any) => {
x.typeInfo = data.status.find(y => y.StatusId == x.OrderStatus) ?? data.status[1]
x.DetailList.forEach((y: any) => {
let PeopleNum = 0
y.RoomList.forEach((z: any) => {
z.RoomInfo = data.rooms.find(r => r.TypeId == z.RoomType) ?? data.rooms[0]
PeopleNum+=z.PeopleNumber
})
console.log(PeopleNum)
y.PeopleNum = PeopleNum
})
})
data.orders = r.data.data.pageData
......
src/i18n/zh-TW/index.ts
View file @ caf3bea6
......@@ -47,7 +47,8 @@ export default {
orderMoney: '訂單總金額',
payed: '已支付',
warn:'查看預定的注意事項',
taxed: '含稅',
handFee: '手佩費',
check: {
un: '未確認',
ok: '確認'
......@@ -67,10 +68,12 @@ export default {
d: '入住日期',
r: '入住信息',
n: '訂房號',
t: '稅金',
t: '城市税',
t2: '入湯税',
m: '小計',
noRoomNo: '訂房號',
noneTax: '税入'
noneTax: '税入',
pt:'付款方式'
},
search: {
status: '訂單狀態',
......
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