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

refactor: handle date can is null

Browse source
This commit is contained in:
Thanaphon Frappet 2024-12-11 15:35:20 +07:00
parent 04187c0594
commit c48e3e3657
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/01_branch-management/FormBranchInformation.vue
View file

@ -13,8 +13,8 @@ const nameEN = defineModel<string>('nameEn');
const typeBranch = defineModel<string>('typeBranch'); const typeBranch = defineModel<string>('typeBranch');
const virtual = defineModel<boolean>('virtual'); const virtual = defineModel<boolean>('virtual');
const permitExpireDate = defineModel<Date>('permitExpireDate'); const permitExpireDate = defineModel<Date | null>('permitExpireDate');
const permitIssueDate = defineModel<Date>('permitIssueDate'); const permitIssueDate = defineModel<Date | null>('permitIssueDate');
const permitNo = defineModel<string>('permitNo'); const permitNo = defineModel<string>('permitNo');
defineProps<{ defineProps<{

14
src/pages/01_branch-management/MainPage.vue
View file

@ -465,8 +465,10 @@ async function fetchBranchById(id: string) {
street: res.street, street: res.street,
streetEN: res.streetEN, streetEN: res.streetEN,
permitExpireDate: new Date(res.permitExpireDate), permitExpireDate:
permitIssueDate: new Date(res.permitIssueDate), res.permitExpireDate === null ? null : new Date(res.permitExpireDate),
permitIssueDate:
res.permitIssueDate === null ? null : new Date(res.permitIssueDate),
permitNo: res.permitNo, permitNo: res.permitNo,
}; };
return res; return res;
@ -756,6 +758,14 @@ async function onSubmit(submitSelectedItem?: boolean) {
currentEdit.value.id, currentEdit.value.id,
{ {
...formData.value, ...formData.value,
permitExpireDate:
formData.value.permitExpireDate === undefined
? null
: formData.value.permitExpireDate,
permitIssueDate:
formData.value.permitIssueDate === undefined
? null
: formData.value.permitIssueDate,
status: undefined, status: undefined,
}, },
qrCodeFile.value, qrCodeFile.value,