diff --git a/src/components/01_branch-management/BranchCard.vue b/src/components/01_branch-management/BranchCard.vue index 83c268ba..c10d63fc 100644 --- a/src/components/01_branch-management/BranchCard.vue +++ b/src/components/01_branch-management/BranchCard.vue @@ -89,15 +89,7 @@ defineProps<{ -
+
@@ -4423,6 +4455,7 @@ const emptyCreateDialog = ref(false); (customerFormState.branchIndex !== -1 && customerFormState.branchIndex !== idx) " + :hide-delete="!canAccess('customer', 'edit')" :readonly="customerFormState.branchIndex !== idx" @edit="() => (customerFormState.branchIndex = idx)" @cancel="() => customerFormUndo(false)" @@ -4463,11 +4496,18 @@ const emptyCreateDialog = ref(false); } " :title=" - employeeFormState.currentEmployee - ? $i18n.locale === 'eng' - ? `${employeeFormState.currentEmployee.firstNameEN} ${employeeFormState.currentEmployee.lastNameEN}` - : `${employeeFormState.currentEmployee.firstName} ${employeeFormState.currentEmployee.lastName}` - : '-' + setPrefixName( + { + namePrefix: employeeFormState.currentEmployee.namePrefix, + firstName: + employeeFormState.currentEmployee.firstName || + employeeFormState.currentEmployee.firstNameEN, + lastName: employeeFormState.currentEmployee.lastName, + firstNameEN: employeeFormState.currentEmployee.firstNameEN, + lastNameEN: employeeFormState.currentEmployee.lastNameEN, + }, + { locale }, + ) " :badge-class=" currentFromDataEmployee.gender === 'male' @@ -4562,7 +4602,11 @@ const emptyCreateDialog = ref(false); @update:toggle-status=" (v) => { if (currentFromDataEmployee.id !== undefined) - triggerChangeStatus(currentFromDataEmployee.id, v); + triggerChangeStatus( + currentFromDataEmployee.id, + v, + currentFromDataEmployee.firstNameEN, + ); } " :active="currentFromDataEmployee.status !== 'INACTIVE'" @@ -4582,7 +4626,9 @@ const emptyCreateDialog = ref(false); ? setPrefixName( { namePrefix: employeeFormState.currentEmployee.namePrefix, - firstName: employeeFormState.currentEmployee.firstName, + firstName: + employeeFormState.currentEmployee.firstName || + employeeFormState.currentEmployee.firstNameEN, lastName: employeeFormState.currentEmployee.lastName, firstNameEN: employeeFormState.currentEmployee.firstNameEN, lastNameEN: employeeFormState.currentEmployee.lastNameEN, @@ -4878,7 +4924,10 @@ const emptyCreateDialog = ref(false); type="button" /> (), { hideAction: false, @@ -81,7 +82,7 @@ withDefaults( /> (), { readonly: false, isEdit: false }, ); @@ -207,7 +208,7 @@ function triggerPropertiesDialog(step: WorkFlowPayloadStep) { style="position: absolute; z-index: 999; top: 0; right: 0" >