-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
index 7353db3c..eb131ea9 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
@@ -137,12 +137,7 @@ watch(
@update:model-value="
(v) => (typeof v === 'string' ? (registerName = v.trim()) : '')
"
- :rules="[
- (val) => !!val || $t('form.error.required'),
- (val) =>
- /^[A-Za-z0-9ก-๙\s&.,'()-]+$/.test(val) ||
- $t('form.error.branchNameField'),
- ]"
+ :rules="[(val: string) => !!val || $t('form.error.required')]"
/>
(typeof v === 'string' ? (registerNameEN = v.trim()) : '')
"
:rules="[
- (val) => !!val || $t('form.error.required'),
- (val) =>
- /^[A-Za-z0-9\s&.,'-]+$/.test(val) ||
- $t('form.error.branchNameENField'),
+ (val: string) =>
+ val === '' ||
+ /^[0-9A-Za-z\s.,]+$/.test(val) ||
+ $t('form.error.letterOnly'),
]"
/>
+
Refresh
@@ -120,8 +119,8 @@ onMounted(async () => {
rounded
flat
dense
- size="sm"
- class="app-text-muted-2"
+ size="xs"
+ class="app-text-muted-2 q-ml-sm"
@click="async () => await deleteNoti()"
>
{{ $t('general.delete') }}
@@ -132,7 +131,7 @@ onMounted(async () => {
rounded
flat
dense
- size="sm"
+ size="xs"
class="app-text-muted-2 q-mx-sm"
@click="async () => await markAsRead()"
>
@@ -178,13 +177,7 @@ onMounted(async () => {
{{
tab.value === 'all'
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 35428b65..83ddc3c6 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -10,7 +10,7 @@ import type { QTableProps, QTableSlots } from 'quasar';
import { resetScrollBar } from 'src/stores/utils';
import useBranchStore from 'stores/branch';
import useFlowStore from 'stores/flow';
-import { isRoleInclude, canAccess } from 'stores/utils';
+import { isRoleInclude } from 'stores/utils';
import {
BranchWithChildren,
BranchCreate,
@@ -791,8 +791,6 @@ 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}`;
@@ -867,9 +865,7 @@ async function onSubmit(submitSelectedItem?: boolean) {
actionText: t('dialog.action.ok'),
persistent: true,
title: t('form.warning.title'),
- cancel: () => {
- formType.value = 'create';
- },
+ cancel: () => {},
action: async () => {
await createBranch();
},
@@ -1050,7 +1046,7 @@ watch(currentHq, () => {
{{ $t('branch.allBranch') }}
{
{
@@ -1011,18 +998,6 @@ onMounted(async () => {
/>
-
-
-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 4c1676fc..b3ea5058 100644
--- a/src/pages/02_personnel-management/MainPage.vue
+++ b/src/pages/02_personnel-management/MainPage.vue
@@ -99,7 +99,7 @@ const userFileList = ref<{ name: string; url: string }[]>([]);
const typeStats = ref();
const userStats = ref();
-const searchDate = ref<[]>([]);
+const searchDate = ref([]);
const urlProfile = ref();
const profileFileImg = ref(null);
@@ -126,7 +126,7 @@ const defaultFormData = {
streetEN: '',
street: '',
trainingPlace: null,
- importNationality: [],
+ importNationality: null,
sourceNationality: null,
licenseExpireDate: null,
licenseIssueDate: null,
@@ -157,14 +157,6 @@ const defaultFormData = {
contactTel: '',
remark: '',
agencyStatus: '',
- addressForeign: false,
- provinceText: null,
- districtText: null,
- subDistrictText: null,
- provinceTextEN: null,
- districtTextEN: null,
- subDistrictTextEN: null,
- zipCodeText: null,
};
const formData = ref({
@@ -186,7 +178,7 @@ const formData = ref({
streetEN: '',
street: '',
trainingPlace: null,
- importNationality: [],
+ importNationality: null,
sourceNationality: null,
licenseExpireDate: null,
licenseIssueDate: null,
@@ -217,14 +209,6 @@ const formData = ref({
contactTel: '',
remark: '',
agencyStatus: '',
- addressForeign: false,
- provinceText: null,
- districtText: null,
- subDistrictText: null,
- provinceTextEN: null,
- districtTextEN: null,
- subDistrictTextEN: null,
- zipCodeText: null,
});
const fieldSelectedOption = ref<{ label: string; value: string }[]>([
@@ -447,28 +431,6 @@ 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);
@@ -500,31 +462,7 @@ async function onSubmit(excludeDialog?: boolean) {
: '';
formData.value.checkpointEN = formData.value.checkpoint;
const result = await userStore.create(
- {
- ...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,
- },
+ formData.value,
onCreateImageList.value,
);
@@ -622,20 +560,12 @@ async function assignFormData(idEdit: string) {
currentUser.value = foundUser;
formData.value = {
branchId: foundUser.branch[0]?.id,
- provinceId: foundUser.addressForeign
- ? foundUser.provinceText
- : foundUser.provinceId,
- districtId: foundUser.addressForeign
- ? foundUser.districtText
- : foundUser.districtId,
- subDistrictId: foundUser.addressForeign
- ? foundUser.subDistrictText
- : foundUser.subDistrictId,
+ provinceId: foundUser.provinceId,
+ districtId: foundUser.districtId,
+ subDistrictId: foundUser.subDistrictId,
telephoneNo: foundUser.telephoneNo,
email: foundUser.email,
- zipCode: foundUser.addressForeign
- ? foundUser.zipCodeText
- : foundUser.zipCode,
+ zipCode: foundUser.zipCode,
gender: foundUser.gender,
addressEN: foundUser.addressEN,
address: foundUser.address,
@@ -646,10 +576,7 @@ async function assignFormData(idEdit: string) {
street: foundUser.street,
streetEN: foundUser.streetEN,
trainingPlace: foundUser.trainingPlace,
- importNationality:
- typeof foundUser.importNationality === 'string'
- ? [foundUser.importNationality]
- : foundUser.importNationality,
+ importNationality: foundUser.importNationality,
sourceNationality: foundUser.sourceNationality,
licenseNo: foundUser.licenseNo,
discountCondition: foundUser.discountCondition,
@@ -669,8 +596,8 @@ async function assignFormData(idEdit: string) {
responsibleArea: foundUser.responsibleArea,
status: foundUser.status,
selectedImage: foundUser.selectedImage,
- contactName: foundUser.contactName || '',
- contactTel: foundUser.contactTel || '',
+ contactName: foundUser.contactName,
+ contactTel: foundUser.contactTel,
licenseExpireDate:
(foundUser.licenseExpireDate &&
new Date(foundUser.licenseExpireDate)) ||
@@ -689,10 +616,6 @@ 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'
@@ -819,17 +742,7 @@ watch(
watch(
() => formData.value.userType,
- 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;
- }
+ async () => {
if (!infoDrawerEdit.value) return;
formData.value.registrationNo = null;
formData.value.startDate = null;
@@ -837,7 +750,7 @@ watch(
formData.value.responsibleArea = null;
formData.value.discountCondition = null;
formData.value.sourceNationality = null;
- formData.value.importNationality = [];
+ formData.value.importNationality = null;
formData.value.trainingPlace = null;
formData.value.checkpoint = null;
formData.value.checkpointEN = null;
@@ -1362,7 +1275,7 @@ watch(
{{
locale === 'eng'
? `${props.row.firstNameEN} ${props.row.lastNameEN}`.trim()
- : `${props.row.firstName || props.row.firstNameEN} ${props.row.lastName || props.row.lastNameEN}`.trim()
+ : `${props.row.firstName} ${props.row.lastName}`.trim()
}}
@@ -1638,12 +1551,9 @@ watch(
hide-action
:is-edit="infoDrawerEdit"
:title="
- (currentUser.namePrefix
- ? $t('customer.form.prefix.' + currentUser.namePrefix) + ' '
- : '') +
- (locale === 'eng'
+ locale === 'eng'
? `${currentUser.firstNameEN} ${currentUser.lastNameEN}`
- : `${currentUser.firstName || currentUser.firstNameEN} ${currentUser.lastName || currentUser.lastNameEN}`)
+ : `${currentUser.firstName} ${currentUser.lastName}`
"
v-model:drawerOpen="infoDrawer"
:submit="() => onSubmit()"
@@ -1679,8 +1589,8 @@ watch(
setPrefixName(
{
namePrefix: formData.namePrefix,
- firstName: formData.firstName || formData.firstNameEN,
- lastName: formData.lastName || formData.lastNameEN,
+ firstName: formData.firstName,
+ lastName: formData.lastName,
firstNameEN: formData.firstNameEN,
lastNameEN: formData.lastNameEN,
},
@@ -1897,15 +1807,10 @@ 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"
/>
Promise;
}>(),
{
color: 'green',
@@ -103,6 +96,7 @@ const prop = withDefaults(
);
const currentBranchEmployee = ref('');
const listEmployee = ref([]);
+
const customerId = defineModel('customerId', { required: true });
defineEmits<{
@@ -112,6 +106,16 @@ 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',
@@ -253,6 +257,10 @@ async function fetchEmployee(opts: { branchId: string; pageSize?: number }) {
}
}
+onMounted(async () => {
+ await fetchList();
+});
+
watch([customerId, inputSearch, currentStatus, pageSizeBranch], async () => {
await fetchList();
});
@@ -272,22 +280,12 @@ watch(
}
},
);
-
-onMounted(async () => {
- customerBranchFormState.value.currentCustomerId = route.params
- .customerId as string;
- await fetchList();
-
- branch.value?.forEach((v) => {
- currentBtnOpen.value.push(false);
- });
-});
{
v-if="branchFieldSelected.includes('businessTypePure')"
class="text-left"
>
- {{
- props.row.businessType
- ? props.row.businessType[
- $i18n.locale === 'eng' ? 'nameEN' : 'name'
- ]
- : '-'
- }}
+ {{ useOptionStore().mapOption(props.row.businessType) || '-' }}
{
await fetchEmployee({
branchId: currentBranchEmployee,
pageSize: 999,
+ passport: true,
+ visa: true,
});
currentBtnOpen.map((v, i) => {
@@ -620,7 +615,7 @@ onMounted(async () => {
{
"
@history="(item) => {}"
@view="
- async (item) => {
+ (item) => {
employeeFormState.drawerModal = true;
//employeeFormState.isEmployeeEdit = true;
employeeFormStore.assignFormDataEmployee(item.id);
- await fetchImageList(
- item.id,
- item.selectedImage || '',
- 'employee',
- );
}
"
/>
@@ -678,11 +668,9 @@ onMounted(async () => {
? `${props.row.addressEN || ''} ${props.row.subDistrict?.nameEN || ''} ${props.row.district?.nameEN || ''} ${props.row.province?.nameEN || ''}`
: `${props.row.address || ''} ${props.row.subDistrict?.name || ''} ${props.row.district?.name || ''} ${props.row.province?.name || ''}`,
telephone: props.row.telephoneNo,
- businessTypePure: props.row.businessType
- ? props.row.businessType[
- $i18n.locale === 'eng' ? 'nameEN' : 'name'
- ]
- : '-',
+ businessTypePure: useOptionStore().mapOption(
+ props.row.businessType,
+ ),
totalEmployee: props.row._count?.employee,
}"
:visible-columns="branchFieldSelected"
@@ -771,10 +759,7 @@ onMounted(async () => {
/>
{
-
-
- {{ $t('general.all') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ (typeof v === 'string' ? (prefixName = v) : '')
"
@clear="prefixName = ''"
- :rules="[(val: string) => !!val || $t('form.error.required')]"
>
@@ -385,11 +393,11 @@ watch(
:readonly="readonly"
:disable="!readonly"
class="col-md-2 col-6"
- label="Prefix"
+ label="Title"
:model-value="
readonly
- ? prefixName.toUpperCase() || '-'
- : prefixName.toUpperCase() || ''
+ ? capitalize(prefixName || '') || '-'
+ : capitalize(prefixName || '')
"
@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 dbb57c80..d31d3889 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormBasicInfo.vue
@@ -2,7 +2,6 @@
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<{
@@ -103,13 +102,7 @@ const telephoneNo = defineModel('telephoneNo', { default: '' });
class="col-md-6"
:readonly
:disabled="
- !isRoleInclude([
- 'admin',
- 'system',
- 'head_of_admin',
- 'executive',
- 'accountant',
- ]) && !readonly
+ !isRoleInclude(['admin', 'system', 'head_of_admin']) && !readonly
"
:label="$t('customer.form.registeredBranch')"
select-first-value
@@ -143,10 +136,15 @@ const telephoneNo = defineModel('telephoneNo', { default: '' });
for="input-tax"
v-model="legalPersonNo"
/>
-
@@ -175,10 +173,15 @@ const telephoneNo = defineModel