verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 71 Releases Wiki Activity

7226-testToMaster_2416 #303

Merged
alexm merged 78 commits from 7226-testToMaster_2416 into master 2024-04-18 05:41:11 +00:00
Conversation 0 Commits 78 Files Changed 48 +11 -11
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83bf8183f0 - Show all commits

4
src/components/FormModel.vue
View File

@ -101,8 +101,7 @@ onMounted(async () => {
}); });
onBeforeRouteLeave((to, from, next) => { onBeforeRouteLeave((to, from, next) => {
if (!hasChanges.value) next(); if (hasChanges.value)
quasar.dialog({ quasar.dialog({
component: VnConfirm, component: VnConfirm,
componentProps: { componentProps: {
@ -111,6 +110,7 @@ onBeforeRouteLeave((to, from, next) => {
promise: () => next(), promise: () => next(),
}, },
}); });
else next();
}); });
onUnmounted(() => { onUnmounted(() => {

2
src/components/common/VnCurrency.vue
View File

@ -5,7 +5,7 @@ import { useCapitalize } from 'src/composables/useCapitalize';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
const props = defineProps({ const props = defineProps({
modelValue: { type: String, default: '' }, modelValue: { type: [String, Number], default: '' },
}); });
const { t } = useI18n(); const { t } = useI18n();