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

feat: update importNationality to support multiple selections and adjust related logic

Browse source
This commit is contained in:
puriphatt 2025-04-24 17:58:48 +07:00
parent 5c12bcbab7
commit dfc17e9623
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pages/02_personnel-management/MainPage.vue
View file

@ -99,7 +99,7 @@ const userFileList = ref<{ name: string; url: string }[]>([]);
const typeStats = ref<UserTypeStats>();
const userStats = ref<BranchUserStats[]>();
const searchDate = ref<Date[]>([]);
const searchDate = ref<[]>([]);
const urlProfile = ref<string>();
const profileFileImg = ref<File | null>(null);
@ -126,7 +126,7 @@ const defaultFormData = {
streetEN: '',
street: '',
trainingPlace: null,
importNationality: null,
importNationality: [],
sourceNationality: null,
licenseExpireDate: null,
licenseIssueDate: null,
@ -178,7 +178,7 @@ const formData = ref<UserCreate>({
streetEN: '',
street: '',
trainingPlace: null,
importNationality: null,
importNationality: [],
sourceNationality: null,
licenseExpireDate: null,
licenseIssueDate: null,
@ -555,6 +555,7 @@ async function triggerChangeStatus(id: string, status: string) {
async function assignFormData(idEdit: string) {
if (!userData.value) return;
const foundUser = userData.value.result.find((user) => user.id === idEdit);
console.log(foundUser);
if (foundUser) {
currentUser.value = foundUser;
@ -576,7 +577,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,
@ -750,7 +754,7 @@ 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;