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 1/2] 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 2/2] 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,