Skip to content

Q
quasar-web-base
Commit 48e5e5ad authored by Nguyễn Đức Thắng's avatar Nguyễn Đức Thắng
Browse files
Options

UPDATE

parent 4515b843
Show whitespace changes
Inline Side-by-side
Showing with 197 additions and 140 deletions
src/assets/type.ts
View file @ 48e5e5ad
...@@ -534,6 +534,8 @@ export type ListBooking = { ...@@ -534,6 +534,8 @@ export type ListBooking = {
fee: string; fee: string;
bookingRandomCode: string; bookingRandomCode: string;
expectFee: string expectFee: string
customerName: string
createTime: string
}; };
export type ListArrayArtist = { export type ListArrayArtist = {
......
src/components/booking/listFinedAmount.vue
View file @ 48e5e5ad
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
<div>{{ item.row.artistBooking.artistName }}</div> <div>{{ item.row.artistBooking.artistName }}</div>
</td> </td>
</template> </template>
<template v-slot:body-cell-bookingRandomCode="item">
<td style="text-align: center">
<div>{{ item.row.artistBooking.bookingRandomCode }}</div>
</td>
</template>
<template v-slot:body-cell-customerName="item"> <template v-slot:body-cell-customerName="item">
<td style="text-align: center"> <td style="text-align: center">
<div>{{ item.row.artistBooking.customerName }}</div> <div>{{ item.row.artistBooking.customerName }}</div>
...@@ -159,12 +165,11 @@ export default defineComponent({ ...@@ -159,12 +165,11 @@ export default defineComponent({
align: 'center', align: 'center',
sortable: false, sortable: false,
}, },
{ {
name: 'artistName', name: 'bookingRandomCode',
field: 'artistName', field: 'bookingRandomCode',
required: true, required: true,
label: 'Tên nghệ sĩ', label: 'Mã booking',
headerStyle: 'text-align: center !important; width: 9%', headerStyle: 'text-align: center !important; width: 9%',
align: 'left', align: 'left',
sortable: false, sortable: false,
...@@ -179,6 +184,15 @@ export default defineComponent({ ...@@ -179,6 +184,15 @@ export default defineComponent({
sortable: false, sortable: false,
}, },
{
name: 'artistName',
field: 'artistName',
required: true,
label: 'Tên nghệ sĩ',
headerStyle: 'text-align: center !important; width: 9%',
align: 'left',
sortable: false,
},
{ {
name: 'fee', name: 'fee',
field: 'fee', field: 'fee',
...@@ -192,7 +206,7 @@ export default defineComponent({ ...@@ -192,7 +206,7 @@ export default defineComponent({
name: 'reason', name: 'reason',
field: 'reason', field: 'reason',
required: true, required: true,
label: 'Nội dung', label: 'Lý do phạt',
headerStyle: 'text-align: center !important; width: 13%', headerStyle: 'text-align: center !important; width: 13%',
align: 'left', align: 'left',
sortable: false, sortable: false,
......
src/components/detailBooking/index.vue
View file @ 48e5e5ad
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
persistent persistent
:model-value="showDialog" :model-value="showDialog"
@update:model-value="$emit('update:showDialog', $event)" @update:model-value="$emit('update:showDialog', $event)"
> >
<q-card style="min-width: 60rem" bordered> <q-card style="min-width: 60rem" bordered>
<q-form greedy> <q-form greedy>
...@@ -13,8 +12,8 @@ ...@@ -13,8 +12,8 @@
<q-item-label <q-item-label
class="text-h6 text-weight-regular" class="text-h6 text-weight-regular"
style="text-align: center" style="text-align: center"
>{{ $t('listBooking.dialogLabel.title') }} </q-item-label >{{ $t('listBooking.dialogLabel.title') }}
> </q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-card-section> </q-card-section>
...@@ -23,56 +22,72 @@ ...@@ -23,56 +22,72 @@
<q-card-section> <q-card-section>
<div class="col-12 q-px-xl"> <div class="col-12 q-px-xl">
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-4 fs-14 color"> <div class="col-6">
{{ $t('listBooking.titleColumnsTable.bookingCode') }}: <div class="row q-col-gutter-sm">
</div> <div class="col-5 fs-14 color">Mã booking:</div>
<div class="col-8 fs-14"> <div class="col-7 fs-14">
{{ detailInfoBooking.bookingRandomCode }} {{ detailInfoBooking.bookingRandomCode }}
</div> </div>
<div class="col-4 fs-14 color">
<div class="col-5 fs-14 color">
{{ $t('listBooking.titleColumnsTable.artistName') }}: {{ $t('listBooking.titleColumnsTable.artistName') }}:
</div> </div>
<div class="col-8 fs-14"> <div class="col-7 fs-14">
{{ detailInfoBooking.artistName }} {{ detailInfoBooking.artistName }}
</div> </div>
<div class="col-4 fs-14 color">
<div class="col-5 fs-14 color">
{{ $t('listBooking.titleColumnsTable.userName') }}: {{ $t('listBooking.titleColumnsTable.userName') }}:
</div> </div>
<div class="col-8 fs-14">{{ detailInfoBooking.userName }}</div> <div class="col-7 fs-14">
{{ detailInfoBooking.customerName }}
</div>
<div class="col-4 fs-14 color"> <div class="col-5 fs-14 color">
{{ $t('listBooking.titleColumnsTable.content') }}:
</div>
<div class="col-7 fs-14">{{ detailInfoBooking.content }}</div>
<div class="col-5 fs-14 color">
{{ $t('listBooking.titleColumnsTable.address') }}: {{ $t('listBooking.titleColumnsTable.address') }}:
</div> </div>
<div class="col-8 fs-14">{{ detailInfoBooking.address }}</div> <div class="col-7 fs-14">{{ detailInfoBooking.address }}</div>
</div>
</div>
<div class="col-6">
<div class="row q-col-gutter-sm">
<div class="col-6 fs-14 color">
{{ 'Thời gian đặt booking' }}:
</div>
<div class="col-6 fs-14">
{{ detailInfoBooking.createTime }}
</div>
<div class="col-4 fs-14 color"> <div class="col-6 fs-14 color">
{{ $t('listBooking.titleColumnsTable.fromTime') }}: {{ $t('listBooking.titleColumnsTable.fromTime') }}:
</div> </div>
<div class="col-8 fs-14">{{ detailInfoBooking.fromTime }}</div> <div class="col-6 fs-14">
{{ detailInfoBooking.fromTime }}
</div>
<div class="col-4 fs-14 color"> <div class="col-6 fs-14 color">
{{ $t('listBooking.titleColumnsTable.toTime') }}: {{ $t('listBooking.titleColumnsTable.toTime') }}:
</div> </div>
<div class="col-8 fs-14">{{ detailInfoBooking.toTime }}</div> <div class="col-6 fs-14">{{ detailInfoBooking.toTime }}</div>
<div class="col-4 fs-14 color"> <div class="col-6 fs-14 color">
{{ $t('listBooking.titleColumnsTable.fee') }}: {{ $t('listBooking.titleColumnsTable.fee') }}:
</div> </div>
<div class="col-8 fs-14">{{ isformatMoney(detailInfoBooking.expectFee) }}</div> <div class="col-6 fs-14">
{{ isformatMoney(detailInfoBooking.expectFee) }}
<div class="col-4 fs-14 color">
{{ $t('listBooking.titleColumnsTable.favoriteScore') }}:
</div>
<div class="col-8 fs-14">
{{ detailInfoBooking.favoriteScore }}
</div> </div>
<div class="col-4 fs-14 color"> <div class="col-6 fs-14 color">
{{ $t('listBooking.titleColumnsTable.status') }}: {{ $t('listBooking.titleColumnsTable.status') }}:
</div> </div>
<div class="col-8 fs-14"> <div class="col-6 fs-14">
<q-chip <q-chip
size="sm" size="sm"
color="secondary" color="secondary"
...@@ -103,19 +118,12 @@ ...@@ -103,19 +118,12 @@
v-else-if="detailInfoBooking.status === 4" v-else-if="detailInfoBooking.status === 4"
>Chờ hủy</q-chip >Chờ hủy</q-chip
> >
</div> </div>
<div class="col-6 fs-14 color">
<div class="col-4 fs-14 color">
{{ $t('listBooking.titleColumnsTable.performStatus') }}: {{ $t('listBooking.titleColumnsTable.performStatus') }}:
</div> </div>
<div class="col-8 fs-14"> <div class="col-6 fs-14">
<q-chip <q-chip
size="sm" size="sm"
color="secondary" color="secondary"
...@@ -130,11 +138,8 @@ ...@@ -130,11 +138,8 @@
> >
<q-chip size="sm" color="warning" v-else>Từ chối</q-chip> <q-chip size="sm" color="warning" v-else>Từ chối</q-chip>
</div> </div>
<div class="col-4 fs-14 color">
{{ $t('listBooking.titleColumnsTable.content') }}:
</div> </div>
<div class="col-8 fs-14">{{ detailInfoBooking.content }}</div> </div>
</div> </div>
</div> </div>
......
src/pages/danh-sach-booking/index.vue
View file @ 48e5e5ad
...@@ -170,6 +170,14 @@ ...@@ -170,6 +170,14 @@
</q-btn> </q-btn>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-bookingRandomCode="item">
<q-td :item="item" style="text-align: center">
<div style="cursor: pointer;" @click="detail(item.row.id)">
{{ item.row.bookingRandomCode }}
</div>
</q-td>
</template>
<template v-slot:body-cell-stt="item"> <template v-slot:body-cell-stt="item">
<q-td :item="item" style="text-align: center"> <q-td :item="item" style="text-align: center">
{{ 1 + item.rowIndex + pageSize * (pageIndex - 1) }} {{ 1 + item.rowIndex + pageSize * (pageIndex - 1) }}
...@@ -190,6 +198,20 @@ ...@@ -190,6 +198,20 @@
</template> </template>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-time="item">
<td align="center">
<div>{{ item.row.fromTime }} - {{ item.row.toTime }}</div>
</td>
</template>
<template v-slot:body-cell-info="item">
<td align="center">
<div>
{{ item.row.customerDto.fullName }}
<span v-if="item.row.customerDto.phone">- {{ item.row.customerDto.phone }}</span>
</div>
</td>
</template>
<template v-slot:body-cell-performStatus="item"> <template v-slot:body-cell-performStatus="item">
<q-td align="center"> <q-td align="center">
...@@ -231,7 +253,10 @@ ...@@ -231,7 +253,10 @@
<template v-slot:body-cell-finedAmount="item"> <template v-slot:body-cell-finedAmount="item">
<q-td style="cursor: pointer" align="center"> <q-td style="cursor: pointer" align="center">
<div style="color: blue; text-decoration:underline;" @click="openDialogfinedAmount(item.row)"> <div
style="color: blue; text-decoration: underline"
@click="openDialogfinedAmount(item.row)"
>
{{ isformatMoney(item.row.finedAmount) }} {{ isformatMoney(item.row.finedAmount) }}
</div> </div>
</q-td> </q-td>
...@@ -316,7 +341,7 @@ export default defineComponent({ ...@@ -316,7 +341,7 @@ export default defineComponent({
sortable: false, sortable: false,
}, },
{ {
name: 'bookingCode', name: 'bookingRandomCode',
field: 'bookingRandomCode', field: 'bookingRandomCode',
required: true, required: true,
label: i18n.global.t('listBooking.titleColumnsTable.bookingCode'), label: i18n.global.t('listBooking.titleColumnsTable.bookingCode'),
...@@ -334,8 +359,8 @@ export default defineComponent({ ...@@ -334,8 +359,8 @@ export default defineComponent({
sortable: false, sortable: false,
}, },
{ {
name: 'customerName', name: 'info',
field: 'customerName', field: 'info',
required: true, required: true,
label: i18n.global.t('listBooking.titleColumnsTable.userName'), label: i18n.global.t('listBooking.titleColumnsTable.userName'),
headerStyle: 'text-align: center !important; width: 9%', headerStyle: 'text-align: center !important; width: 9%',
...@@ -348,7 +373,7 @@ export default defineComponent({ ...@@ -348,7 +373,7 @@ export default defineComponent({
required: true, required: true,
label: i18n.global.t('listBooking.titleColumnsTable.address'), label: i18n.global.t('listBooking.titleColumnsTable.address'),
headerStyle: 'text-align: center !important; width: 13%', headerStyle: 'text-align: center !important; width: 13%',
align: 'left', align: 'center',
sortable: false, sortable: false,
}, },
// { // {
...@@ -360,24 +385,35 @@ export default defineComponent({ ...@@ -360,24 +385,35 @@ export default defineComponent({
// align: 'left', // align: 'left',
// sortable: false, // sortable: false,
// }, // },
// {
// name: 'fromTime',
// field: 'fromTime',
// required: true,
// label: i18n.global.t('listBooking.titleColumnsTable.fromTime'),
// headerStyle: 'text-align: center !important; width: 9%',
// align: 'left',
// sortable: false,
// },
// {
// name: 'toTime',
// field: 'toTime',
// required: true,
// label: i18n.global.t('listBooking.titleColumnsTable.toTime'),
// headerStyle: 'text-align: center !important; width: 9%',
// align: 'left',
// sortable: false,
// },
{ {
name: 'fromTime', name: 'time',
field: 'fromTime', field: 'time',
required: true,
label: i18n.global.t('listBooking.titleColumnsTable.fromTime'),
headerStyle: 'text-align: center !important; width: 9%',
align: 'left',
sortable: false,
},
{
name: 'toTime',
field: 'toTime',
required: true, required: true,
label: i18n.global.t('listBooking.titleColumnsTable.toTime'), label: 'Bắt đầu - Kết thúc',
headerStyle: 'text-align: center !important; width: 9%', headerStyle: 'text-align: center !important; width: 9%',
align: 'left', align: 'left',
sortable: false, sortable: false,
}, },
// { // {
// name: 'fee', // name: 'fee',
// field: 'fee', // field: 'fee',
......
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