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

refactor: time problem

Browse source
This commit is contained in:
puriphatt 2024-08-22 09:33:17 +07:00
parent 5775c9d5f1
commit d060ae5f92
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/shared/DatePicker.vue
View file

@ -16,7 +16,11 @@ const props = defineProps<{
}>();
function valueUpdate(value: string) {
if (typeof model.value === 'string') model.value = new Date(model.value);
if (props.readonly) return;
if (model.value && !(model.value instanceof Date)) {
model.value = new Date(model.value);
}
if (value.length === 10) {
const _date = parseAndFormatDate(value, i18n.locale.value);
@ -43,8 +47,6 @@ function valueUpdate(value: string) {
} else {
model.value = _date;
}
} else {
model.value = model.value;
}
}
}

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

@ -828,7 +828,6 @@ export const useEmployeeForm = defineStore('form-employee', () => {
};
currentFromDataEmployee.value = structuredClone(resetEmployeeData);
const foundBranch = await customerStore.fetchListCustomeBranchById(
playlond.customerBranchId,
);
@ -843,7 +842,10 @@ export const useEmployeeForm = defineStore('form-employee', () => {
state.value.formDataEmployeeOwner = { ...foundBranch };
if (foundBranch.address === playlond.address) {
if (
foundBranch.address === playlond.address &&
foundBranch.zipCode === playlond.zipCode
) {
state.value.formDataEmployeeSameAddr = true;
} else {
state.value.formDataEmployeeSameAddr = false;

4
src/utils/datetime.ts
View file

@ -115,9 +115,9 @@ export function parseAndFormatDate(
if (locale === 'th-th') {
const adjustedYear = Number(year) - 543;
return new Date(`${month}/${date}/${adjustedYear}`);
return new Date(`${month}/${date}/${adjustedYear}T00:00.000Z`);
} else {
return new Date(`${month}/${date}/${year}`);
return new Date(`${month}/${date}/${year}T00:00.000Z`);
}
}
return null;