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 2023-09-07 10:48:14 +07:00
commit a69a2bbd29
4 changed files with 53 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/04_registry/components/Insignia.vue
View file

@ -23,7 +23,7 @@
@click="selectData(props)"
class="cursor-pointer"
>
<div
<!-- <div
v-if="
col.name == 'receiveDate' ||
col.name == 'dateAnnounce' ||
@ -32,8 +32,8 @@
class="table_ellipsis"
>
{{ col.value == null ? null : date2Thai(col.value) }}
</div>
<div v-else-if="col.name == 'year'" class="table_ellipsis">
</div> -->
<div v-if="col.name == 'year'" class="table_ellipsis">
{{ col.value + 543 }}
</div>
<div v-else class="table_ellipsis">
@ -532,7 +532,7 @@ const checkValidate = ref<boolean>(false); //validate data ผ่านหรื
const profileId = ref<string>(
route.params.id ? route.params.id.toString() : ""
);
const rows = ref<RequestItemsObject[]>([]);
const rows = ref<any>([]);
const filter = ref<string>(""); //search data table
const visibleColumns = ref<String[]>([]);
profileData.insignia.columns.length == 0
@ -550,6 +550,7 @@ profileData.insignia.columns.length == 0
"dateAnnounce",
"refCommandNo",
"refCommandDate",
"createdAt"
])
: (visibleColumns.value = profileData.insignia.columns);
const columns = ref<QTableProps["columns"]>([
@ -961,13 +962,13 @@ const fetchData = async () => {
volume: e.volume,
section: e.section,
page: e.page,
receiveDate: new Date(e.receiveDate),
dateAnnounce: new Date(e.dateAnnounce),
receiveDate: date2Thai(e.receiveDate),
dateAnnounce: date2Thai(e.dateAnnounce),
refCommandNo: e.refCommandNo,
refCommandDate:
e.refCommandDate == null ? null : new Date(e.refCommandDate),
e.refCommandDate == null ? null : date2Thai(e.refCommandDate),
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
createdAt: date2Thai(e.createdAt),
});
});
})