From 818a03cf9f28a915408ad61ad712c7d46053ac38 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Fri, 30 Aug 2024 14:36:48 +0700 Subject: [PATCH 001/274] fix(02): clear form employee --- src/pages/02_personnel-management/MainPage.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue index 31d220b8..21dc4e74 100644 --- a/src/pages/02_personnel-management/MainPage.vue +++ b/src/pages/02_personnel-management/MainPage.vue @@ -94,6 +94,9 @@ const defaultFormData = { status: 'CREATED', checkpoint: null, checkpointEN: null, + namePrefix: null, + middleNameEN: '', + middleName: '', }; const modeView = ref(false); @@ -1896,22 +1899,22 @@ watch(
Date: Mon, 2 Sep 2024 09:44:16 +0700 Subject: [PATCH 002/274] refactor: add Check role branch_manager --- src/router/routes.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/router/routes.ts b/src/router/routes.ts index 8d8934e2..cb4727b9 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -43,6 +43,7 @@ const routes: RouteRecordRaw[] = [ 'head_of_admin', 'system', 'owner', + 'branch_manager', ]) ) { next(); From ecc8009a99bc9b6ca3be1282b6ddb32c3fb751c3 Mon Sep 17 00:00:00 2001 From: Net Date: Mon, 2 Sep 2024 10:56:29 +0700 Subject: [PATCH 003/274] refactor: header isHeadOff --- src/pages/02_personnel-management/MainPage.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue index 21dc4e74..d5fc0b41 100644 --- a/src/pages/02_personnel-management/MainPage.vue +++ b/src/pages/02_personnel-management/MainPage.vue @@ -346,8 +346,13 @@ async function openDialog( modal.value = true; if (isRoleInclude(['branch_manager'])) { - hqId.value = myBranch.value?.[0].headOfficeId || ''; - brId.value = myBranch.value?.[0].id; + hqId.value = + myBranch.value?.[0].isHeadOffice === true + ? myBranch.value?.[0].id + : myBranch.value?.[0].headOfficeId || ''; + + brId.value = + myBranch.value?.[0].isHeadOffice === true ? '' : myBranch.value?.[0].id; } } else if (action === 'INFO') { if (!userData.value) return; From 84eed66b70b5983e3ac4f36d5a2b01749baf423d Mon Sep 17 00:00:00 2001 From: puriphatt Date: Mon, 2 Sep 2024 13:30:20 +0700 Subject: [PATCH 004/274] fix(02): prefix and gender condition --- src/components/02_personnel-management/FormPerson.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue index 1ed3544a..65f80d47 100644 --- a/src/components/02_personnel-management/FormPerson.vue +++ b/src/components/02_personnel-management/FormPerson.vue @@ -21,7 +21,7 @@ const nationality = defineModel('nationality'); const midName = defineModel('midName'); const midNameEN = defineModel('midNameEN'); -defineProps<{ +const props = defineProps<{ dense?: boolean; outlined?: boolean; readonly?: boolean; @@ -91,6 +91,7 @@ watch( watch( () => prefixName.value, (v) => { + if (props.readonly) return; if (v === 'mr') gender.value = 'male'; else gender.value = 'female'; }, From 8335f6cad6602feea3a01ce269971cfc37eb40fe Mon Sep 17 00:00:00 2001 From: Net Date: Mon, 2 Sep 2024 15:26:03 +0700 Subject: [PATCH 005/274] refactor: header can't edit Employee on page customer --- .../03_customer-management/FormEmployeeHealthCheck.vue | 6 ++++-- .../03_customer-management/FormEmployeeOther.vue | 3 ++- .../03_customer-management/FormEmployeeWorkHistory.vue | 5 +++-- src/pages/03_customer-management/MainPage.vue | 9 ++++++++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/components/03_customer-management/FormEmployeeHealthCheck.vue b/src/components/03_customer-management/FormEmployeeHealthCheck.vue index f847ba3f..6ce37b3b 100644 --- a/src/components/03_customer-management/FormEmployeeHealthCheck.vue +++ b/src/components/03_customer-management/FormEmployeeHealthCheck.vue @@ -58,8 +58,10 @@ withDefaults( typeCustomer?: string; prefixId: string; showBtnSave?: boolean; + hideAction?: boolean; }>(), { + hideAction: false, showBtnSave: false, }, ); @@ -160,7 +162,7 @@ const insuranceCompanyFilter = selectFilterOptionRefMod( /> {{ $t(`customerEmployee.formHealthCheck.title`) }} {{ $t('general.times', { number: index + 1 }) }} -
+
(); const employeeOther = defineModel('employeeOther'); @@ -31,7 +32,7 @@ const employeeOther = defineModel('employeeOther'); style="background-color: var(--surface-3)" /> {{ $t('customerEmployee.form.group.family') }} -
+
(); defineEmits<{ @@ -116,7 +117,7 @@ const workplaceFilter = selectFilterOptionRefMod( /> {{ $t(`customerEmployee.formWorkHistory.title`) }} {{ $t('general.times', { number: index + 1 }) }} -
+