From b4c01c7c280546fbede00e5411ce5884fdea08e7 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Tue, 13 Aug 2024 08:55:49 +0000 Subject: [PATCH] refactor(02): use new toggle button --- .../02_personnel-management/FormPerson.vue | 10 ++++--- src/components/shared/PersonCard.vue | 26 ++++++++---------- .../02_personnel-management/MainPage.vue | 27 ++++++++++--------- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue index cc17a423..a620155f 100644 --- a/src/components/02_personnel-management/FormPerson.vue +++ b/src/components/02_personnel-management/FormPerson.vue @@ -13,7 +13,8 @@ import { useI18n } from 'vue-i18n'; const { locale } = useI18n(); const optionStore = useOptionStore(); -const prefixNameTh = defineModel('prefixName'); +const prefixName = defineModel('prefixName'); +const prefixNameEn = defineModel('prefixNameEn'); const firstName = defineModel('firstName'); const lastName = defineModel('lastName'); const firstNameEN = defineModel('firstNameEN'); @@ -117,7 +118,7 @@ watch( map-options hide-selected hide-bottom-space - v-model="prefixNameTh" + v-model="prefixName" input-debounce="0" option-label="label" option-value="value" @@ -190,10 +191,11 @@ watch( :dense="dense" outlined hide-bottom-space - disable + :readonly="readonly" + :disable="!readonly" class="col-1" :label="$t('formDialogInputPrefixName')" - v-model="firstName" + v-model="prefixNameEn" /> -
- + -
- {{ - !disabled ? $t('switchOnLabel') : $t('switchOffLabel') - }} -
-
+ @click="$emit('toggleStatus', disabled === false)" + /> + + {{ + !disabled ? $t('switchOnLabel') : $t('switchOffLabel') + }} +
diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue index f942210f..fb27fc8e 100644 --- a/src/pages/02_personnel-management/MainPage.vue +++ b/src/pages/02_personnel-management/MainPage.vue @@ -22,14 +22,12 @@ import PersonCard from 'components/shared/PersonCard.vue'; import StatCardComponent from 'components/StatCardComponent.vue'; import AddButton from 'components/AddButton.vue'; import TooltipComponent from 'components/TooltipComponent.vue'; -import FormDialog from 'components/FormDialog.vue'; import FormInformation from 'components/02_personnel-management/FormInformation.vue'; import FormPerson from 'components/02_personnel-management/FormPerson.vue'; import FormByType from 'components/02_personnel-management/FormByType.vue'; import DrawerInfo from 'components/DrawerInfo.vue'; import InfoForm from 'components/02_personnel-management/InfoForm.vue'; import NoData from 'components/NoData.vue'; -import ProfileUpload from 'components/ProfileUpload.vue'; import PaginationComponent from 'components/PaginationComponent.vue'; import useOptionStore from 'stores/options'; import ProfileBanner from 'components/ProfileBanner.vue'; @@ -37,6 +35,7 @@ import SideMenu from 'components/SideMenu.vue'; import ImageUploadDialog from 'components/ImageUploadDialog.vue'; import { AddressForm } from 'components/form'; import DialogForm from 'components/DialogForm.vue'; +import ToggleButton from 'src/components/button/ToggleButton.vue'; const { locale, t } = useI18n(); const $q = useQuasar(); @@ -1383,17 +1382,13 @@ watch( -
- + + + {{ + props.row.status !== 'INACTIVE' + ? $t('switchOnLabel') + : $t('switchOffLabel') + }} +