+
{{ name }}
-
+
+
{{
uploading.loaded
@@ -79,7 +80,7 @@ onMounted(() => {
/>
{{ idle ? `Pending` : progress !== 1 ? `Uploading...` : 'Completed' }}
-
+
- ('telephoneNo', { default: '' });
:label="$t('personnel.form.citizenId')"
for="input-citizen-id"
/>
-
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue b/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
index 1b70b651..14f7aa98 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
@@ -7,6 +7,8 @@ import { CustomerCreate } from 'stores/customer/types';
import EmployerFormAbout from './EmployerFormAbout.vue';
import EmployerFormAuthorized from './EmployerFormAuthorized.vue';
import { waitAll } from 'src/stores/utils';
+import FormEmployeePassport from 'src/components/03_customer-management/FormEmployeePassport.vue';
+import FormEmployeeVisa from 'src/components/03_customer-management/FormEmployeeVisa.vue';
import {
FormCitizen,
CorpFormBusinessRegistration,
@@ -51,6 +53,7 @@ withDefaults(
actionDisabled?: boolean;
customerType?: 'CORP' | 'PERS';
hideAction?: boolean;
+ hideDelete?: boolean;
}>(),
{
hideAction: false,
@@ -81,7 +84,7 @@ withDefaults(
/>
+
Refresh
@@ -119,8 +120,8 @@ onMounted(async () => {
rounded
flat
dense
- size="xs"
- class="app-text-muted-2 q-ml-sm"
+ size="sm"
+ class="app-text-muted-2"
@click="async () => await deleteNoti()"
>
{{ $t('general.delete') }}
@@ -131,7 +132,7 @@ onMounted(async () => {
rounded
flat
dense
- size="xs"
+ size="sm"
class="app-text-muted-2 q-mx-sm"
@click="async () => await markAsRead()"
>
@@ -177,7 +178,13 @@ onMounted(async () => {
{{
tab.value === 'all'
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index ef4acc82..35428b65 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -6,11 +6,11 @@ import { Icon } from '@iconify/vue';
import { BranchContact } from 'stores/branch-contact/types';
import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
-import type { QSelect, QTableProps, QTableSlots } from 'quasar';
+import type { QTableProps, QTableSlots } from 'quasar';
import { resetScrollBar } from 'src/stores/utils';
import useBranchStore from 'stores/branch';
import useFlowStore from 'stores/flow';
-import { isRoleInclude } from 'stores/utils';
+import { isRoleInclude, canAccess } from 'stores/utils';
import {
BranchWithChildren,
BranchCreate,
@@ -52,6 +52,7 @@ import {
UndoButton,
} from 'components/button';
import { useNavigator } from 'src/stores/navigator';
+import AdvanceSearch from 'src/components/shared/AdvanceSearch.vue';
const $q = useQuasar();
const { t } = useI18n();
@@ -72,7 +73,6 @@ const typeBranchItem = [
color: 'var(--blue-6-hsl)',
},
];
-const refFilter = ref>();
const holdDialog = ref(false);
const isSubCreate = ref(false);
const columns = [
@@ -175,6 +175,8 @@ const qrCodeDialog = ref(false);
const qrCodeimageUrl = ref('');
const formLastSubBranch = ref(0);
+const searchDate = ref([]);
+
const branchStore = useBranchStore();
const flowStore = useFlowStore();
const { locale } = useI18n();
@@ -715,12 +717,20 @@ async function fetchList(opts: {
tree?: boolean;
withHead?: boolean;
filter?: 'head' | 'sub';
+ startDate?: string;
+ endDate?: string;
}) {
await branchStore.fetchList(opts);
}
-watch(inputSearch, () => {
- fetchList({ tree: true, query: inputSearch.value, withHead: true });
+watch([inputSearch, searchDate], () => {
+ fetchList({
+ tree: true,
+ query: inputSearch.value,
+ withHead: true,
+ startDate: searchDate.value[0],
+ endDate: searchDate.value[1],
+ });
currentSubBranch.value = undefined;
});
@@ -781,6 +791,8 @@ async function onSubmit(submitSelectedItem?: boolean) {
);
if (!res) return;
+
+ formType.value = 'view';
formData.value.codeHeadOffice = formData.value.code = res.code;
imageUrl.value = `${baseUrl}/branch/${res.id}/image/${res.selectedImage}`;
@@ -855,7 +867,9 @@ async function onSubmit(submitSelectedItem?: boolean) {
actionText: t('dialog.action.ok'),
persistent: true,
title: t('form.warning.title'),
- cancel: () => {},
+ cancel: () => {
+ formType.value = 'create';
+ },
action: async () => {
await createBranch();
},
@@ -1036,7 +1050,7 @@ watch(currentHq, () => {
{{ $t('branch.allBranch') }}
{
{
+
+
+
{
;
}>(),
{
color: 'green',
@@ -96,7 +103,6 @@ const prop = withDefaults(
);
const currentBranchEmployee = ref('');
const listEmployee = ref([]);
-
const customerId = defineModel('customerId', { required: true });
defineEmits<{
@@ -106,16 +112,6 @@ defineEmits<{
(e: 'dialog'): void;
}>();
-onMounted(async () => {
- customerBranchFormState.value.currentCustomerId = route.params
- .customerId as string;
- await fetchList();
-
- branch.value?.forEach((v) => {
- currentBtnOpen.value.push(false);
- });
-});
-
const columns = [
{
name: 'branchName',
@@ -257,10 +253,6 @@ async function fetchEmployee(opts: { branchId: string; pageSize?: number }) {
}
}
-onMounted(async () => {
- await fetchList();
-});
-
watch([customerId, inputSearch, currentStatus, pageSizeBranch], async () => {
await fetchList();
});
@@ -280,12 +272,22 @@ watch(
}
},
);
+
+onMounted(async () => {
+ customerBranchFormState.value.currentCustomerId = route.params
+ .customerId as string;
+ await fetchList();
+
+ branch.value?.forEach((v) => {
+ currentBtnOpen.value.push(false);
+ });
+});
- {{ useOptionStore().mapOption(props.row.businessType) || '-' }}
+ {{
+ props.row.businessType
+ ? props.row.businessType[
+ $i18n.locale === 'eng' ? 'nameEN' : 'name'
+ ]
+ : '-'
+ }}
{
@@ -615,7 +620,7 @@ watch(
@@ -998,6 +1011,18 @@ watch(
/>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
index eb131ea9..7353db3c 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
@@ -137,7 +137,12 @@ watch(
@update:model-value="
(v) => (typeof v === 'string' ? (registerName = v.trim()) : '')
"
- :rules="[(val: string) => !!val || $t('form.error.required')]"
+ :rules="[
+ (val) => !!val || $t('form.error.required'),
+ (val) =>
+ /^[A-Za-z0-9ก-๙\s&.,'()-]+$/.test(val) ||
+ $t('form.error.branchNameField'),
+ ]"
/>
(typeof v === 'string' ? (registerNameEN = v.trim()) : '')
"
:rules="[
- (val: string) =>
- val === '' ||
- /^[0-9A-Za-z\s.,]+$/.test(val) ||
- $t('form.error.letterOnly'),
+ (val) => !!val || $t('form.error.required'),
+ (val) =>
+ /^[A-Za-z0-9\s&.,'-]+$/.test(val) ||
+ $t('form.error.branchNameENField'),
]"
/>
+ {{ $t('general.status') }}
+
+
+import { onMounted, ref, watch } from 'vue';
+import { getInstance } from 'src/services/keycloak';
+import { useNavigator } from 'src/stores/navigator';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import { initLang } from 'src/utils/ui';
+
+const $q = useQuasar();
+const { locale } = useI18n();
+const navigatorStore = useNavigator();
+const EDM_SERVICE = import.meta.env.VITE_EDM_MICRO_FRONTEND_URL;
+const kc = getInstance();
+const at = ref(kc.token);
+const rt = ref(kc.refreshToken);
+const iframe = ref>();
+
+function sendMessage() {
+ iframe?.value?.contentWindow?.postMessage(
+ {
+ i18n: locale.value,
+ darkMode: $q.dark.isActive,
+ },
+ '*',
+ );
+}
+
+onMounted(() => {
+ initLang();
+ currentLocale.value = locale.value;
+ navigatorStore.current.title = 'menu.dms';
+ navigatorStore.current.path = [
+ {
+ text: '',
+ i18n: true,
+ handler: () => {},
+ },
+ ];
+ sendMessage();
+});
+
+watch(
+ () => kc.token,
+ () => {
+ at.value = kc.token;
+ rt.value = kc.refreshToken;
+ },
+);
+
+watch([locale, $q.dark], () => {
+ sendMessage();
+});
+
+const currentLocale = ref(locale.value);
+
+
+
+
+
+
+
diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue
index f144fa66..4c1676fc 100644
--- a/src/pages/02_personnel-management/MainPage.vue
+++ b/src/pages/02_personnel-management/MainPage.vue
@@ -10,8 +10,8 @@ import useOptionStore from 'stores/options';
import useAddressStore from 'stores/address';
import useMyBranch from 'src/stores/my-branch';
import { calculateAge } from 'src/utils/datetime';
-import { QSelect, useQuasar, type QTableProps } from 'quasar';
-import { dialog, baseUrl } from 'stores/utils';
+import { useQuasar, type QTableProps } from 'quasar';
+import { dialog, baseUrl, setPrefixName } from 'stores/utils';
import { useNavigator } from 'src/stores/navigator';
import { isRoleInclude, resetScrollBar } from 'src/stores/utils';
import { BranchUserStats } from 'stores/branch/types';
@@ -49,6 +49,7 @@ import FormPerson from 'components/02_personnel-management/FormPerson.vue';
import FormByType from 'components/02_personnel-management/FormByType.vue';
import FormInformation from 'components/02_personnel-management/FormInformation.vue';
import PaginationPageSize from 'src/components/PaginationPageSize.vue';
+import AdvanceSearch from 'src/components/shared/AdvanceSearch.vue';
const { locale, t } = useI18n();
const $q = useQuasar();
@@ -73,7 +74,6 @@ const isImageEdit = ref(false);
const imageDialog = ref(false);
const infoDrawerEdit = ref(false);
const refreshImageState = ref(false);
-const refFilter = ref>();
const firstScroll = ref(false);
const inputSearch = ref('');
@@ -93,12 +93,14 @@ const currentUser = ref();
const userCode = ref();
const statusToggle = ref(true);
-const agencyFile = ref([]);
-const agencyFileList = ref<{ name: string; url: string }[]>([]);
+const userFile = ref([]);
+const userFileList = ref<{ name: string; url: string }[]>([]);
const typeStats = ref();
const userStats = ref();
+const searchDate = ref<[]>([]);
+
const urlProfile = ref();
const profileFileImg = ref(null);
const imageList = ref<{ selectedImage: string; list: string[] }>();
@@ -124,7 +126,7 @@ const defaultFormData = {
streetEN: '',
street: '',
trainingPlace: null,
- importNationality: null,
+ importNationality: [],
sourceNationality: null,
licenseExpireDate: null,
licenseIssueDate: null,
@@ -151,8 +153,18 @@ const defaultFormData = {
citizenExpire: null,
citizenIssue: null,
citizenId: '',
+ contactName: '',
+ contactTel: '',
remark: '',
- agencyStatus: null,
+ agencyStatus: '',
+ addressForeign: false,
+ provinceText: null,
+ districtText: null,
+ subDistrictText: null,
+ provinceTextEN: null,
+ districtTextEN: null,
+ subDistrictTextEN: null,
+ zipCodeText: null,
};
const formData = ref({
@@ -174,7 +186,7 @@ const formData = ref({
streetEN: '',
street: '',
trainingPlace: null,
- importNationality: null,
+ importNationality: [],
sourceNationality: null,
licenseExpireDate: null,
licenseIssueDate: null,
@@ -201,8 +213,18 @@ const formData = ref({
citizenExpire: null,
citizenIssue: null,
citizenId: '',
+ contactName: '',
+ contactTel: '',
remark: '',
- agencyStatus: null,
+ agencyStatus: '',
+ addressForeign: false,
+ provinceText: null,
+ districtText: null,
+ subDistrictText: null,
+ provinceTextEN: null,
+ districtTextEN: null,
+ subDistrictTextEN: null,
+ zipCodeText: null,
});
const fieldSelectedOption = ref<{ label: string; value: string }[]>([
@@ -331,7 +353,7 @@ function onClose(excludeDialog?: boolean) {
urlProfile.value = '';
profileFileImg.value = null;
infoDrawerEdit.value = false;
- agencyFile.value = [];
+ userFile.value = [];
isEdit.value = false;
statusToggle.value = true;
isImageEdit.value = false;
@@ -340,6 +362,8 @@ function onClose(excludeDialog?: boolean) {
mapUserType(currentTab.value);
imageList.value = { selectedImage: '', list: [] };
onCreateImageList.value = { selectedImage: '', list: [] };
+ userFileList.value = [];
+ userFile.value = [];
flowStore.rotate();
}
@@ -360,12 +384,10 @@ async function openDialog(
isEdit.value = true;
await assignFormData(id);
- if (formData.value.userType === 'AGENCY') {
- const result = await userStore.fetchAttachment(id);
+ const result = await userStore.fetchAttachment(id);
- if (result) {
- agencyFileList.value = result;
- }
+ if (result) {
+ userFileList.value = result;
}
}
if (userStore.userOption.hqOpts.length !== 0 && !id) {
@@ -425,14 +447,35 @@ async function onSubmit(excludeDialog?: boolean) {
...formData.value,
checkpointEN: formData.value.checkpoint,
status: !statusToggle.value ? 'INACTIVE' : 'ACTIVE',
+ provinceId: formData.value.addressForeign
+ ? null
+ : formData.value.provinceId,
+ districtId: formData.value.addressForeign
+ ? null
+ : formData.value.districtId,
+ subDistrictId: formData.value.addressForeign
+ ? null
+ : formData.value.subDistrictId,
+
+ provinceText: formData.value.addressForeign
+ ? formData.value.provinceId
+ : null,
+ districtText: formData.value.addressForeign
+ ? formData.value.districtId
+ : null,
+ subDistrictText: formData.value.addressForeign
+ ? formData.value.subDistrictId
+ : null,
+ zipCodeText: formData.value.addressForeign
+ ? formData.value.zipCode
+ : null,
} as const;
await userStore.editById(currentUser.value.id, formDataEdit);
- if (currentUser.value.id && formDataEdit.userType === 'AGENCY') {
- if (!agencyFile.value) return;
+ if (userFile.value) {
const payload: UserAttachmentCreate = {
- file: agencyFile.value,
+ file: userFile.value,
};
if (payload?.file) {
@@ -457,15 +500,37 @@ async function onSubmit(excludeDialog?: boolean) {
: '';
formData.value.checkpointEN = formData.value.checkpoint;
const result = await userStore.create(
- formData.value,
+ {
+ ...formData.value,
+ provinceId: formData.value.addressForeign
+ ? null
+ : formData.value.provinceId,
+ districtId: formData.value.addressForeign
+ ? null
+ : formData.value.districtId,
+ subDistrictId: formData.value.addressForeign
+ ? null
+ : formData.value.subDistrictId,
+
+ provinceText: formData.value.addressForeign
+ ? formData.value.provinceId
+ : null,
+ districtText: formData.value.addressForeign
+ ? formData.value.districtId
+ : null,
+ subDistrictText: formData.value.addressForeign
+ ? formData.value.subDistrictId
+ : null,
+ zipCodeText: formData.value.addressForeign
+ ? formData.value.zipCode
+ : null,
+ },
onCreateImageList.value,
);
- if (result && formData.value.userType === 'AGENCY') {
- if (!agencyFile.value) return;
-
+ if (userFile.value && result) {
const payload: UserAttachmentCreate = {
- file: agencyFile.value,
+ file: userFile.value,
};
if (payload?.file) {
@@ -557,12 +622,20 @@ async function assignFormData(idEdit: string) {
currentUser.value = foundUser;
formData.value = {
branchId: foundUser.branch[0]?.id,
- provinceId: foundUser.provinceId,
- districtId: foundUser.districtId,
- subDistrictId: foundUser.subDistrictId,
+ provinceId: foundUser.addressForeign
+ ? foundUser.provinceText
+ : foundUser.provinceId,
+ districtId: foundUser.addressForeign
+ ? foundUser.districtText
+ : foundUser.districtId,
+ subDistrictId: foundUser.addressForeign
+ ? foundUser.subDistrictText
+ : foundUser.subDistrictId,
telephoneNo: foundUser.telephoneNo,
email: foundUser.email,
- zipCode: foundUser.zipCode,
+ zipCode: foundUser.addressForeign
+ ? foundUser.zipCodeText
+ : foundUser.zipCode,
gender: foundUser.gender,
addressEN: foundUser.addressEN,
address: foundUser.address,
@@ -573,7 +646,10 @@ async function assignFormData(idEdit: string) {
street: foundUser.street,
streetEN: foundUser.streetEN,
trainingPlace: foundUser.trainingPlace,
- importNationality: foundUser.importNationality,
+ importNationality:
+ typeof foundUser.importNationality === 'string'
+ ? [foundUser.importNationality]
+ : foundUser.importNationality,
sourceNationality: foundUser.sourceNationality,
licenseNo: foundUser.licenseNo,
discountCondition: foundUser.discountCondition,
@@ -593,6 +669,8 @@ async function assignFormData(idEdit: string) {
responsibleArea: foundUser.responsibleArea,
status: foundUser.status,
selectedImage: foundUser.selectedImage,
+ contactName: foundUser.contactName || '',
+ contactTel: foundUser.contactTel || '',
licenseExpireDate:
(foundUser.licenseExpireDate &&
new Date(foundUser.licenseExpireDate)) ||
@@ -611,6 +689,10 @@ async function assignFormData(idEdit: string) {
(foundUser.citizenExpire && new Date(foundUser.citizenExpire)) || null,
remark: foundUser.remark || '',
agencyStatus: foundUser.agencyStatus || '',
+ addressForeign: foundUser.addressForeign || false,
+ provinceTextEN: foundUser.provinceTextEN,
+ districtTextEN: foundUser.districtTextEN,
+ subDistrictTextEN: foundUser.subDistrictTextEN,
};
formData.value.status === 'ACTIVE' || 'CREATED'
@@ -669,6 +751,8 @@ async function fetchUserList(mobileFetch?: boolean) {
: statusFilter.value === 'statusACTIVE'
? 'ACTIVE'
: 'INACTIVE',
+ startDate: searchDate.value[0],
+ endDate: searchDate.value[1],
});
if (ret) {
@@ -735,7 +819,17 @@ watch(
watch(
() => formData.value.userType,
- async () => {
+ async (type) => {
+ if (type !== 'AGENCY') {
+ formData.value.addressForeign = false;
+ formData.value.provinceId = null;
+ formData.value.districtId = null;
+ formData.value.subDistrictId = null;
+ formData.value.provinceTextEN = null;
+ formData.value.districtTextEN = null;
+ formData.value.subDistrictTextEN = null;
+ formData.value.zipCodeText = null;
+ }
if (!infoDrawerEdit.value) return;
formData.value.registrationNo = null;
formData.value.startDate = null;
@@ -743,11 +837,11 @@ watch(
formData.value.responsibleArea = null;
formData.value.discountCondition = null;
formData.value.sourceNationality = null;
- formData.value.importNationality = null;
+ formData.value.importNationality = [];
formData.value.trainingPlace = null;
formData.value.checkpoint = null;
formData.value.checkpointEN = null;
- agencyFile.value = [];
+ userFile.value = [];
},
);
@@ -758,7 +852,7 @@ watch(
},
);
-watch([inputSearch, statusFilter, pageSize], async () => {
+watch([inputSearch, statusFilter, pageSize, searchDate], async () => {
if (userData.value) userData.value.result = [];
currentPage.value = 1;
@@ -880,26 +974,45 @@ watch(
+
+
+
@@ -1525,9 +1638,12 @@ watch(
hide-action
:is-edit="infoDrawerEdit"
:title="
- locale === 'eng'
+ (currentUser.namePrefix
+ ? $t('customer.form.prefix.' + currentUser.namePrefix) + ' '
+ : '') +
+ (locale === 'eng'
? `${currentUser.firstNameEN} ${currentUser.lastNameEN}`
- : `${currentUser.firstName} ${currentUser.lastName}`
+ : `${currentUser.firstName || currentUser.firstNameEN} ${currentUser.lastName || currentUser.lastNameEN}`)
"
v-model:drawerOpen="infoDrawer"
:submit="() => onSubmit()"
@@ -1559,7 +1675,18 @@ watch(
v-model:toggle-status="formData.status"
hideFade
:toggle-title="$t('status.title')"
- :title="`${locale === 'eng' ? `${formData.firstNameEN} ${formData.lastNameEN}` : `${formData.firstName} ${formData.lastName}`}`"
+ :title="
+ setPrefixName(
+ {
+ namePrefix: formData.namePrefix,
+ firstName: formData.firstName || formData.firstNameEN,
+ lastName: formData.lastName || formData.lastNameEN,
+ firstNameEN: formData.firstNameEN,
+ lastNameEN: formData.lastNameEN,
+ },
+ { locale },
+ )
+ "
:caption="userCode"
:img="
`${baseUrl}/user/${currentUser.id}/profile-image/${formData.selectedImage}`.concat(
@@ -1744,12 +1871,15 @@ watch(
v-model:citizen-id="formData.citizenId"
v-model:citizen-issue="formData.citizenIssue"
v-model:citizen-expire="formData.citizenExpire"
+ v-model:contact-name="formData.contactName"
+ v-model:contact-tel="formData.contactTel"
:title="'personnel.form.personalInformation'"
prefix-id="drawer-info-personnel"
dense
outlined
separator
:readonly="!infoDrawerEdit"
+ :agency="formData.userType === 'AGENCY'"
class="q-mb-xl"
/>
@@ -1767,10 +1897,15 @@ watch(
v-model:district-id="formData.districtId"
v-model:sub-district-id="formData.subDistrictId"
v-model:zip-code="formData.zipCode"
+ v-model:address-foreign="formData.addressForeign"
+ v-model:province-text-en="formData.provinceTextEN"
+ v-model:district-text-en="formData.districtTextEN"
+ v-model:sub-district-text-en="formData.subDistrictTextEN"
:readonly="!infoDrawerEdit"
prefix-id="drawer-info-personnel"
:title="'personnel.form.addressInformation'"
dense
+ :use-foreign-address="formData.userType === 'AGENCY'"
class="q-mb-xl"
/>
diff --git a/src/pages/03_customer-management/BranchPage.vue b/src/pages/03_customer-management/BranchPage.vue
index bf1b8fd7..dd8c4737 100644
--- a/src/pages/03_customer-management/BranchPage.vue
+++ b/src/pages/03_customer-management/BranchPage.vue
@@ -9,7 +9,7 @@ import { baseUrl } from 'src/stores/utils';
import useCustomerStore from 'stores/customer';
import useFlowStore from 'stores/flow';
import useOptionStore from 'stores/options';
-import { dialog } from 'stores/utils';
+import { dialog, canAccess } from 'stores/utils';
import { Status } from 'stores/types';
import { Employee } from 'stores/employee/types';
@@ -18,6 +18,8 @@ import { CustomerBranch, CustomerType } from 'stores/customer/types';
import { columnsEmployee } from './constant';
import { useCustomerBranchForm, useEmployeeForm } from './form';
+import DialogEmployee from 'src/components/03_customer-management/DialogEmployee.vue';
+import DrawerEmployee from 'src/components/03_customer-management/DrawerEmployee.vue';
import EmployerFormAuthorized from './components/employer/EmployerFormAuthorized.vue';
import FloatingActionButton from 'components/FloatingActionButton.vue';
import SideMenu from 'components/SideMenu.vue';
@@ -89,6 +91,11 @@ const prop = withDefaults(
currentCitizenId?: string;
gender: string;
selectedImage: string;
+ fetchImageList: (
+ id: string,
+ selectedName: string,
+ type: 'customer' | 'employee',
+ ) => Promise
+ {{ $t('general.status') }}
+
+
+
+
+ {{ $t('general.all') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- (typeof v === 'string' ? (prefixName = v) : '')
"
@clear="prefixName = ''"
+ :rules="[(val: string) => !!val || $t('form.error.required')]"
>
@@ -393,11 +385,11 @@ watch(
:readonly="readonly"
:disable="!readonly"
class="col-md-2 col-6"
- label="Title"
+ label="Prefix"
:model-value="
readonly
- ? capitalize(prefixName || '') || '-'
- : capitalize(prefixName || '')
+ ? prefixName.toUpperCase() || '-'
+ : prefixName.toUpperCase() || ''
"
@update:model-value="
(v) => (typeof v === 'string' ? (prefixName = v) : '')
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue b/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue
index d31d3889..dbb57c80 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue
@@ -2,6 +2,7 @@
import useOptionStore from 'stores/options';
import SelectBranch from 'src/components/shared/select/SelectBranch.vue';
import { isRoleInclude } from 'src/stores/utils';
+import SelectBusinessType from 'src/components/shared/select/SelectBusinessType.vue';
withDefaults(
defineProps<{
@@ -102,7 +103,13 @@ const telephoneNo = defineModel('telephoneNo', { default: '' });
class="col-md-6"
:readonly
:disabled="
- !isRoleInclude(['admin', 'system', 'head_of_admin']) && !readonly
+ !isRoleInclude([
+ 'admin',
+ 'system',
+ 'head_of_admin',
+ 'executive',
+ 'accountant',
+ ]) && !readonly
"
:label="$t('customer.form.registeredBranch')"
select-first-value
@@ -136,15 +143,10 @@ const telephoneNo = defineModel('telephoneNo', { default: '' });
for="input-tax"
v-model="legalPersonNo"
/>
-
@@ -173,15 +175,10 @@ const telephoneNo = defineModel