Commit 89dbfc3b authored by Tình Trương's avatar Tình Trương

update

parent 6c19af96
......@@ -64,6 +64,14 @@ export type ArtistInfoType = {
products: ProductType[];
schedules: SchedulesType[];
stories: StoriesType[];
mnName: string | null;
mnPhone: string | null;
mnEmail: string | null;
mnBookingEmail: string | null;
mnBookingPhone: string | null;
mnFbmess: string | null;
mnIns: string | null;
mnWhatsapp: string | null;
};
export type FieldType = {
......
......@@ -367,7 +367,7 @@
>
<q-tooltip>Xóa story</q-tooltip>
</q-icon>
<q-icon
<!-- <q-icon
v-if="stories.length"
style="
position: absolute;
......@@ -379,7 +379,7 @@
name="mdi-pencil-circle"
@click="updateStory"
><q-tooltip>Cập nhập story</q-tooltip>
</q-icon>
</q-icon> -->
</div>
</q-carousel-slide>
</q-carousel>
......
......@@ -5,6 +5,14 @@ import moment from 'moment';
import { FieldType, NationalityType } from 'src/assets/type';
export default defineComponent({
props: {
mnBookingPhone: { type: String, required: true },
mnBookingEmail: { type: String, required: true },
mnFbmess: { type: String, required: true },
mnIns: { type: String, required: true },
mnWhatsapp: { type: String, required: true },
mnName: { type: String, required: true },
mnPhone: { type: String, required: true },
mnEmail: { type: String, required: true },
hidden_img: { type: Boolean, required: true },
id: { type: Number, required: true },
artistCode: { type: String, required: true },
......@@ -52,8 +60,10 @@ export default defineComponent({
artistLevelRules: { type: Boolean, required: true },
errorMessPhoneNumber: { type: String, required: true },
errorMessEmail: { type: String, required: true },
errorMessPhoneNumberAdminister: { type: String, required: true },
errorMessEmailAdminister: { type: String, required: true },
errorMessmnBookingPhone: { type: String, required: true },
errorMessmnBookingEmail: { type: String, required: true },
mnBookingEmailRules: { type: Boolean, required: true },
mnBookingPhoneRules: { type: Boolean, required: true },
},
components: {
UploadImage,
......@@ -179,6 +189,14 @@ export default defineComponent({
'update:artistLevel',
'update:hidden_img',
'update:status',
'update:mnName',
'update:mnPhone',
'update:mnEmail',
'update:mnBookingPhone',
'update:mnBookingEmail',
'update:mnFbmess',
'update:mnIns',
'update:mnWhatsapp',
'addNewArtist',
'SetAvatar',
'deleteAvatar',
......
......@@ -447,10 +447,15 @@
<div class="row flex-center">
<div class="col-3 text-weight-medium">
{{ $t('artist.artistInformation.titleDataField.userAdminister') }}
<span style="color: red">*</span>
</div>
<div class="col-8">
<q-input class="q-my-sm" outlined dense hide-bottom-space></q-input>
<q-input
:model-value="mnName"
@update:model-value="$emit('update:mnName', $event)"
class="q-my-sm"
outlined
dense
></q-input>
</div>
</div>
<div class="row flex-center">
......@@ -458,37 +463,29 @@
{{
$t('artist.artistInformation.titleDataField.phoneNumberAdminister')
}}
<span style="color: red">*</span>
</div>
<div class="col-8">
<q-input
:model-value="phoneNumberAdminister"
@update:model-value="$emit('update:phoneNumberAdminister', $event)"
:error="phoneNumberAdministerRules"
:error-message="errorMessPhoneNumberAdminister"
:model-value="mnPhone"
@update:model-value="$emit('update:mnPhone', $event)"
mask="##########"
class="q-my-sm"
outlined
dense
hide-bottom-space
></q-input>
</div>
</div>
<div class="row flex-center">
<div class="col-3 text-weight-medium">
{{ $t('artist.artistInformation.titleDataField.emailAdminister') }}
<span style="color: red">*</span>
</div>
<div class="col-8">
<q-input
:model-value="emailAdminister"
@update:model-value="$emit('update:emailAdminister', $event)"
:error="emailAdministerRules"
:error-message="errorMessEmailAdminister"
:model-value="mnEmail"
@update:model-value="$emit('update:mnEmail', $event)"
outlined
class="q-my-sm"
dense
hide-bottom-space
></q-input>
</div>
</div>
......@@ -509,8 +506,12 @@
</div>
<div class="col-8">
<q-input
:model-value="mnBookingPhone"
@update:model-value="$emit('update:mnBookingPhone', $event)"
mask="##########"
class="q-my-sm"
:error="mnBookingPhoneRules"
:error-message="errorMessmnBookingPhone"
outlined
dense
hide-bottom-space
......@@ -523,7 +524,16 @@
<span style="color: red">*</span>
</div>
<div class="col-8">
<q-input outlined class="q-my-sm" dense hide-bottom-space></q-input>
<q-input
:model-value="mnBookingEmail"
@update:model-value="$emit('update:mnBookingEmail', $event)"
:error="mnBookingEmailRules"
:error-message="errorMessmnBookingEmail"
outlined
class="q-my-sm"
dense
hide-bottom-space
></q-input>
</div>
</div>
<div class="row flex-center" v-if="check_infoBooking">
......@@ -533,7 +543,13 @@
}}
</div>
<div class="col-8">
<q-input outlined class="q-my-sm" dense></q-input>
<q-input
:model-value="mnFbmess"
@update:model-value="$emit('update:mnFbmess', $event)"
outlined
class="q-my-sm"
dense
></q-input>
</div>
</div>
<div class="row flex-center" v-if="check_infoBooking">
......@@ -541,7 +557,13 @@
{{ $t('artist.artistInformation.titleDataField.instagramBooking') }}
</div>
<div class="col-8">
<q-input outlined class="q-my-sm" dense></q-input>
<q-input
:model-value="mnIns"
@update:model-value="$emit('update:mnIns', $event)"
outlined
class="q-my-sm"
dense
></q-input>
</div>
</div>
<div class="row flex-center" v-if="check_infoBooking">
......@@ -549,7 +571,13 @@
{{ $t('artist.artistInformation.titleDataField.whatsappBooking') }}
</div>
<div class="col-8">
<q-input outlined class="q-my-sm" dense></q-input>
<q-input
:model-value="mnWhatsapp"
@update:model-value="$emit('update:mnWhatsapp', $event)"
outlined
class="q-my-sm"
dense
></q-input>
</div>
</div>
</div>
......
......@@ -555,8 +555,8 @@ export default {
action: 'Chức năng',
},
statusLabel: {
active: 'Hiển thị',
inactive: 'Ẩn',
active: 'Sản phẩm nổi bật',
inactive: 'Sản phẩm khác',
},
},
vabAccount: {
......
......@@ -48,17 +48,25 @@
v-model:artist-level="artistLevel"
v-model:phone-number="phoneNumber"
v-model:email="email"
v-model:phone-number-administer="phoneNumberAdminister"
v-model:email-administer="emailAdminister"
v-model:facebook="facebook"
v-model:facebook-message="facebookMessage"
v-model:instagram="instagram"
v-model:whatsapp="whatsapp"
v-model:hidden_img="hidden_img"
v-model:mnName="mnName"
v-model:mnPhone="mnPhone"
v-model:mnEmail="mnEmail"
v-model:mn-booking-phone="mnBookingPhone"
v-model:mn-booking-email="mnBookingEmail"
v-model:mn-fbmess="mnFbmess"
v-model:mn-ins="mnIns"
v-model:mn-whatsapp="mnWhatsapp"
:errorMessmnBookingPhone="errorMessmnBookingPhone"
:errorMessmnBookingEmail="errorMessmnBookingEmail"
:mnBookingEmailRules="mnBookingEmailRules"
:mnBookingPhoneRules="mnBookingPhoneRules"
:errorMessPhoneNumber="errorMessPhoneNumber"
:errorMessEmail="errorMessEmail"
:errorMessPhoneNumberAdminister="errorMessPhoneNumberAdminister"
:errorMessEmailAdminister="errorMessEmailAdminister"
:artistCodeRules="artistCodeRules"
:fullNameRules="fullNameRules"
:artistNameRules="artistNameRules"
......@@ -66,8 +74,6 @@
:emailRules="emailRules"
:addressRules="addressRules"
:phoneNumberRules="phoneNumberRules"
:emailAdministerRules="emailAdministerRules"
:phoneNumberAdministerRules="phoneNumberAdministerRules"
:sexRules="sexRules"
:nationalityRules="nationalityRules"
:fieldRules="fieldRules"
......
......@@ -103,6 +103,9 @@ export default defineComponent({
numIndex: 1,
status: 1,
});
const mnName: Ref<string | null> = ref(null);
const mnPhone: Ref<string | null> = ref(null);
const mnEmail: Ref<string | null> = ref(null);
const qualification: Ref<QualificationType | null> = ref(null);
const artistLevel: Ref<ArtistLevelType | null> = ref(null);
const address: Ref<string | null> = ref(null);
......@@ -112,13 +115,16 @@ export default defineComponent({
const works: Ref<WorkType[]> = ref([]);
const phoneNumber: Ref<string | null> = ref(null);
const email: Ref<string | null> = ref(null);
const emailAdminister: Ref<string | null> = ref(null);
const phoneNumberAdminister: Ref<string | null> = ref(null);
const facebook: Ref<string | null> = ref(null);
const facebookMessage: Ref<string | null | undefined> = ref();
const instagram: Ref<string | null | undefined> = ref();
const whatsapp: Ref<string | null | undefined> = ref();
const hidden_img = ref(false);
const mnBookingEmail: Ref<string | null> = ref(null);
const mnBookingPhone: Ref<string | null> = ref(null);
const mnFbmess: Ref<string | null> = ref(null);
const mnIns: Ref<string | null> = ref(null);
const mnWhatsapp: Ref<string | null> = ref(null);
// state sử dụng trong tab vab account
const banners: Ref<BannerType[]> = ref([]);
......@@ -147,8 +153,8 @@ export default defineComponent({
const emailRules = ref(false);
const addressRules = ref(false);
const phoneNumberRules = ref(false);
const phoneNumberAdministerRules = ref(false);
const emailAdministerRules = ref(false);
const mnBookingEmailRules = ref(false);
const mnBookingPhoneRules = ref(false);
const sexRules = ref(false);
const nationalityRules = ref(false);
const fieldRules = ref(false);
......@@ -163,12 +169,12 @@ export default defineComponent({
'artist.artistInformation.validateMessages.requirePhoneNumber'
)
);
const errorMessEmailAdminister = ref(
const errorMessmnBookingEmail = ref(
i18n.global.t(
'artist.artistInformation.validateMessages.requireEmailAdminister'
)
);
const errorMessPhoneNumberAdminister = ref(
const errorMessmnBookingPhone = ref(
i18n.global.t(
'artist.artistInformation.validateMessages.requirePhoneNumberAdminister'
)
......@@ -246,18 +252,18 @@ export default defineComponent({
}
);
watch(
() => phoneNumberAdminister.value,
() => mnBookingPhone.value,
(value) => {
if (value) {
phoneNumberAdministerRules.value = false;
mnBookingPhoneRules.value = false;
}
}
);
watch(
() => emailAdminister.value,
() => mnBookingEmail.value,
(value) => {
if (value) {
emailAdministerRules.value = false;
mnBookingEmailRules.value = false;
}
}
);
......@@ -337,12 +343,18 @@ export default defineComponent({
status.value = ArtistInformation.status;
phoneNumber.value = ArtistInformation.phoneNumber;
email.value = ArtistInformation.email;
// phoneNumberAdminister.value = ArtistInformation.phoneNumberAdminister;
// emailAdminister.value = ArtistInformation.emailAdminister;
facebook.value = ArtistInformation.facebook;
facebookMessage.value = ArtistInformation.facebookMessage;
instagram.value = ArtistInformation.instagram;
whatsapp.value = ArtistInformation.whatsapp;
mnName.value = ArtistInformation.mnName;
mnPhone.value = ArtistInformation.mnPhone;
mnEmail.value = ArtistInformation.mnEmail;
mnBookingPhone.value = ArtistInformation.mnBookingPhone;
mnBookingEmail.value = ArtistInformation.mnBookingEmail;
mnFbmess.value = ArtistInformation.mnFbmess;
mnIns.value = ArtistInformation.mnIns;
mnWhatsapp.value = ArtistInformation.mnWhatsapp;
nationality.value = ArtistInformation.nationality;
qualification.value = ArtistInformation.qualification;
works.value = ArtistInformation.works;
......@@ -715,23 +727,20 @@ export default defineComponent({
);
}
// if (
// !phoneNumberAdminister.value ||
// !phoneNumberAdminister.value?.trim().length
// ) {
// hasError = true;
// phoneNumberAdministerRules.value = true;
// errorMessPhoneNumberAdminister.value = i18n.global.t(
// 'artist.artistInformation.validateMessages.requirePhoneNumberAdminister'
// );
// }
// if (!emailAdminister.value || !emailAdminister.value?.trim().length) {
// hasError = true;
// emailAdministerRules.value = true;
// errorMessEmailAdminister.value = i18n.global.t(
// 'artist.artistInformation.validateMessages.requireEmailAdminister'
// );
// }
if (!mnBookingPhone.value || !mnBookingPhone.value?.trim().length) {
hasError = true;
mnBookingPhoneRules.value = true;
errorMessmnBookingPhone.value = i18n.global.t(
'artist.artistInformation.validateMessages.requirePhoneNumberAdminister'
);
}
if (!mnBookingEmail.value || !mnBookingEmail.value?.trim().length) {
hasError = true;
mnBookingEmailRules.value = true;
errorMessmnBookingEmail.value = i18n.global.t(
'artist.artistInformation.validateMessages.requireEmailAdminister'
);
}
if (artistLevel.value === null) {
hasError = true;
......@@ -825,8 +834,6 @@ export default defineComponent({
address: address.value,
phoneNumber: phoneNumber.value,
email: email.value,
// phoneNumberAdminister: phoneNumberAdminister.value,
// emailAdminister: emailAdminister.value,
facebook: facebook.value,
facebookMessage: facebookMessage.value,
instagram: instagram.value,
......@@ -845,6 +852,14 @@ export default defineComponent({
schedules,
stories: stories.value,
products: products.value,
mnName: mnName.value,
mnPhone: mnPhone.value,
mnEmail: mnEmail.value,
mnBookingPhone: mnBookingPhone.value,
mnBookingEmail: mnBookingEmail.value,
mnFbmess: mnFbmess.value,
mnIns: mnIns.value,
mnWhatsapp: mnWhatsapp.value,
},
})) as AxiosResponse<BaseResponseBody<unknown>>;
if (response.data.error.code === config.API_RES_CODE.OK.code) {
......@@ -909,6 +924,9 @@ export default defineComponent({
facebookMessage,
instagram,
whatsapp,
mnName,
mnPhone,
mnEmail,
socialEmbedded,
sexOptions,
fieldOptions,
......@@ -984,12 +1002,15 @@ export default defineComponent({
errorMessEmail,
errorMessPhoneNumber,
confirmChangeIsDefault,
phoneNumberAdminister,
phoneNumberAdministerRules,
emailAdminister,
emailAdministerRules,
errorMessEmailAdminister,
errorMessPhoneNumberAdminister,
mnBookingPhone,
mnBookingEmail,
mnFbmess,
mnIns,
mnWhatsapp,
mnBookingPhoneRules,
errorMessmnBookingPhone,
mnBookingEmailRules,
errorMessmnBookingEmail,
};
},
});
......@@ -161,6 +161,14 @@
v-model:facebook-message="facebookMessage"
v-model:instagram="instagram"
v-model:whatsapp="whatsapp"
v-model:mnName="mnName"
v-model:mnPhone="mnPhone"
v-model:mnEmail="mnEmail"
v-model:mn-booking-phone="mnBookingPhone"
v-model:mn-booking-email="mnBookingEmail"
v-model:mn-fbmess="mnFbmess"
v-model:mn-ins="mnIns"
v-model:mn-whatsapp="mnWhatsapp"
:sex-options="sexOptions"
:field-options="fieldOptions"
:nationality-options="nationalityOptions"
......@@ -335,6 +343,14 @@ export default defineComponent({
const facebookMessage: Ref<string | undefined> = ref();
const instagram: Ref<string | undefined> = ref();
const whatsapp: Ref<string | undefined> = ref();
const mnName: Ref<string | null> = ref(null);
const mnPhone: Ref<string | null> = ref(null);
const mnEmail: Ref<string | null> = ref(null);
const mnBookingPhone: Ref<string | null> = ref(null);
const mnBookingEmail: Ref<string | null> = ref(null);
const mnFbmess: Ref<string | null> = ref(null);
const mnIns: Ref<string | null> = ref(null);
const mnWhatsapp: Ref<string | null> = ref(null);
const getListArtists = async () => {
try {
......@@ -483,6 +499,14 @@ export default defineComponent({
facebookMessage,
instagram,
whatsapp,
mnName,
mnPhone,
mnEmail,
mnBookingPhone,
mnBookingEmail,
mnFbmess,
mnIns,
mnWhatsapp,
sexOptions,
totalPage,
changePageSize,
......
......@@ -106,6 +106,10 @@ export default defineComponent({
numIndex: 1,
status: 1,
});
const mnName: Ref<string | null> = ref(null);
const mnPhone: Ref<string | null> = ref(null);
const mnEmail: Ref<string | null> = ref(null);
const qualification: Ref<QualificationType | null> = ref(null);
const artistLevel: Ref<ArtistLevelType | null> = ref(null);
const address: Ref<string | null> = ref(null);
......@@ -114,8 +118,11 @@ export default defineComponent({
const works: Ref<WorkType[]> = ref([]);
const phoneNumber: Ref<string | null> = ref(null);
const email: Ref<string | null> = ref(null);
const emailAdminister: Ref<string | null> = ref(null);
const phoneNumberAdminister: Ref<string | null> = ref(null);
const mnBookingEmail: Ref<string | null> = ref(null);
const mnBookingPhone: Ref<string | null> = ref(null);
const mnFbmess: Ref<string | null> = ref(null);
const mnIns: Ref<string | null> = ref(null);
const mnWhatsapp: Ref<string | null> = ref(null);
const facebook: Ref<string | null> = ref(null);
const facebookMessage: Ref<string | null | undefined> = ref();
const instagram: Ref<string | null | undefined> = ref();
......@@ -149,8 +156,8 @@ export default defineComponent({
const emailRules = ref(false);
const addressRules = ref(false);
const phoneNumberRules = ref(false);
const phoneNumberAdministerRules = ref(false);
const emailAdministerRules = ref(false);
const mnBookingEmailRules = ref(false);
const mnBookingPhoneRules = ref(false);
const sexRules = ref(false);
const nationalityRules = ref(false);
const fieldRules = ref(false);
......@@ -165,12 +172,12 @@ export default defineComponent({
'artist.artistInformation.validateMessages.requirePhoneNumber'
)
);
const errorMessEmailAdminister = ref(
const errorMessmnBookingEmail = ref(
i18n.global.t(
'artist.artistInformation.validateMessages.requireEmailAdminister'
)
);
const errorMessPhoneNumberAdminister = ref(
const errorMessmnBookingPhone = ref(
i18n.global.t(
'artist.artistInformation.validateMessages.requirePhoneNumberAdminister'
)
......@@ -244,18 +251,18 @@ export default defineComponent({
}
);
watch(
() => phoneNumberAdminister.value,
() => mnBookingPhone.value,
(value) => {
if (value) {
phoneNumberAdministerRules.value = false;
mnBookingPhoneRules.value = false;
}
}
);
watch(
() => emailAdminister.value,
() => mnBookingEmail.value,
(value) => {
if (value) {
emailAdministerRules.value = false;
mnBookingEmailRules.value = false;
}
}
);
......@@ -647,23 +654,20 @@ export default defineComponent({
);
}
// if (
// !phoneNumberAdminister.value ||
// !phoneNumberAdminister.value?.trim().length
// ) {
// hasError = true;
// phoneNumberAdministerRules.value = true;
// errorMessPhoneNumberAdminister.value = i18n.global.t(
// 'artist.artistInformation.validateMessages.requirePhoneNumberAdminister'
// );
// }
// if (!emailAdminister.value || !emailAdminister.value?.trim().length) {
// hasError = true;
// emailAdministerRules.value = true;
// errorMessEmailAdminister.value = i18n.global.t(
// 'artist.artistInformation.validateMessages.requireEmailAdminister'
// );
// }
if (!mnBookingPhone.value || !mnBookingPhone.value?.trim().length) {
hasError = true;
mnBookingPhoneRules.value = true;
errorMessmnBookingPhone.value = i18n.global.t(
'artist.artistInformation.validateMessages.requirePhoneNumberAdminister'
);
}
if (!mnBookingEmail.value || !mnBookingEmail.value?.trim().length) {
hasError = true;
mnBookingEmailRules.value = true;
errorMessmnBookingEmail.value = i18n.global.t(
'artist.artistInformation.validateMessages.requireEmailAdminister'
);
}
if (artistLevel.value === null) {
hasError = true;
......@@ -741,8 +745,6 @@ export default defineComponent({
address: address.value,
phoneNumber: phoneNumber.value,
email: email.value,
// phoneNumberAdminister: phoneNumberAdminister.value,
// emailAdminister: emailAdminister.value,
facebook: facebook.value,
facebookMessage: facebookMessage.value,
instagram: instagram.value,
......@@ -762,6 +764,14 @@ export default defineComponent({
schedules,
stories: stories.value,
products: products.value,
mnName: mnName.value,
mnPhone: mnPhone.value,
mnEmail: mnEmail.value,
mnBookingPhone: mnBookingPhone.value,
mnBookingEmail: mnBookingEmail.value,
mnFbmess: mnFbmess.value,
mnIns: mnIns.value,
mnWhatsapp: mnWhatsapp.value,
},
})) as AxiosResponse<BaseResponseBody<unknown>>;
if (response.data.error.code === config.API_RES_CODE.OK.code) {
......@@ -822,6 +832,18 @@ export default defineComponent({
facebookMessage,
instagram,
whatsapp,
mnName,
mnPhone,
mnEmail,
mnBookingPhone,
mnBookingEmail,
mnFbmess,
mnIns,
mnWhatsapp,
mnBookingPhoneRules,
errorMessmnBookingPhone,
mnBookingEmailRules,
errorMessmnBookingEmail,
socialEmbedded,
sexOptions,
fieldOptions,
......@@ -897,12 +919,6 @@ export default defineComponent({
errorMessEmail,
errorMessPhoneNumber,
confirmChangeIsDefault,
phoneNumberAdminister,
phoneNumberAdministerRules,
emailAdminister,
emailAdministerRules,
errorMessEmailAdminister,
errorMessPhoneNumberAdminister,
};
},
});
......@@ -48,17 +48,25 @@
v-model:artist-level="artistLevel"
v-model:phone-number="phoneNumber"
v-model:email="email"
v-model:phone-number-administer="phoneNumberAdminister"
v-model:email-administer="emailAdminister"
v-model:facebook="facebook"
v-model:facebook-message="facebookMessage"
v-model:instagram="instagram"
v-model:whatsapp="whatsapp"
v-model:hidden_img="hidden_img"
v-model:mnName="mnName"
v-model:mnPhone="mnPhone"
v-model:mnEmail="mnEmail"
v-model:mn-booking-phone="mnBookingPhone"
v-model:mn-booking-email="mnBookingEmail"
v-model:mn-fbmess="mnFbmess"
v-model:mn-ins="mnIns"
v-model:mn-whatsapp="mnWhatsapp"
:errorMessmnBookingPhone="errorMessmnBookingPhone"
:errorMessmnBookingEmail="errorMessmnBookingEmail"
:mnBookingEmailRules="mnBookingEmailRules"
:mnBookingPhoneRules="mnBookingPhoneRules"
:errorMessPhoneNumber="errorMessPhoneNumber"
:errorMessEmail="errorMessEmail"
:errorMessPhoneNumberAdminister="errorMessPhoneNumberAdminister"
:errorMessEmailAdminister="errorMessEmailAdminister"
:artistCodeRules="artistCodeRules"
:fullNameRules="fullNameRules"
:artistNameRules="artistNameRules"
......@@ -66,8 +74,6 @@
:emailRules="emailRules"
:addressRules="addressRules"
:phoneNumberRules="phoneNumberRules"
:emailAdministerRules="emailAdministerRules"
:phoneNumberAdministerRules="phoneNumberAdministerRules"
:sexRules="sexRules"
:nationalityRules="nationalityRules"
:fieldRules="fieldRules"
......
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