chamomind/jws-frontend
chamomind/jws-frontend
7
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

feat: business type is now from api
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
Details

Browse source
This commit is contained in:
Methapon2001 2025-07-11 10:45:33 +07:00
parent 30d2126161
commit 577da39cf0
6 changed files with 35 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/shared/select/SelectBusinessType.vue
View file

@ -27,6 +27,7 @@ defineEmits<{
}>();
type ExclusiveProps = {
lang?: string;
codeOnly?: boolean;
selectFirstValue?: boolean;
branchVirtual?: boolean;
@ -92,7 +93,7 @@ function setDefaultValue() {
>
<template #selected-item="{ opt }">
{{
$i18n.locale === 'tha'
(lang ?? $i18n.locale) !== 'eng'
? opt.name + ' ' + opt.name
: opt.nameEN + ' ' + opt.nameEN
}}
@ -102,7 +103,7 @@ function setDefaultValue() {
<q-item v-bind="scope.itemProps">
<span class="row items-center">
{{
$i18n.locale === 'tha'
(lang ?? $i18n.locale) !== 'eng'
? opt.name + ' ' + opt.name
: opt.nameEN + ' ' + opt.nameEN
}}

21
src/pages/03_customer-management/MainPage.vue
View file

@ -1266,24 +1266,15 @@ const emptyCreateDialog = ref(false);
class="ellipsis"
>
{{
props.row.branch.length !== 0
? props.row.branch[0].businessType !== null
? optionStore.mapOption(
props.row.branch[0].businessType,
)
: ''
: '-'
props.row.branch[0].businessType[
$i18n.locale === 'eng' ? 'nameEN' : 'name'
]
}}
<q-tooltip>
{{
props.row.branch.length !== 0
? props.row.branch[0].businessType !== null
? optionStore.mapOption(
props.row.branch[0].businessType,
)
: ''
: '-'
props.row.branch[0].businessType[
$i18n.locale === 'eng' ? 'nameEN' : 'name'
]
}}
</q-tooltip>
</q-td>

2
src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
View file

@ -158,7 +158,7 @@ withDefaults(
outlined
:prefix-id="prefixId || 'employer'"
:readonly="readonly"
v-model:bussiness-type="item.businessType"
v-model:business-type-id="item.businessTypeId"
v-model:job-position="item.jobPosition"
v-model:job-description="item.jobDescription"
v-model:pay-date="item.payDate"

90
src/pages/03_customer-management/components/employer/EmployerFormBusiness.vue
View file

@ -8,12 +8,13 @@ import { onMounted, watch } from 'vue';
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import ThaiBahtText from 'thai-baht-text';
import SelectBusinessType from 'src/components/shared/select/SelectBusinessType.vue';
const { locale } = useI18n({ useScope: 'global' });
const rawOption = ref();
const bussinessType = defineModel<string>('bussinessType');
const businessTypeId = defineModel<string>('businessTypeId');
const jobPosition = defineModel<string>('jobPosition');
const jobDescription = defineModel<string>('jobDescription');
const payDate = defineModel<string>('payDate');
@ -40,32 +41,16 @@ defineProps<{
onMounted(async () => {
const resultOption = await fetch('/option/option.json');
rawOption.value = await resultOption.json();
typeBusinessENOption.value = rawOption.value.eng.businessType;
jobPositionENOption.value = rawOption.value.eng.position;
if (locale.value === 'eng') {
typeBusinessOption.value = rawOption.value.eng.businessType;
jobPositionOption.value = rawOption.value.eng.position;
}
if (locale.value === 'tha') {
typeBusinessOption.value = rawOption.value.tha.businessType;
jobPositionOption.value = rawOption.value.tha.position;
}
});
watch([typeBusinessOption, typeBusinessENOption], () => {
typeBusinessFilter = selectFilterOptionRefMod(
typeBusinessOption,
typeBusinessOptions,
'label',
);
typeBusinessENFilter = selectFilterOptionRefMod(
typeBusinessENOption,
typeBusinessENOptions,
'label',
);
});
watch(
() => rate.value,
(newValue) => {
@ -135,69 +120,18 @@ let jobPositionENFilter = selectFilterOptionRefMod(
<span>{{ $t('customerBranch.tab.business') }}</span>
</div>
<q-select
outlined
clearable
use-input
fill-input
emit-value
map-options
hide-selected
hide-bottom-space
:hide-dropdown-icon="readonly"
input-debounce="0"
option-value="value"
option-label="label"
v-model="bussinessType"
<SelectBusinessType
class="col-md-6 col-12"
:dense="dense"
:readonly="readonly"
:label="$t('customer.form.businessType')"
:options="typeBusinessOptions"
:for="`${prefixId}-select-business-type`"
@filter="typeBusinessFilter"
:rules="[(val: string) => !!val || $t('form.error.required')]"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
{{ $t('general.noData') }}
</q-item-section>
</q-item>
</template>
</q-select>
<q-select
:for="`${prefixId}-input-bussiness-type-en`"
:id="`${prefixId}-input-bussiness-type-en`"
:label="`${$t('customer.form.businessType')} (EN)`"
outlined
clearable
use-input
fill-input
emit-value
map-options
hide-selected
hide-bottom-space
:hide-dropdown-icon="readonly"
input-debounce="0"
option-value="value"
option-label="label"
v-model="bussinessType"
v-model:value="businessTypeId"
:readonly
lang="tha"
/>
<SelectBusinessType
class="col-md-6 col-12"
:dense="dense"
:readonly="readonly"
:options="typeBusinessENOptions"
@filter="typeBusinessENFilter"
:rules="[(val: string) => !!val || $t('form.error.required')]"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
{{ $t('general.noData') }}
</q-item-section>
</q-item>
</template>
</q-select>
v-model:value="businessTypeId"
lang="eng"
:readonly
/>
<q-select
outlined

12
src/pages/03_customer-management/form.ts
View file

@ -34,7 +34,7 @@ export const useCustomerForm = defineStore('form-customer', () => {
[key: string]: (keyof CustomerBranchCreate)[];
}>({
main: [],
business: ['businessType', 'jobPosition'],
business: ['businessTypeId', 'jobPosition'],
address: [
'address',
'addressEN',
@ -181,7 +181,7 @@ export const useCustomerForm = defineStore('form-customer', () => {
payDate: v.payDate,
jobDescription: v.jobDescription,
jobPosition: v.jobPosition,
businessType: v.businessType,
businessTypeId: v.businessTypeId,
employmentOffice: v.employmentOffice,
employmentOfficeEN: v.employmentOfficeEN,
telephoneNo: v.telephoneNo,
@ -289,8 +289,8 @@ export const useCustomerForm = defineStore('form-customer', () => {
birthDate:
currentFormData.value.customerBranch?.at(0)?.birthDate || undefined,
businessType:
currentFormData.value.customerBranch?.at(0)?.businessType || '',
businessTypeId:
currentFormData.value.customerBranch?.at(0)?.businessTypeId || '',
jobPosition:
currentFormData.value.customerBranch?.at(0)?.jobPosition || '',
jobDescription:
@ -538,7 +538,7 @@ export const useCustomerBranchForm = defineStore('form-customer-branch', () => {
gender: '',
birthDate: undefined,
businessType: '',
businessTypeId: '',
jobPosition: '',
jobDescription: '',
payDate: '',
@ -619,7 +619,7 @@ export const useCustomerBranchForm = defineStore('form-customer-branch', () => {
payDateEN: _data.payDateEN,
jobDescription: _data.jobDescription,
jobPosition: _data.jobPosition,
businessType: _data.businessType,
businessTypeId: _data.businessTypeId,
employmentOffice: _data.employmentOffice,
employmentOfficeEN: _data.employmentOfficeEN,
telephoneNo: _data.telephoneNo,

9
src/stores/customer/types.ts
View file

@ -34,7 +34,12 @@ export type CustomerBranch = {
payDate: string;
jobDescription: string;
jobPosition: string;
businessType: string;
businessTypeId: string;
businessType?: {
id: string;
name: string;
nameEN: string;
};
agentUserId: string;
contactName: string;
@ -107,7 +112,7 @@ export type CustomerBranchCreate = {
telephoneNo?: string;
gender?: string;
birthDate?: string;
businessType: string;
businessTypeId: string;
jobPosition: string;
jobDescription: string;
payDate?: string;