Skip to content

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

update

parent e8799d8b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 782 additions and 169 deletions
src/assets/configurations.example.ts
View file @ e663444e
......@@ -170,4 +170,11 @@ export enum API_PATHS {
// xóa công việc
workDelete = 'work/delete',
// danh sách ngân hàng
listBank = 'common/bank',
// cập nhật đặt cọc
depositUpdate = 'deposit/update'
}
src/assets/type.ts
View file @ e663444e
......@@ -314,7 +314,7 @@ export type Contract = {
artistFullName: string;
field: string;
fieldId: number;
id: number
id: number;
};
export type ArtistOwnerAdd = {
......@@ -531,7 +531,7 @@ export type ListBooking = {
favoriteScore: number;
performStatus: number;
fee: string;
bookingRandomCode:string
bookingRandomCode: string;
};
export type ListArrayArtist = {
......@@ -849,3 +849,35 @@ export type AddConfigHotProduct = {
imageUrl: string;
salientStatus: number;
};
export type formality = {
code: null;
id: number;
logo: null;
name: string;
numIndex: number;
status: number;
};
export type dataIteam = {
amountMoney: number;
depositDate: string;
id: number;
content: string;
image: string;
moneyDepositDto: string;
accountNumber: number;
bankId: number;
status: number;
accountName: string;
bankDto: listBank;
artistBooking: ListBooking;
formality: formality[];
};
export type listBank = {
code: string;
id: number;
name: string;
status: number;
};
src/components/artist-information/AddHotProduct/AddHotProductDialog.ts
View file @ e663444e
......@@ -37,7 +37,7 @@ export default defineComponent({
{ id: 2, name: 'Sản phẩm nổi bật' },
]);
const uploadAvatar = (value: FileList) => {
console.log(value, 'value');
dialogCrop.value = true;
imageCrop.value = URL.createObjectURL(value[0]);
......
src/components/detailBooking/index.vue
View file @ e663444e
......@@ -3,8 +3,9 @@
persistent
:model-value="showDialog"
@update:model-value="$emit('update:showDialog', $event)"
>
<q-card style="min-width: 56rem" bordered>
<q-card style="min-width: 60rem" bordered>
<q-form greedy>
<q-card-section>
<q-item>
......@@ -71,59 +72,64 @@
<div class="col-4 fs-14 color">
{{ $t('listBooking.titleColumnsTable.status') }}:
</div>
<div class="col-8 fs-14">
<div class="col-8 fs-14">
<q-chip
size="sm"
color="secondary"
v-if="detailInfoBooking.status === 0"
>Chờ nhận</q-chip
>Chưa hoàn thành</q-chip
>
<q-chip
size="sm"
color="info"
v-else-if="detailInfoBooking.status === 1"
>Đã nhận</q-chip
>Đã hoàn thành</q-chip
>
<q-chip size="sm" color="warning" v-else>Từ chối</q-chip>
</div>
<div class="col-4 fs-14 color">
{{ $t('listBooking.titleColumnsTable.performStatus') }}:
</div>
<div class="col-8 fs-14">
<q-chip
size="sm"
color="secondary"
v-if="detailInfoBooking.performStatus === 0"
>Chờ nhận</q-chip
color="warning"
v-else-if="detailInfoBooking.status === 2"
>Đã hủy</q-chip
>
<q-chip
size="sm"
color="info"
v-else-if="detailInfoBooking.performStatus === 1"
>Đã thực hiện</q-chip
color="warning"
v-else-if="detailInfoBooking.status === 3"
>Hết hạn</q-chip
>
<q-chip
size="sm"
color="warning"
v-else-if="detailInfoBooking.performStatus === 2"
>Chưa thực hiện</q-chip
v-else-if="detailInfoBooking.status === 4"
>Chờ hủy</q-chip
>
</div>
<div class="col-4 fs-14 color">
{{ $t('listBooking.titleColumnsTable.performStatus') }}:
</div>
<div class="col-8 fs-14">
<q-chip
size="sm"
color="warning"
v-else-if="detailInfoBooking.performStatus === 3"
>Hoãn lịch</q-chip
color="secondary"
v-if="detailInfoBooking.performStatus === 0"
>Chưa xác nhận</q-chip
>
<q-chip
size="sm"
color="warning"
v-else-if="detailInfoBooking.performStatus === 4"
>Hủy lịch</q-chip
>
<q-chip size="sm" color="secondary" v-else
>Thay đổi lịch</q-chip
color="info"
v-else-if="detailInfoBooking.performStatus === 1"
>Đã xác nhận</q-chip
>
<q-chip size="sm" color="warning" v-else>Từ chối</q-chip>
</div>
<div class="col-4 fs-14 color">
......@@ -133,11 +139,11 @@
</div>
</div>
<!-- <v-row>
<v-row>
<v-col>
<tableDeposit :id="detailInfoBooking.id"></tableDeposit>
</v-col>
</v-row> -->
</v-row>
</q-card-section>
<q-separator />
<q-card-actions align="right">
......@@ -157,10 +163,10 @@
<script lang="ts">
import { defineComponent, PropType, watch } from 'vue';
import { ListBooking } from 'src/assets/type';
// import tableDeposit from '../../components/detailBooking/tableDeposit/index.vue';
import tableDeposit from '../../components/detailBooking/tableDeposit/index.vue';
export default defineComponent({
components: {
// tableDeposit,
tableDeposit,
},
props: {
showDialog: {
......
src/components/detailBooking/tableDeposit/add.vue
View file @ e663444e
<template>
<q-dialog persistent :model-value="showDialog">
<q-dialog
persistent
:model-value="showDialog"
@submit.prevent="$emit('click:CloseBtn')"
>
<q-card style="min-width: 900px" bordered>
<q-form greedy>
<q-card-section>
......@@ -82,39 +86,76 @@
</div>
</div>
</div>
<div class="row flex-center" style="padding-top: 10px">
<div class="col-3 text-weight-medium">
<div>Hình thức đặt cọc</div>
<div class="row" style="padding-top: 10px">
<div class="col-6">
<q-input
emit-value
label="Tên chủ thẻ"
type="text"
class="q-ma-sm"
outlined
hide-bottom-space
clearable
dense
></q-input>
</div>
<div class="col-6">
<q-select
emit-value
map-options
label="Tên ngân hàng"
:options="depositOptions"
option-value="id"
option-label="name"
type="text"
class="q-my-sm"
class="q-ma-sm"
outlined
hide-bottom-space
clearable
dense
></q-select>
</div>
</div>
<div class="row flex-center">
<div class="col-3 text-weight-medium">
<div>Thời gian đặt cọc:</div>
<div class="col-6">
<q-input
emit-value
label="Số tiền đặt cọc"
type="text"
class="q-ma-sm"
outlined
hide-bottom-space
clearable
dense
></q-input>
</div>
<div class="col-6">
<q-select
emit-value
map-options
label="Hình thức đặt cọc"
:options="depositOptions"
option-value="id"
option-label="name"
type="text"
class="q-ma-sm"
outlined
hide-bottom-space
clearable
dense
></q-select>
</div>
<div class="col-6">
<q-input
:model-value="birthday"
@update:model-value="$emit('update:birthday', $event)"
class="q-my-sm"
class="q-ma-sm"
outlined
@click="openDialog = true"
dense
label="Thời gian đặt cọc:"
hide-bottom-space
>
<template v-slot:default>
......@@ -139,17 +180,13 @@
</template>
</q-input>
</div>
</div>
<div class="row flex-center">
<div class="col-3 text-weight-medium">
<div>Số tiền đặt cọc:</div>
</div>
<div class="col-6">
<q-input
type="text"
class="q-my-sm"
class="q-ma-sm"
outlined
label="Số tiền đặt cọc:"
hide-bottom-space
clearable
dense
......
src/components/detailBooking/tableDeposit/update.vue 0 → 100644
View file @ e663444e
This diff is collapsed.
src/css/app.scss
View file @ e663444e
......@@ -2,6 +2,7 @@
.sticky-header-table {
// / height or max-height is important /
max-height: calc(100vh - 13.5rem);
// max-width: 100vw;
.q-table__top,
.q-table__bottom,
......
src/pages/cau-hinh-doi-tac-truyen-thong/index.vue
View file @ e663444e
<template>
<div class="row q-col-gutter-sm flex-center q-mt-sm">
<div class="col-auto text-h6 text-weight-regular flex flex-center q-mr-md">
{{ $t('configPartner.title') }} 123
{{ $t('configPartner.title') }}
<q-separator vertical spaced />
</div>
<q-space></q-space>
......
src/pages/danh-sach-booking/index.vue
View file @ e663444e
......@@ -381,7 +381,7 @@ export default defineComponent({
const ListStatusBooking = ref([
{ id: 0, name: 'Chưa hoàn thành', color: 'secondary' },
{ id: 1, name: 'Đã hoàn thành', color: 'info' },
{ id: 2, name: 'Đã hủy', color: 'warning' },
{ id: 2, name: 'Đã hủy', color: 'error' },
{ id: 3, name: 'Hết hạn', color: 'warning' },
{ id: 4, name: 'Chờ hủy', color: 'warning' },
]);
......
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