hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice_dev' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-02-12 09:31:18 +07:00
commit 2a7051f5f6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/04_registry/components/Education.vue
View file

@ -38,7 +38,7 @@
}} }}
</div> </div>
<div v-else-if="col.name == 'finishDate'" class="table_ellipsis"> <div v-else-if="col.name == 'finishDate'" class="table_ellipsis">
{{ date2Thai(col.value) }} {{ col.value ? date2Thai(col.value) : "-" }}
</div> </div>
<div v-else-if="col.name == 'isEducation'" class="table_ellipsis"> <div v-else-if="col.name == 'isEducation'" class="table_ellipsis">
{{ col.value ? "ใช่" : "ไม่ใช่" }} {{ col.value ? "ใช่" : "ไม่ใช่" }}
@ -1138,7 +1138,7 @@ const fetchData = async () => {
other: e.other ? e.other : "-", other: e.other ? e.other : "-",
fundName: e.fundName, fundName: e.fundName,
isDate: e.isDate == null ? null : e.isDate.toString(), isDate: e.isDate == null ? null : e.isDate.toString(),
finishDate: e.finishDate ? new Date(e.finishDate) : "-", finishDate: e.finishDate ? new Date(e.finishDate) : null,
startDate: new Date(e.startDate).getFullYear(), startDate: new Date(e.startDate).getFullYear(),
endDate: new Date(e.endDate).getFullYear(), endDate: new Date(e.endDate).getFullYear(),
startDate2: new Date(e.startDate), startDate2: new Date(e.startDate),
@ -1194,7 +1194,7 @@ const getData = () => {
durationYear.value = row.durationYear; durationYear.value = row.durationYear;
other.value = row.other; other.value = row.other;
fundName.value = row.fundName; fundName.value = row.fundName;
finishDate.value = row.finishDate; finishDate.value = row.finishDate ? row.finishDate : null;
isDate.value = row.isDate; isDate.value = row.isDate;
startDate.value = row.startDate; startDate.value = row.startDate;
endDate.value = row.endDate; endDate.value = row.endDate;
@ -1425,7 +1425,7 @@ const selectData = async (_props: DataProps) => {
durationYear.value = _props.row.durationYear; durationYear.value = _props.row.durationYear;
other.value = _props.row.other; other.value = _props.row.other;
fundName.value = _props.row.fundName; fundName.value = _props.row.fundName;
finishDate.value = _props.row.finishDate; finishDate.value = _props.row.finishDate ? _props.row.finishDate : null;
isDate.value = _props.row.isDate; isDate.value = _props.row.isDate;
startDate.value = _props.row.startDate; startDate.value = _props.row.startDate;
endDate.value = _props.row.endDate; endDate.value = _props.row.endDate;