diff --git a/src/modules/04_registryPerson/views/listRetire.vue b/src/modules/04_registryPerson/views/listRetire.vue index 892026f57..032f48464 100644 --- a/src/modules/04_registryPerson/views/listRetire.vue +++ b/src/modules/04_registryPerson/views/listRetire.vue @@ -220,7 +220,7 @@ function onclickSearch() { * @param item ประเภทข้าราชการ */ function selectType() { - store.formFilter.isShowRetire = true; + store.formFilter.isShowRetire = false; store.labelOption.retireType = "ทั้งหมด"; store.formFilter.retireType = null; store.formFilter.keyword = ""; @@ -246,6 +246,7 @@ function selectType() { store.formFilter.searchType = "fullName"; } else { // แต่ถ้าประเภทเดิมระบบจะใช้ filter เดิมที่เคยค้นหาไว้ + if ( store.formFilter.keyword != "" || store.labelOption.posType != "ทั้งหมด" ||