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

fix(organization):show draft or current

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-01-06 10:23:56 +07:00
parent 71f22247e8
commit f1e12f8b8d
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/02_organization/components/DialogHistoryPos.vue
View file

@ -154,7 +154,7 @@ const baseColumns = ref<QTableProps["columns"]>([
field: "lastUpdatedAt", field: "lastUpdatedAt",
sortable: false, sortable: false,
format(val) { format(val) {
return date2Thai(val); return date2Thai(val, true, true);
}, },
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
@ -265,15 +265,17 @@ watch(
<q-td v-for="col in props.cols" :key="col.name" :props="props"> <q-td v-for="col in props.cols" :key="col.name" :props="props">
<div v-if="col.name == 'no'"> <div v-if="col.name == 'no'">
{{ {{
store.typeOrganizational === "current" || historyType === "OWNER_HISTORY"
(store.typeOrganizational === "draft" &&
historyType === "OWNER_HISTORY")
? props.rowIndex + 1 ? props.rowIndex + 1
: props.rowIndex + 1 == 1 : props.rowIndex + 1 == 1 &&
(store.typeOrganizational === "draft" ||
store.typeOrganizational === "old")
? "1 (แบบร่าง)" ? "1 (แบบร่าง)"
: props.rowIndex + 1 == 2 : props.rowIndex + 1 == 2 &&
(store.typeOrganizational === "draft" ||
store.typeOrganizational === "old")
? "2 (ปัจจุบัน)" ? "2 (ปัจจุบัน)"
: props.rowIndex + 1 : props.rowIndex + 1
}} }}
</div> </div>