Merge branch 'develop' into dev

src/api/00_dashboard/api.message.ts

@@ -5,13 +5,14 @@ import env from "../index";
 
 const message = `${env.API_URI}/message`;
 const reply = `${env.API_URI}/placement/noti`;
+const placementMessage = `${env.API_URI}/placement/message`;
 
 export default {
-  msgNotificate: `${message}/my-notifications`,
+  msgNotificate: `${placementMessage}/my-notifications`,
-  msgInbox: `${message}/my-inboxes`,
+  msgInbox: `${placementMessage}/my-inboxes`,
-  msgId: (id: string) => `${message}/my-notifications/${id}`,
+  msgId: (id: string) => `${placementMessage}/my-notifications/${id}`,
-  msgNoread: () => `${message}/my-notifications/noread`,
+  msgNoread: () => `${placementMessage}/my-notifications/noread`,
-  msgInboxDelete: (id: string) => `${message}/my-inboxes/${id}`,
+  msgInboxDelete: (id: string) => `${placementMessage}/my-inboxes/${id}`,
 
   replyMessage: (id: string) => `${reply}/${id}`,
   msgNotiAdmin: `${env.API_URI}/org/profile/noti-admin`,

src/api/manage/api.holiday.ts

@@ -4,20 +4,21 @@
  */
 import env from "../index";
 const holiday = `${env.API_URI}/metadata/holiday/`;
+const leaveHoliday = `${env.API_URI}/leave/metadata/holiday/`;
 
 export default {
   /**
    * api ชั้นเครื่องราชฯ
    */
   listHolidayHistoryAdd: (category: string) =>
-    `${holiday}range/add/${category}`,
+    `${leaveHoliday}range/add/${category}`,
   listHolidayHistoryEdit: (category: string) =>
-    `${holiday}range/edit/${category}`,
+    `${leaveHoliday}range/edit/${category}`,
   listHolidayHistoryDelete: (category: string) =>
-    `${holiday}range/delete/${category}`,
+    `${leaveHoliday}range/delete/${category}`,
-  listHolidayHistoryYear: (year: number) => `${holiday}${year}`,
+  listHolidayHistoryYear: (year: number) => `${leaveHoliday}${year}`,
   listHolidayHistoryYearMonth: (year: number, month: number) =>
-    `${holiday}${year}/${month}`,
+    `${leaveHoliday}${year}/${month}`,
-  listHolidayCopy: `${holiday}copy`,
+  listHolidayCopy: `${leaveHoliday}copy`,
-  summaryHolidayHistoryYear: (year: number) => `${holiday}summary/${year}`,
+  summaryHolidayHistoryYear: (year: number) => `${leaveHoliday}summary/${year}`,
 };

src/modules/02_users/views/03_permissionsView.vue

@@ -477,15 +477,10 @@ watch([() => reqMaster.pageSize], () => {
   fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
 });
 
-/** callblck function ทำการ fetch ข้อมูล Table เมื่อมีการเปลี่ยนจำนวนต่อแแแถว*/
+function isUpload() {
-watch(
+  reqMaster.page = 1;
-  () => [reqMaster.isAll, reqMaster.isBlank],
+  fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
-  () => {
+}
-    reqMaster.page = 1;
-
-    fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
-  }
-);
 
 onMounted(() => {
   fetchOrganizationActive();
@@ -630,6 +625,7 @@ onMounted(() => {
                       v-model="reqMaster.isBlank"
                       label="แสดงเฉพาะตำแหน่งว่าง"
                       color="primary"
+                      @update:model-value="isUpload"
                     >
                       <q-tooltip>แสดงเฉพาะตำแหน่งว่าง</q-tooltip>
                     </q-checkbox>
@@ -642,6 +638,7 @@ onMounted(() => {
                       v-model="reqMaster.isAll"
                       label="แสดงตำแหน่งทั้งหมด"
                       color="primary"
+                      @update:model-value="isUpload"
                     >
                       <q-tooltip
                         >แสดงตำแหน่งทั้งหมดภายใต้หน่วยงาน/ส่วนราชการที่เลือก</q-tooltip