From 63a44e1c14fd2fb50826db8034daf2bd6b1c4408 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Tue, 21 Jan 2025 17:52:32 +0700 Subject: [PATCH] feat: 03 => update actionText for warnings to use general translation --- src/components/upload-file/UploadFileGroup.vue | 9 +++++++++ src/pages/03_customer-management/MainPage.vue | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/components/upload-file/UploadFileGroup.vue b/src/components/upload-file/UploadFileGroup.vue index dfd2105b..ab547b58 100644 --- a/src/components/upload-file/UploadFileGroup.vue +++ b/src/components/upload-file/UploadFileGroup.vue @@ -11,6 +11,15 @@ import { dateFormat } from 'src/utils/datetime'; const isEdit = ref(false); const allMeta = ref>(); const { t } = useI18n(); +const currentId = defineModel('currentId'); +const groupList = defineModel< + { + label: string; + group: string; + value: string; + _meta?: Record; + }[] +>('groupList'); const obj = defineModel< { _meta?: Record; diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index bcbfea89..dbd22972 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -577,7 +577,7 @@ function employeeConfirmUnsave(close = true) { color: 'warning', icon: 'mdi-alert', title: t('form.warning.title'), - actionText: t('ok'), + actionText: t('general.ok'), persistent: true, message: t('form.warning.unsave'), action: () => { @@ -604,7 +604,7 @@ function customerConfirmUnsave(close = true) { color: 'warning', icon: 'mdi-alert', title: t('form.warning.title'), - actionText: t('ok'), + actionText: t('general.ok'), persistent: true, message: t('form.warning.unsave'), @@ -2196,7 +2196,7 @@ const emptyCreateDialog = ref(false); color: 'warning', icon: 'mdi-alert', title: t('dialog.title.incompleteDataEntry'), - actionText: t('ok'), + actionText: t('general.ok'), persistent: true, message: t('dialog.message.incompleteDataEntry', { tap: `${tapIsUndefined.map((v: string) => t(`customerBranch.tab.${v}`)).join(', ')}`, @@ -4088,7 +4088,7 @@ const emptyCreateDialog = ref(false); color: 'warning', icon: 'mdi-alert', title: t('dialog.title.incompleteDataEntry'), - actionText: t('ok'), + actionText: t('general.ok'), persistent: true, message: t('dialog.message.incompleteDataEntry', { tap: `${tapIsUndefined.map((v: string) => t(`customerBranch.tab.${v}`)).join(', ')}`,