diff --git a/src/components/01_branch-management/FormBranchContact.vue b/src/components/01_branch-management/FormBranchContact.vue index 23f239a4..6cffdae2 100644 --- a/src/components/01_branch-management/FormBranchContact.vue +++ b/src/components/01_branch-management/FormBranchContact.vue @@ -16,74 +16,76 @@ defineProps<{ }>(); diff --git a/src/components/02_personnel-management/FormByType.vue b/src/components/02_personnel-management/FormByType.vue index 85d28d97..2fdf1af0 100644 --- a/src/components/02_personnel-management/FormByType.vue +++ b/src/components/02_personnel-management/FormByType.vue @@ -63,265 +63,267 @@ function deleteFile(name: string) { } diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue index 2b80b965..3e519fbe 100644 --- a/src/pages/01_branch-management/MainPage.vue +++ b/src/pages/01_branch-management/MainPage.vue @@ -274,8 +274,6 @@ async function triggerEdit( openDialog(); } if (openFormType === 'drawer') { - console.log(code); - formType.value = 'view'; openDrawer(); } diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index e411e211..d8e4555d 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -128,7 +128,17 @@ const formDataEmployeeSameAddr = ref(true); const formDataEmployeeTab = ref('personalInfo'); const infoDrawerEmployee = ref(false); const infoDrawerEmployeeEdit = ref(false); -const infoEmployeePersonCard = ref(); +const infoEmployeePersonCard = ref< + { + id: string; + img: string; + name: string; + male: boolean; + female: boolean; + badge: string; + disabled: boolean; + }[] +>(); const statsEmployee = ref(0); const statsEmployeeGender = ref<{ male: number; female: number }>(); const formDataEmployeeOwner = ref<{ @@ -272,8 +282,8 @@ const inputFile = (() => { if (infoDrawerEdit.value && currentCustomer.value) currentCustomer.value.imageUrl = profileUrl.value as string; - if (infoDrawerEmployeeEdit.value) - infoEmployeePersonCard.value[0].img = profileUrl.value; + if (infoDrawerEmployeeEdit.value && infoEmployeePersonCard.value) + infoEmployeePersonCard.value[0].img = profileUrl.value as string; }); element.addEventListener('change', () => { @@ -1855,7 +1865,6 @@ watch([inputSearch, currentStatus], async () => { " dense outlined - bordered separator /> @@ -1998,7 +2007,6 @@ watch([inputSearch, currentStatus], async () => { v-if="formDataEmployeeTab === 'personalInfo'" dense outlined - employee separator v-model:passport-type="formDataEmployee.passportType" v-model:passport-number="formDataEmployee.passportNumber" @@ -2020,7 +2028,6 @@ watch([inputSearch, currentStatus], async () => { v-if="formDataEmployeeTab === 'personalInfo'" dense outlined - employee v-model:visa-type="formDataEmployee.visaType" v-model:visa-number="formDataEmployee.visaNumber" v-model:visa-issue-date="formDataEmployee.visaIssueDate" @@ -2131,7 +2138,6 @@ watch([inputSearch, currentStatus], async () => { " dense outlined - bordered separator /> @@ -2263,7 +2269,6 @@ watch([inputSearch, currentStatus], async () => { " dense outlined - bordered separator /> @@ -2465,7 +2470,6 @@ watch([inputSearch, currentStatus], async () => { " dense outlined - bordered separator :readonly="!infoDrawerEdit" /> @@ -2677,7 +2681,6 @@ watch([inputSearch, currentStatus], async () => { " dense outlined - bordered separator :readonly="!infoDrawerEdit" /> @@ -2771,7 +2774,7 @@ watch([inputSearch, currentStatus], async () => { no-action no-detail no-bg - :list="infoEmployeePersonCard" + :list="infoEmployeePersonCard ? infoEmployeePersonCard : []" :gridColumns="1" @edit-profile=" () => { @@ -2860,7 +2863,6 @@ watch([inputSearch, currentStatus], async () => { v-if="formDataEmployeeTab === 'personalInfo'" dense outlined - employee separator :readonly="!infoDrawerEmployeeEdit" v-model:passport-type="formDataEmployee.passportType" @@ -2883,7 +2885,6 @@ watch([inputSearch, currentStatus], async () => { v-if="formDataEmployeeTab === 'personalInfo'" dense outlined - employee :readonly="!infoDrawerEmployeeEdit" v-model:visa-type="formDataEmployee.visaType" v-model:visa-number="formDataEmployee.visaNumber" diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue index 7c018d0e..846616c6 100644 --- a/src/pages/04_product-service/MainPage.vue +++ b/src/pages/04_product-service/MainPage.vue @@ -2018,21 +2018,17 @@ watch(inputSearchProductAndService, async () => { /> -
+
@@ -2050,7 +2046,7 @@ watch(inputSearchProductAndService, async () => {