refactor: time problem
This commit is contained in:
parent
5775c9d5f1
commit
d060ae5f92
3 changed files with 11 additions and 7 deletions
|
|
@ -16,7 +16,11 @@ const props = defineProps<{
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
function valueUpdate(value: string) {
|
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) {
|
if (value.length === 10) {
|
||||||
const _date = parseAndFormatDate(value, i18n.locale.value);
|
const _date = parseAndFormatDate(value, i18n.locale.value);
|
||||||
|
|
@ -43,8 +47,6 @@ function valueUpdate(value: string) {
|
||||||
} else {
|
} else {
|
||||||
model.value = _date;
|
model.value = _date;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
model.value = model.value;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -828,7 +828,6 @@ export const useEmployeeForm = defineStore('form-employee', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
currentFromDataEmployee.value = structuredClone(resetEmployeeData);
|
currentFromDataEmployee.value = structuredClone(resetEmployeeData);
|
||||||
|
|
||||||
const foundBranch = await customerStore.fetchListCustomeBranchById(
|
const foundBranch = await customerStore.fetchListCustomeBranchById(
|
||||||
playlond.customerBranchId,
|
playlond.customerBranchId,
|
||||||
);
|
);
|
||||||
|
|
@ -843,7 +842,10 @@ export const useEmployeeForm = defineStore('form-employee', () => {
|
||||||
|
|
||||||
state.value.formDataEmployeeOwner = { ...foundBranch };
|
state.value.formDataEmployeeOwner = { ...foundBranch };
|
||||||
|
|
||||||
if (foundBranch.address === playlond.address) {
|
if (
|
||||||
|
foundBranch.address === playlond.address &&
|
||||||
|
foundBranch.zipCode === playlond.zipCode
|
||||||
|
) {
|
||||||
state.value.formDataEmployeeSameAddr = true;
|
state.value.formDataEmployeeSameAddr = true;
|
||||||
} else {
|
} else {
|
||||||
state.value.formDataEmployeeSameAddr = false;
|
state.value.formDataEmployeeSameAddr = false;
|
||||||
|
|
|
||||||
|
|
@ -115,9 +115,9 @@ export function parseAndFormatDate(
|
||||||
|
|
||||||
if (locale === 'th-th') {
|
if (locale === 'th-th') {
|
||||||
const adjustedYear = Number(year) - 543;
|
const adjustedYear = Number(year) - 543;
|
||||||
return new Date(`${month}/${date}/${adjustedYear}`);
|
return new Date(`${month}/${date}/${adjustedYear}T00:00.000Z`);
|
||||||
} else {
|
} else {
|
||||||
return new Date(`${month}/${date}/${year}`);
|
return new Date(`${month}/${date}/${year}T00:00.000Z`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue