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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m1s
Details

Browse source 
* develop:
  fix: rootId to orgRootDnaId
This commit is contained in:
Warunee Tamkoo 2026-01-28 23:41:29 +07:00
commit cf9af60c2e
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/03_logs/components/LogTable.vue
View file

@ -235,7 +235,7 @@ async function selectedOrg(id: string) {
endDate: new Date(endDate.value) ?? undefined, endDate: new Date(endDate.value) ?? undefined,
searchStatus: searchStatus.value ?? undefined, searchStatus: searchStatus.value ?? undefined,
}, },
true true,
); );
} }
@ -272,7 +272,7 @@ async function fatchOrg(id: string) {
nodeTree.value = data; nodeTree.value = data;
searchAfter.value = undefined; searchAfter.value = undefined;
if (data.length === 1) { if (data.length === 1) {
selectedOrg(data[0].orgTreeId); selectedOrg(data[0].orgRootDnaId);
} else { } else {
await storeData.fetchLog({ await storeData.fetchLog({
size: size.value, size: size.value,
@ -298,7 +298,7 @@ function handleScroll() {
if ( if (
Math.abs( Math.abs(
element.scrollHeight - element.clientHeight - element.scrollTop element.scrollHeight - element.clientHeight - element.scrollTop,
) <= 1 ) <= 1
) { ) {
scrollFlag = true; scrollFlag = true;
@ -314,7 +314,7 @@ function handleScroll() {
endDate: new Date(endDate.value) ?? undefined, endDate: new Date(endDate.value) ?? undefined,
searchStatus: searchStatus.value ?? undefined, searchStatus: searchStatus.value ?? undefined,
}, },
true true,
); );
await new Promise((resolve) => setTimeout(resolve, 1000)); await new Promise((resolve) => setTimeout(resolve, 1000));
scrollFlag = false; scrollFlag = false;
@ -350,7 +350,7 @@ function selectedDate() {
startDate: new Date(startDate.value), startDate: new Date(startDate.value),
endDate: new Date(endDate.value), endDate: new Date(endDate.value),
}, },
true true,
); );
} }
@ -395,7 +395,7 @@ function onItemClick(labal: string, type: string) {
endOfDay ? 23 : 0, endOfDay ? 23 : 0,
endOfDay ? 59 : 0, endOfDay ? 59 : 0,
endOfDay ? 59 : 0, endOfDay ? 59 : 0,
endOfDay ? 999 : 0 endOfDay ? 999 : 0,
); );
return date.toISOString(); return date.toISOString();
}; };
@ -474,7 +474,7 @@ async function downloadTxt() {
if (currentlogData.value?.id) { if (currentlogData.value?.id) {
await generateTxt( await generateTxt(
currentlogData.value?.id, currentlogData.value?.id,
`LOG_${date2Thai(new Date(startDate.value))}` `LOG_${date2Thai(new Date(startDate.value))}`,
); );
} }
} }
@ -520,9 +520,9 @@ onMounted(async () => {
<q-item <q-item
clickable clickable
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list" class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
:active="qureyBody.rootId == prop.node.orgTreeId" :active="qureyBody.rootId == prop.node.orgRootDnaId"
active-class="my-list-link text-primary text-weight-medium" active-class="my-list-link text-primary text-weight-medium"
@click.stop="selectedOrg(prop.node.orgTreeId)" @click.stop="selectedOrg(prop.node.orgRootDnaId)"
> >
<div> <div>
<div class="text-weight-medium"> <div class="text-weight-medium">
@ -560,7 +560,7 @@ onMounted(async () => {
<q-list> <q-list>
<q-item <q-item
dense dense
v-for="(item, index) in itemsDropdown" v-for="item in itemsDropdown"
clickable clickable
v-close-popup v-close-popup
@click="onItemClick(item.labal, item.val)" @click="onItemClick(item.labal, item.val)"
@ -928,7 +928,7 @@ onMounted(async () => {
style="max-width: 100%" style="max-width: 100%"
> >
<div style="border: #f0ecec 1px solid; border-radius: 7px"> <div style="border: #f0ecec 1px solid; border-radius: 7px">
<template :key="key" v-for="(item, key, index) in currentlogData"> <template :key="key" v-for="(item, key) in currentlogData">
<div <div
class="col row row-color" class="col row row-color"
style="border-bottom: #f0ecec 1px solid" style="border-bottom: #f0ecec 1px solid"
@ -994,7 +994,7 @@ onMounted(async () => {
<div class="col q-pr-md" v-else-if="key === 'sequence'"> <div class="col q-pr-md" v-else-if="key === 'sequence'">
<div v-for="(row, index) in item"> <div v-for="(row, index) in item">
<div class="text-subtitle1 text-bold"> <div class="text-subtitle1 text-bold">
ลำดับที่ {{ index + 1 }} ลำดับที่ {{ Number(index) + 1 }}
</div> </div>
<div <div
class="q-pa-md q-mb-md" class="q-pa-md q-mb-md"