From e95078e75e6e1f611946b36020c14f67cb149212 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:48:11 +0700 Subject: [PATCH] fix: selected first branch wrong --- .../employer/EmployerFormBasicInfo.vue | 1 + src/pages/03_customer-management/form.ts | 16 +++------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue b/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue index 75cc3fac..6d766842 100644 --- a/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue +++ b/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue @@ -100,6 +100,7 @@ const telephoneNo = defineModel('telephoneNo', { default: '' }); :for="`${prefixId}-input-source-registered-branch`" v-model:value="registeredBranchId" :label="$t('customer.form.registeredBranch')" + select-first-value class="col-md-6" simple required diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts index fd5a3246..1cc7b126 100644 --- a/src/pages/03_customer-management/form.ts +++ b/src/pages/03_customer-management/form.ts @@ -1,4 +1,4 @@ -import { ref, toRaw, watch } from 'vue'; +import { ref, watch } from 'vue'; import { defineStore } from 'pinia'; import { CustomerBranchCreate, @@ -6,7 +6,6 @@ import { CustomerType, } from 'stores/customer/types'; import { Employee, EmployeeCreate } from 'stores/employee/types'; -import { useI18n } from 'vue-i18n'; import useMyBranch from 'stores/my-branch'; import useCustomerStore from 'stores/customer'; @@ -16,10 +15,7 @@ import useFlowStore from 'stores/flow'; import { baseUrl } from 'src/stores/utils'; export const useCustomerForm = defineStore('form-customer', () => { - const { t } = useI18n(); - const customerStore = useCustomerStore(); - const branchStore = useMyBranch(); const defaultFormData: CustomerCreate = { // code: '', @@ -34,7 +30,7 @@ export const useCustomerForm = defineStore('form-customer', () => { selectedImage: '', status: 'CREATED', customerType: CustomerType.Corporate, - registeredBranchId: branchStore.currentMyBranch?.id || '', + registeredBranchId: '', image: null, }; let resetFormData = structuredClone(defaultFormData); @@ -103,20 +99,14 @@ export const useCustomerForm = defineStore('form-customer', () => { if (clean) { defaultFormData.customerType = currentFormData.value.customerType; currentFormData.value = structuredClone(defaultFormData); - currentFormData.value.registeredBranchId = - branchStore.currentMyBranch?.id || ''; resetFormData = structuredClone(defaultFormData); - resetFormData.registeredBranchId = branchStore.currentMyBranch?.id || ''; + resetFormData.registeredBranchId = ''; state.value.editCustomerId = ''; state.value.treeFile = []; return; } - if (!resetFormData.registeredBranchId) { - resetFormData.registeredBranchId = branchStore.currentMyBranch?.id || ''; - } - if (state.value.dialogType === 'create') { state.value.editCustomerId = ''; }