Skip to content

B
bigwood
Commit 06d5f1b9 authored by 罗超's avatar 罗超
Browse files
Options

修改银行帐户卡片

parent 0526bfbc
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 10 deletions
src/components/hotel/list/TableOperation.vue
View file @ 06d5f1b9
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<span class="text-primary text-h6 col">{{ parameters.HotelName }}</span> <span class="text-primary text-h6 col">{{ parameters.HotelName }}</span>
<div class="f12" :class="{'q-mt-sm':$q.platform.is.mobile}"> <div class="f12" :class="{'q-mt-sm':$q.platform.is.mobile}">
<span class="q-mr-md"> <span class="q-mr-md">
<q-icon name="check" size="18px" color="primary" v-if="hotelInfor.PriceList[0].PriceIsBreakfast==1" /> <q-icon name="check" size="18px" color="primary" v-if="parameters.PriceIsBreakfast==1" />
<q-icon name="close" size="18px" color="negative" v-else /> <q-icon name="close" size="18px" color="negative" v-else />
{{$t('dinner.a')}} {{$t('dinner.a')}}
</span> </span>
<span class=""> <span class="">
<q-icon name="check" size="18px" color="primary" v-if="hotelInfor.PriceList[0].PriceIsDinner==1" /> <q-icon name="check" size="18px" color="primary" v-if="parameters.PriceIsDinner==1" />
<q-icon name="close" size="18px" color="negative" v-else /> <q-icon name="close" size="18px" color="negative" v-else />
{{$t('dinner.c')}} {{$t('dinner.c')}}
</span> </span>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, ref, reactive, toRef, toRefs, provide, onMounted, inject, watch, onMounted } from 'vue' import { defineComponent, ref, reactive, toRef, toRefs, provide, onMounted, inject, watch } from 'vue'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { DirtionmaryHelper } from '../../../config/dictionary' import { DirtionmaryHelper } from '../../../config/dictionary'
import { date } from 'quasar' import { date } from 'quasar'
...@@ -143,7 +143,9 @@ export default defineComponent({ ...@@ -143,7 +143,9 @@ export default defineComponent({
DetailList: [] as Array<any>, DetailList: [] as Array<any>,
Remark: '', Remark: '',
TaxesPrice:0, TaxesPrice:0,
PriceInTangTax:0 PriceInTangTax:0,
PriceIsBreakfast:0,
PriceIsDinner:0
}, },
total: 0, total: 0,
joinHouse: { joinHouse: {
...@@ -242,7 +244,10 @@ export default defineComponent({ ...@@ -242,7 +244,10 @@ export default defineComponent({
data.parameters.Date = hotel.DateStr data.parameters.Date = hotel.DateStr
data.parameters.RemainingInventory = hotel.RemainingInventory data.parameters.RemainingInventory = hotel.RemainingInventory
data.parameters.TaxesPrice = tempPrice.TaxesPrice data.parameters.TaxesPrice = tempPrice.TaxesPrice
data.parameters.PriceInTangTax= tempPrice.PriceInTangTax, data.parameters.PriceInTangTax= tempPrice.PriceInTangTax
data.parameters.PriceIsBreakfast = tempPrice.PriceIsBreakfast
data.parameters.PriceIsDinner = tempPrice.PriceIsDinner
methods.setDateRange() methods.setDateRange()
roomTyps.forEach((x: any, i: number) => { roomTyps.forEach((x: any, i: number) => {
if (tempPrice[x] > 0) { if (tempPrice[x] > 0) {
......
src/components/hotel/order/list/OrderList.vue
View file @ 06d5f1b9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</div> </div>
<div class="q-mt-md row"> <div class="q-mt-md row">
<q-table separator="cell" :hide-bottom="true" dense :rows="x.DetailList" bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow"> <q-table separator="cell" :hide-bottom="!x.Remark" :pagination="{rowsPerPage:100}" dense :rows="x.DetailList" bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow">
<template v-slot:header-cell-Room="props"> <template v-slot:header-cell-Room="props">
<q-th :props="props"> <q-th :props="props">
<div class="row items-center"> <div class="row items-center">
...@@ -95,6 +95,9 @@ ...@@ -95,6 +95,9 @@
<q-tooltip>{{ props.value }}</q-tooltip> <q-tooltip>{{ props.value }}</q-tooltip>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom>
<div class="msl text-negative">{{$t('v101.hotelRemark')}}：{{x.Remark}}</div>
</template>
</q-table> </q-table>
</div> </div>
<div class="q-mt-md" v-if="x.OrderStatus != 3" :class="{ row: $q.platform.is.desktop, 'column reverse': $q.platform.is.mobile }"> <div class="q-mt-md" v-if="x.OrderStatus != 3" :class="{ row: $q.platform.is.desktop, 'column reverse': $q.platform.is.mobile }">
...@@ -189,6 +192,13 @@ ...@@ -189,6 +192,13 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="x.OrderStatus == 3">
<div class="q-mt-md q-pa-sm row items-center rounded-borders bg-orange-1" style="border-width: 0 5px; border-style: solid; border-color:#ffb74d;">
<div class="text-subtitle2 text-weight-bolder text-grey-900">{{$t('v101.cancelRemark')}}：</div>
<div class="f12 text-grey-600 q-ml-sm col">{{x.CancelRemark?x.CancelRemark:$t('v101.selfCancle')}}</div>
<div class="f12 text-grey-900">{{x.CancelEmpName}} {{x.CancelTime}}</div>
</div>
</div>
</q-card> </q-card>
<q-card class="light-shadow q-pa-md bg-white rounded-borders q-mb-md" v-if="pages.pageCount > 0" flat> <q-card class="light-shadow q-pa-md bg-white rounded-borders q-mb-md" v-if="pages.pageCount > 0" flat>
<q-pagination class="full-width justify-end" v-model="pages.pageIndex" color="primary" :max="pages.pageCount" :input="true" @update:model-value="changePageHandler" /> <q-pagination class="full-width justify-end" v-model="pages.pageIndex" color="primary" :max="pages.pageCount" :input="true" @update:model-value="changePageHandler" />
...@@ -199,7 +209,7 @@ ...@@ -199,7 +209,7 @@
<svg-icon :size="50" color="nav" icon="General/Clipboard.svg"></svg-icon> <svg-icon :size="50" color="nav" icon="General/Clipboard.svg"></svg-icon>
<div class="q-mt-md f12 text-grey-6">{{ $t('noneData') }}</div> <div class="q-mt-md f12 text-grey-6">{{ $t('noneData') }}</div>
</div> </div>
<q-dialog v-model="PaymentDialog"> <!-- <q-dialog v-model="PaymentDialog">
<div class="rounded-borders bg-white q-pb-lg q-pt-lg" style="width: 450px"> <div class="rounded-borders bg-white q-pb-lg q-pt-lg" style="width: 450px">
<div class="orderListDialog-title row justify-center q-pb-xs"> <div class="orderListDialog-title row justify-center q-pb-xs">
<span class="text-weight-bold">{{ $t('hotelorder.dialog.title') }}</span> <span class="text-weight-bold">{{ $t('hotelorder.dialog.title') }}</span>
...@@ -209,12 +219,12 @@ ...@@ -209,12 +219,12 @@
<div class="orderListDialog-img"> <div class="orderListDialog-img">
<div class="row items-end q-pb-md"> <div class="row items-end q-pb-md">
<span class="text-grey-3">{{ $t('hotelorder.dialog.AccountName') }}：</span> <span class="text-grey-3">{{ $t('hotelorder.dialog.AccountName') }}：</span>
<span class="text-weight-bold text-white" style="font-size: 18px">張三</span> <span class="text-weight-bold text-white" style="font-size: 18px">株式会社ピースインターナショナル</span>
</div> </div>
<div class="q-pb-sm" :class="{'row items-center justify-between':$q.platform.is.desktop}"> <div class="q-pb-sm" :class="{'row items-center justify-between':$q.platform.is.desktop}">
<div :class="{'q-mb-sm':$q.platform.is.mobile,'col':$q.platform.is.desktop}" > <div :class="{'q-mb-sm':$q.platform.is.mobile,'col':$q.platform.is.desktop}" >
<span class="text-grey-3">{{ $t('hotelorder.dialog.account') }}：</span> <span class="text-grey-3">{{ $t('hotelorder.dialog.account') }}：</span>
<span class="text-cyan-12 text-weight-bold din" style="font-size: 18px">**** **** **** ***</span> <span class="text-cyan-12 text-weight-bold din" style="font-size: 18px">593-1070078</span>
</div > </div >
<q-btn :class="{'q-ml-xl':$q.platform.is.mobile}" unelevated size="xs" class="bg-blue-11 text-white" v-if="copyId != -1" :label="$t('hotelorder.dialog.copy')" @click="setCopyHandler(null,'開戶名：張三，帳戶：7489 3272 7942 311')"></q-btn> <q-btn :class="{'q-ml-xl':$q.platform.is.mobile}" unelevated size="xs" class="bg-blue-11 text-white" v-if="copyId != -1" :label="$t('hotelorder.dialog.copy')" @click="setCopyHandler(null,'開戶名：張三，帳戶：7489 3272 7942 311')"></q-btn>
<q-btn :class="{'q-ml-xl':$q.platform.is.mobile}" icon="check" unelevated size="xs" class="bg-blue-11 text-white" :label="$t('hotelorder.copyed')" v-else></q-btn> <q-btn :class="{'q-ml-xl':$q.platform.is.mobile}" icon="check" unelevated size="xs" class="bg-blue-11 text-white" :label="$t('hotelorder.copyed')" v-else></q-btn>
...@@ -225,6 +235,32 @@ ...@@ -225,6 +235,32 @@
<span class="text-center f12 text-grey-6 q-px-lg">{{ $t('hotelorder.dialog.prompt') }}</span> <span class="text-center f12 text-grey-6 q-px-lg">{{ $t('hotelorder.dialog.prompt') }}</span>
</div> </div>
</div> </div>
</q-dialog> -->
<q-dialog v-model="showBankAccount">
<q-card flat class="q-pa-md" style="background:#080655;width:30vw;min-width: 375px;" >
<div class="row items-end">
<img src="../../../../assets/images/green_pic.jpg" style="width:100px;" />
<div class="q-ml-md f12 text-grey-4 col text-right">水口支店　店番593</div>
</div>
<div class="q-mt-md">
<div class="f12 text-grey-1" style="opacity:.3">帳戶名：</div>
<div class="pf text-grey-4 text-weight-bolder text-subtitle1">株式会社ピースインターナショナル</div>
</div>
<div class="q-mt-md">
<div class="f12 text-grey-1" style="opacity:.3">口座番號：</div>
<div class="pf text-grey-4 text-weight-bolder text-subtitle1">
593-1070078
<span class="f12 text-grey-1 text-weight-400" style="opacity:.5">(レギュラー口座)</span>
</div>
</div>
<div class="q-mt-md">
<div class="f12 text-grey-1" style="opacity:.3">銀行住所</div>
<div class="pf text-grey-1 text-weight-bolder f12" style="opacity:.5">滋賀県甲賀市水口町本綾野5－21 （0748－65－1011）</div>
</div>
<div class="q-mt-md text-right">
<q-btn color="white" outline class="q-px-lg" style="opacity:.6" dense :label="$t('hotelorder.copy')" @click="setCopyHandler(null,'行名：京都銀行\n支店名：水口支店　店番593\n口座種別：レギュラー口座\n口座番号： 593-1070078\n账户名：株式会社ピースインターナショナル\n银行住所：滋賀県甲賀市水口町本綾野5－21\n银行邮变：〒528-0037\n電話番号：0748－65－1011\n')"/>
</div>
</q-card>
</q-dialog> </q-dialog>
</template> </template>
...@@ -264,6 +300,7 @@ export default defineComponent({ ...@@ -264,6 +300,7 @@ export default defineComponent({
status: [] as Array<StandardStatus>, status: [] as Array<StandardStatus>,
rooms: [] as Array<RoomType>, rooms: [] as Array<RoomType>,
uploadOrderId: 0, uploadOrderId: 0,
showBankAccount:false,
pages: { pages: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
...@@ -288,7 +325,7 @@ export default defineComponent({ ...@@ -288,7 +325,7 @@ export default defineComponent({
const methods = { const methods = {
ViewPayment(){ ViewPayment(){
data.PaymentDialog = true data.showBankAccount = true
}, },
initOrders() { initOrders() {
let param = Object.assign(data.pages, search) let param = Object.assign(data.pages, search)
......
src/i18n/zh-TW/index.ts
View file @ 06d5f1b9
...@@ -402,6 +402,9 @@ export default { ...@@ -402,6 +402,9 @@ export default {
versionUpgrade:'版本更新紀錄', versionUpgrade:'版本更新紀錄',
comingsoon:'我們即將推出', comingsoon:'我們即將推出',
comingsoonDesc:'我們正在努力推進此功能的開發，預期將在1個月左右的週期內完成上線。感謝您的支持', comingsoonDesc:'我們正在努力推進此功能的開發，預期將在1個月左右的週期內完成上線。感謝您的支持',
hotelRemark: '備註',
cancelRemark: '取消備註',
selfCancle: '客戶自己取消了訂單',
versonDetails:{ versonDetails:{
date:'2022/11/29', date:'2022/11/29',
content:'' content:''
......
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