From 46a7f9ca963faf197506c4dafffb0b41f8a2d0c8 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Wed, 12 Jun 2024 08:40:07 +0000 Subject: [PATCH] feat: customer employee update & drawer info --- .../02_personnel-management/InfoForm.vue | 137 ++++-- .../BasicInformation.vue | 5 +- .../FormEmployeeHealthCheck.vue | 2 +- .../FormEmployeeWorkHistory.vue | 2 +- src/components/DrawerInfo.vue | 1 + .../02_personnel-management/MainPage.vue | 2 - src/pages/03_customer-management/MainPage.vue | 395 +++++++++++++++++- 7 files changed, 473 insertions(+), 71 deletions(-) diff --git a/src/components/02_personnel-management/InfoForm.vue b/src/components/02_personnel-management/InfoForm.vue index 6df3a036..bed12736 100644 --- a/src/components/02_personnel-management/InfoForm.vue +++ b/src/components/02_personnel-management/InfoForm.vue @@ -8,6 +8,7 @@ defineProps<{ addressTitle?: string; addressTitleEN?: string; noAddress?: boolean; + noPaddingTab?: boolean; }>(); const address = defineModel('address', { default: '' }); @@ -16,53 +17,105 @@ const provinceId = defineModel('provinceId'); const districtId = defineModel('districtId'); const subDistrictId = defineModel('subDistrictId'); const zipCode = defineModel('zipCode', { default: '' }); + +const employeeTab = defineModel('employeeTab'); +const tabsList = defineModel<{ name: string; label: string }[]>('tabsList'); + diff --git a/src/components/03_customer-management/BasicInformation.vue b/src/components/03_customer-management/BasicInformation.vue index 32b3b286..ee880b3b 100644 --- a/src/components/03_customer-management/BasicInformation.vue +++ b/src/components/03_customer-management/BasicInformation.vue @@ -9,7 +9,7 @@ const employerID = defineModel('employerID'); // employee const customerBranchId = defineModel('customerBranchId'); -const employeeID = defineModel('employeeID'); +const employeeId = defineModel('employeeId'); const nrcNo = defineModel('nrcNo'); defineProps<{ @@ -85,6 +85,7 @@ onMounted(async () => {}); id="select-employer-branch" use-input input-debounce="0" + :hide-dropdown-icon="readonly" :dense="dense" :outlined="!readonly" :readonly="readonly" @@ -113,7 +114,7 @@ onMounted(async () => {}); hide-bottom-space class="col-3" :label="$t('formDialogEmployeeID')" - v-model="employeeID" + v-model="employeeId" /> { v-bind:key="index" :name="`tab${index}`" class="row col-12 items-start" - style="overflow: auto; height: 50vh" + style="overflow: auto" >
• {{ $t(`formDialogTitleHealthCheck`) }} diff --git a/src/components/03_customer-management/FormEmployeeWorkHistory.vue b/src/components/03_customer-management/FormEmployeeWorkHistory.vue index 0946d5fe..254724e7 100644 --- a/src/components/03_customer-management/FormEmployeeWorkHistory.vue +++ b/src/components/03_customer-management/FormEmployeeWorkHistory.vue @@ -107,7 +107,7 @@ onMounted(async () => { v-bind:key="index" :name="`tab${index}`" class="row col-12 items-start" - style="overflow: auto; height: 50vh" + style="overflow: auto" >
• {{ $t(`workHistory`) }}
diff --git a/src/components/DrawerInfo.vue b/src/components/DrawerInfo.vue index 553c2cfd..2b8d7e73 100644 --- a/src/components/DrawerInfo.vue +++ b/src/components/DrawerInfo.vue @@ -145,6 +145,7 @@ function reset() { style="position: relative" :class="{ dark: $q.dark.isActive }" > +
diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue index 09744bcf..dcaa7da0 100644 --- a/src/pages/02_personnel-management/MainPage.vue +++ b/src/pages/02_personnel-management/MainPage.vue @@ -726,8 +726,6 @@ watch( >