Compare commits

...

12 commits
v1.1.7 ... dev

Author SHA1 Message Date
6bb19e16d6 Merge branch 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m21s
* 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin:
2026-06-25 21:54:30 +07:00
3e05ba5dde Merge branch 'develop' into dev
* develop:
  fix ui noti
  fix
  refactor(notification): update icon and text display
  feat(notification): add delete notification feature
  fix
  refactor(responsibilities):  table hide-bottom
  refactor(permission): display positionIsSelected
2026-06-25 21:54:25 +07:00
2e84247ae6 fix ui noti 2026-06-25 21:54:13 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
fc5aa31b35 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m59s
2026-06-23 16:21:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e00d3aaddb fix 2026-06-23 16:21:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
26d00e58d5 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m59s
2026-06-23 15:57:42 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
fc273ad5a2 refactor(notification): update icon and text display 2026-06-23 15:57:21 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3195be48e2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m59s
2026-06-23 14:21:12 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
59355bd368 feat(notification): add delete notification feature 2026-06-23 14:20:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5511ded611 Merge branch 'develop' into dev 2026-06-16 14:04:41 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
9c43137034 fix 2026-06-16 14:04:30 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
215124bb59 refactor(responsibilities): table hide-bottom 2026-06-16 14:03:58 +07:00
2 changed files with 36 additions and 2 deletions

View file

@ -758,7 +758,6 @@ onMounted(async () => {
table-class="text-grey-9" table-class="text-grey-9"
row-key="id" row-key="id"
dense dense
hide-bottom
bordered bordered
separator="vertical" separator="vertical"
class="custom-header-table-expand" class="custom-header-table-expand"

View file

@ -114,7 +114,7 @@ async function getDataNotification(index: number, type: string) {
.get(config.API.msgNotificate + `?page=${index}&pageSize=${15}`) .get(config.API.msgNotificate + `?page=${index}&pageSize=${15}`)
.then((res) => { .then((res) => {
const response = res.data.result.data; const response = res.data.result.data;
totalInbox.value = res.data.result.total; totalInbox.value = res.data.result.total || 0;
let list: notiType[] = []; let list: notiType[] = [];
if (type === "DEL") { if (type === "DEL") {
notiList.value = []; notiList.value = [];
@ -405,6 +405,26 @@ onBeforeMount(async () => {
} }
}); });
function handleDeleteNotification() {
dialogRemove(
$q,
async () => {
try {
showLoader();
await http.delete(config.API.msgNotificate);
await getDataNotification(1, "DEL");
success($q, "ลบข้อมูลสำเร็จ");
} catch (error) {
messageError($q, error);
} finally {
hideLoader();
}
},
"ยืนยันการล้างการแจ้งเตือนทั้งหมด",
`ต้องการล้างการแจ้งเตือนทั้งหมด (${totalInbox.value} รายการ) ใช่หรือไม่? การกระทำนี้ไม่สามารถย้อนกลับได้`,
);
}
/** /**
* เมอเรมตนโปรแกรมให event resize และ function myEventHandler * เมอเรมตนโปรแกรมให event resize และ function myEventHandler
* set function myEventHandler เพราะ state งไมเซ , state เซทเม หนาจอเร ขยบหนาจอ * set function myEventHandler เพราะ state งไมเซ , state เซทเม หนาจอเร ขยบหนาจอ
@ -510,6 +530,21 @@ onUnmounted(() => {
<div class="text-grey-5" style="font-size: 12px"> <div class="text-grey-5" style="font-size: 12px">
งหมด {{ totalInbox }} อความ งหมด {{ totalInbox }} อความ
</div> </div>
<q-btn
v-if="totalInbox !== 0"
flat
dense
no-caps
size="12px"
color="red-7"
icon="mdi-trash-can-outline"
label="ล้างทั้งหมด"
class="q-ml-sm"
aria-label="ล้างการแจ้งเตือนทั้งหมด"
@click.stop.prevent="handleDeleteNotification"
>
<q-tooltip>างการแจงเตอนทงหมด</q-tooltip>
</q-btn>
</div> </div>
<q-infinite-scroll <q-infinite-scroll