update

parent a7d22a86
...@@ -53,7 +53,7 @@ export default defineComponent({ ...@@ -53,7 +53,7 @@ export default defineComponent({
emailRules: { type: Boolean, required: true }, emailRules: { type: Boolean, required: true },
emailAdministerRules: { type: Boolean, required: true }, emailAdministerRules: { type: Boolean, required: true },
phoneNumberAdministerRules: { type: Boolean, required: true }, phoneNumberAdministerRules: { type: Boolean, required: true },
addressRules: { type: Boolean, required: true }, // addressRules: { type: Boolean, required: true },
phoneNumberRules: { type: Boolean, required: true }, phoneNumberRules: { type: Boolean, required: true },
sexRules: { type: Boolean, required: true }, sexRules: { type: Boolean, required: true },
nationalityRules: { type: Boolean, required: true }, nationalityRules: { type: Boolean, required: true },
...@@ -136,9 +136,9 @@ export default defineComponent({ ...@@ -136,9 +136,9 @@ export default defineComponent({
const errorMessNationality = i18n.global.t( const errorMessNationality = i18n.global.t(
'artist.artistInformation.validateMessages.requireNationality' 'artist.artistInformation.validateMessages.requireNationality'
); );
const errorMessAddress = i18n.global.t( // const errorMessAddress = i18n.global.t(
'artist.artistInformation.validateMessages.requireAddress' // 'artist.artistInformation.validateMessages.requireAddress'
); // );
const errorMessFields = i18n.global.t( const errorMessFields = i18n.global.t(
'artist.artistInformation.validateMessages.requireField' 'artist.artistInformation.validateMessages.requireField'
); );
...@@ -170,7 +170,7 @@ export default defineComponent({ ...@@ -170,7 +170,7 @@ export default defineComponent({
errorMessBirthday, errorMessBirthday,
errorMessSex, errorMessSex,
errorMessNationality, errorMessNationality,
errorMessAddress, // errorMessAddress,
errorMessFields, errorMessFields,
errorMessWorks, errorMessWorks,
errorMessQualification, errorMessQualification,
......
...@@ -225,8 +225,7 @@ ...@@ -225,8 +225,7 @@
<q-select <q-select
:model-value="address" :model-value="address"
@update:model-value="$emit('update:address', $event)" @update:model-value="$emit('update:address', $event)"
:error="addressRules"
:error-message="errorMessAddress"
:options="provinceOptions" :options="provinceOptions"
option-value="name" option-value="name"
option-label="fullName" option-label="fullName"
......
...@@ -157,7 +157,7 @@ export default defineComponent({ ...@@ -157,7 +157,7 @@ export default defineComponent({
const artistNameRules = ref(false); const artistNameRules = ref(false);
const birthdayRules = ref(false); const birthdayRules = ref(false);
const emailRules = ref(false); const emailRules = ref(false);
const addressRules = ref(false); // const addressRules = ref(false);
const phoneNumberRules = ref(false); const phoneNumberRules = ref(false);
const mnBookingEmailRules = ref(false); const mnBookingEmailRules = ref(false);
const mnBookingPhoneRules = ref(false); const mnBookingPhoneRules = ref(false);
...@@ -238,14 +238,14 @@ export default defineComponent({ ...@@ -238,14 +238,14 @@ export default defineComponent({
} }
} }
); );
watch( // watch(
() => address, // () => address.value,
(value) => { // (value) => {
if (value) { // if (value) {
addressRules.value = false; // addressRules.value = false;
} // }
} // }
); // );
watch( watch(
() => phoneNumber.value, () => phoneNumber.value,
(value) => { (value) => {
...@@ -673,10 +673,6 @@ export default defineComponent({ ...@@ -673,10 +673,6 @@ export default defineComponent({
hasError = true; hasError = true;
artistNameRules.value = true; artistNameRules.value = true;
} }
if (address.value) {
hasError = true;
addressRules.value = true;
}
if (!birthday.value || !birthday.value?.trim().length) { if (!birthday.value || !birthday.value?.trim().length) {
hasError = true; hasError = true;
birthdayRules.value = true; birthdayRules.value = true;
...@@ -722,10 +718,10 @@ export default defineComponent({ ...@@ -722,10 +718,10 @@ export default defineComponent({
); );
} }
if (artistLevel.value === null) { // if (artistLevel.value === null) {
hasError = true; // hasError = true;
artistLevelRules.value = true; // artistLevelRules.value = true;
} // }
if (!fields.value) { if (!fields.value) {
hasError = true; hasError = true;
fieldRules.value = true; fieldRules.value = true;
...@@ -742,6 +738,10 @@ export default defineComponent({ ...@@ -742,6 +738,10 @@ export default defineComponent({
hasError = true; hasError = true;
workRules.value = true; workRules.value = true;
} }
// if(!address.value === null){
// hasError = true;
// addressRules.value = true;
// }
if (hasError === false) { if (hasError === false) {
void addArtist(); void addArtist();
} }
...@@ -796,7 +796,7 @@ export default defineComponent({ ...@@ -796,7 +796,7 @@ export default defineComponent({
artistCode: artistCode.value, artistCode: artistCode.value,
artistName: artistName.value, artistName: artistName.value,
// eslint-disable-next-line @typescript-eslint/restrict-plus-operands // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
birthday: birthday.value + '00:00:00', birthday: birthday.value + ' 00:00:00',
sex: sex.value, sex: sex.value,
address: address.value?.name, address: address.value?.name,
phoneNumber: phoneNumber.value, phoneNumber: phoneNumber.value,
...@@ -972,7 +972,7 @@ export default defineComponent({ ...@@ -972,7 +972,7 @@ export default defineComponent({
artistNameRules, artistNameRules,
birthdayRules, birthdayRules,
emailRules, emailRules,
addressRules, // addressRules,
phoneNumberRules, phoneNumberRules,
sexRules, sexRules,
nationalityRules, nationalityRules,
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
:artistNameRules="artistNameRules" :artistNameRules="artistNameRules"
:birthdayRules="birthdayRules" :birthdayRules="birthdayRules"
:emailRules="emailRules" :emailRules="emailRules"
:addressRules="addressRules"
:phoneNumberRules="phoneNumberRules" :phoneNumberRules="phoneNumberRules"
:sexRules="sexRules" :sexRules="sexRules"
:nationalityRules="nationalityRules" :nationalityRules="nationalityRules"
...@@ -94,7 +93,9 @@ ...@@ -94,7 +93,9 @@
@SetAvatar="setAvatar($event)" @SetAvatar="setAvatar($event)"
@deleteAvatar="deleteAvatar" @deleteAvatar="deleteAvatar"
@UpdateBirtday="UpdateBirtday($event)" @UpdateBirtday="UpdateBirtday($event)"
></PersonalInformation> ></PersonalInformation>
<!-- :addressRules="addressRules" -->
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="vabAccount"> <q-tab-panel name="vabAccount">
<VabAccount <VabAccount
......
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