From 80c8a0d8b4ee69505ee00bc49083602edea8d511 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Mon, 19 May 2025 16:00:21 +0700 Subject: [PATCH 001/204] fix: form not clear --- src/pages/03_customer-management/form.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts index 2d529a5c..6ce28a18 100644 --- a/src/pages/03_customer-management/form.ts +++ b/src/pages/03_customer-management/form.ts @@ -965,6 +965,7 @@ export const useEmployeeForm = defineStore('form-employee', () => { resetEmployeeData = structuredClone(defaultFormData); state.value.statusSavePersonal = false; state.value.profileUrl = ''; + state.value.currentBranchId = ''; } else { resetEmployeeData.selectedImage = currentFromDataEmployee.value.selectedImage; From 0f252b308017e6884acde064cd4801d0439b0d68 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Tue, 20 May 2025 11:43:07 +0700 Subject: [PATCH 002/204] =?UTF-8?q?fix:=20update=20label=20from=20'?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B9=89?= =?UTF-8?q?=E0=B8=B2'=20to=20'Prefix'=20in=20forms=20(english)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/02_personnel-management/FormPerson.vue | 2 +- .../components/employer/EmployerFormAbout.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue index 7335391d..6d8601a6 100644 --- a/src/components/02_personnel-management/FormPerson.vue +++ b/src/components/02_personnel-management/FormPerson.vue @@ -165,7 +165,7 @@ watch( :id="`${prefixId}-select-prefix-name-en`" :for="`${prefixId}-select-prefix-name-en`" :rules="[(val: string) => !!val || $t('form.error.required')]" - :label="$t('personnel.form.prefixName')" + label="Prefix" class="col-md-1 col-6" v-model="prefixName" /> diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue index eb131ea9..432228b1 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue @@ -393,7 +393,7 @@ watch( :readonly="readonly" :disable="!readonly" class="col-md-2 col-6" - label="Title" + label="Prefix" :model-value=" readonly ? capitalize(prefixName || '') || '-' From 1b475933da653290d46318e20a99d07f498b91e3 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Fri, 13 Jun 2025 15:08:03 +0700 Subject: [PATCH 003/204] fix: incorrect condition --- src/pages/08_request-list/RequestListView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue index ad7254fe..d82829a7 100644 --- a/src/pages/08_request-list/RequestListView.vue +++ b/src/pages/08_request-list/RequestListView.vue @@ -822,14 +822,14 @@ function toEmployee(employee: RequestData['employee']) { :readonly=" data.requestDataStatus === RequestDataStatus.Canceled || (responsibleList && + (!!responsibleList[pageState.currentStep]?.user?.length || + !!responsibleList[pageState.currentStep]?.group?.length) && !responsibleList[pageState.currentStep]?.user.find( (v) => v.id === getUserId(), ) && !responsibleList[pageState.currentStep]?.group.some((v) => currentUserGroup.includes(v), - )) || - (!!responsibleList[pageState.currentStep]?.user?.length && - !!responsibleList[pageState.currentStep]?.user?.length) + )) " :order-able="value._messengerExpansion" :installment-info="getInstallmentInfo()" From 5c01882a34fa6419310ffa2f79b418556c2dad9f Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Fri, 13 Jun 2025 16:06:19 +0700 Subject: [PATCH 004/204] fix: validation not reset --- src/pages/08_request-list/MessengerExpansion.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/08_request-list/MessengerExpansion.vue b/src/pages/08_request-list/MessengerExpansion.vue index 4b7958cb..30e81598 100644 --- a/src/pages/08_request-list/MessengerExpansion.vue +++ b/src/pages/08_request-list/MessengerExpansion.vue @@ -57,6 +57,7 @@ const formData = ref(defaultForm); function triggerUndo() { assignToForm(); state.isEdit = false; + refForm.value?.resetValidation(); } async function triggerSubmit() { From 19ee1040d49bf4a49af03dcdb611cc69989772b8 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Fri, 13 Jun 2025 16:29:13 +0700 Subject: [PATCH 005/204] fix: validation error when mount --- src/components/shared/select/SelectUser.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/shared/select/SelectUser.vue b/src/components/shared/select/SelectUser.vue index 64e661f9..b931d07e 100644 --- a/src/components/shared/select/SelectUser.vue +++ b/src/components/shared/select/SelectUser.vue @@ -92,7 +92,9 @@ function setDefaultValue() { :hide-selected="false" :fill-input="false" :rules=" - required ? [(v: string) => !!v || $t('form.error.required')] : undefined + required && !readonly + ? [(v: string) => !!v || $t('form.error.required')] + : undefined " @filter="filter" > From 41d02273ee3aacd86694eb32546b8df98dea9bf8 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Tue, 17 Jun 2025 11:55:00 +0700 Subject: [PATCH 006/204] fix: responsible only edit only --- src/pages/08_request-list/RequestListView.vue | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue index d82829a7..982f3203 100644 --- a/src/pages/08_request-list/RequestListView.vue +++ b/src/pages/08_request-list/RequestListView.vue @@ -812,25 +812,32 @@ function toEmployee(employee: RequestData['employee']) { -