From 31d5835223bab5a6d891458e6511df83992503b4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 13 Aug 2025 09:46:50 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=20>>=20=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=88=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B8=87=20=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=88=E0=B8=B3?= =?UTF-8?q?=E0=B8=AF=20(=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B8=A2=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=8A=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=99=E0=B8=87=E0=B8=B2=E0=B8=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/05_salaryListsEmployee/DialogAddPerson.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue index 06a23912f..6ad1b971f 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue @@ -102,7 +102,7 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return `${row.posTypeShort ? row.posTypeShort : ""}${ + return `${row.posTypeShort ? row.posTypeShort : ""} ${ row.posLevel ? row.posLevel : "" }`; }, From ecb8366e4d7b2526a34faac7d8d422e100e774c6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 13 Aug 2025 14:36:46 +0700 Subject: [PATCH 2/2] =?UTF-8?q?[Change=20by=20req.]=20popup=20=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=99=E0=B8=84?= =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B9=83=E0=B8=99=E0=B9=82=E0=B8=84?= =?UTF-8?q?=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3?= =?UTF-8?q?=E0=B8=A5=E0=B8=B1=E0=B8=87=20=E0=B9=81=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B8=A3=E0=B9=88=E0=B8=B2=E0=B8=87=20=E0=B9=83=E0=B8=AB?= =?UTF-8?q?=E0=B9=89=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=95=E0=B8=B3?= =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=E0=B9=83=E0=B8=99?= =?UTF-8?q?=E0=B8=AA=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=9B=E0=B9=87=E0=B8=99=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B9=80?= =?UTF-8?q?=E0=B8=A3=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=95=E0=B9=89=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/02_organization/components/DialogSelectPerson.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/02_organization/components/DialogSelectPerson.vue b/src/modules/02_organization/components/DialogSelectPerson.vue index 8c08e7def..eeec6be61 100644 --- a/src/modules/02_organization/components/DialogSelectPerson.vue +++ b/src/modules/02_organization/components/DialogSelectPerson.vue @@ -93,6 +93,7 @@ const visibleColumnsResult = ref([ "no", "citizenId", "name", + "positionName", "posTypeName", "posLevelName", ]);