Merge branch 'master' into Hotfix-RouteClient
gitea/salix-front/pipeline/pr-master This commit looks good
Details
gitea/salix-front/pipeline/pr-master This commit looks good
Details
This commit is contained in:
commit
d8234ba141
|
@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
|
|||
<VnInput
|
||||
v-model="model"
|
||||
ref="inputRef"
|
||||
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
|
||||
@keydown.tab="$refs.inputRef.vnInputRef.blur()"
|
||||
@blur="model = useAccountShortToStandard(model) ?? model"
|
||||
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
@ -232,7 +232,7 @@ fr:
|
|||
pt: Portugais
|
||||
pt:
|
||||
Send SMS: Enviar SMS
|
||||
CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
|
||||
CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
|
||||
Language: Linguagem
|
||||
Phone: Móvel
|
||||
Subject: Assunto
|
||||
|
|
|
@ -101,7 +101,7 @@ const onNextStep = async () => {
|
|||
t('basicData.negativesConfirmMessage'),
|
||||
submitWithNegatives,
|
||||
);
|
||||
else submit();
|
||||
else await submit();
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
@ -130,8 +130,21 @@ const onSubmit = async () => {
|
|||
|
||||
const deleteEvent = async () => {
|
||||
if (!props.event) return;
|
||||
const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
|
||||
await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
|
||||
if (!props.event.created) {
|
||||
const filter = {
|
||||
where: {
|
||||
dated: dated.value,
|
||||
},
|
||||
};
|
||||
const params = { filter: JSON.stringify(filter) };
|
||||
const { data: res } = await axios.get(`Zones/${route.params.id}/exclusions`, {
|
||||
params,
|
||||
});
|
||||
if (res) await axios.delete(`Zones/${route.params.id}/exclusions/${res[0].id}`);
|
||||
} else {
|
||||
const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
|
||||
await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
|
||||
}
|
||||
await refetchEvents();
|
||||
};
|
||||
|
||||
|
@ -143,7 +156,7 @@ const refetchEvents = async () => {
|
|||
};
|
||||
|
||||
onMounted(() => {
|
||||
if (props.event) {
|
||||
if (props.event && props.event.dated) {
|
||||
dated.value = props.event?.dated;
|
||||
excludeType.value =
|
||||
props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';
|
||||
|
|
Loading…
Reference in New Issue