feat: agency personnel foreign address
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 5s
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 5s
This commit is contained in:
parent
7f56a6219a
commit
cdb38e301e
6 changed files with 323 additions and 36 deletions
|
|
@ -157,6 +157,14 @@ const defaultFormData = {
|
|||
contactTel: '',
|
||||
remark: '',
|
||||
agencyStatus: '',
|
||||
addressForeign: false,
|
||||
provinceText: null,
|
||||
districtText: null,
|
||||
subDistrictText: null,
|
||||
provinceTextEN: null,
|
||||
districtTextEN: null,
|
||||
subDistrictTextEN: null,
|
||||
zipCodeText: null,
|
||||
};
|
||||
|
||||
const formData = ref<UserCreate>({
|
||||
|
|
@ -209,6 +217,14 @@ const formData = ref<UserCreate>({
|
|||
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 }[]>([
|
||||
|
|
@ -431,6 +447,28 @@ 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);
|
||||
|
|
@ -462,7 +500,31 @@ 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,
|
||||
);
|
||||
|
||||
|
|
@ -560,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,
|
||||
|
|
@ -619,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'
|
||||
|
|
@ -745,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;
|
||||
|
|
@ -1813,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"
|
||||
/>
|
||||
<FormByType
|
||||
|
|
@ -2042,8 +2131,13 @@ 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"
|
||||
prefix-id="drawer-info-personnel"
|
||||
dense
|
||||
:use-foreign-address="formData.userType === 'AGENCY'"
|
||||
class="q-mb-xl"
|
||||
/>
|
||||
<FormByType
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue