From 04c47b27001200721a79e7a9c390c08faacf6bef Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Fri, 30 May 2025 09:41:19 +0700 Subject: [PATCH 001/204] fix: quotation created at time not display correctly --- src/pages/05_quotation/QuotationForm.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue index fdc36d8b..d3e392a6 100644 --- a/src/pages/05_quotation/QuotationForm.vue +++ b/src/pages/05_quotation/QuotationForm.vue @@ -1509,6 +1509,7 @@ function covertToNode() { :quotation-status=" quotationFormState.source?.quotationStatus === 'Expired' " + :created-at="quotationFormState.createdAt" v-model:urgent="quotationFormData.urgent" v-model:work-name="quotationFormData.workName" v-model:contactor="quotationFormData.contactName" From 060b5980ddfe6fafd62e97608ceadf15da41321c Mon Sep 17 00:00:00 2001 From: Thanaphon Frappet Date: Wed, 11 Jun 2025 10:00:08 +0700 Subject: [PATCH 002/204] fix: can't change branch --- src/pages/03_customer-management/form.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts index 150c8a8c..a6592304 100644 --- a/src/pages/03_customer-management/form.ts +++ b/src/pages/03_customer-management/form.ts @@ -1294,7 +1294,7 @@ export const useEmployeeForm = defineStore('form-employee', () => { state.value.currentEmployee?.status === 'CREATED' ? 'ACTIVE' : state.value.currentEmployee?.status, - customerBranchId: state.value.formDataEmployeeOwner?.id || '', + customerBranchId: state.value.currentBranchId || '', employeeWork: [], employeeCheckup: [], employeeOtherInfo: undefined, 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']) { -