From 7ac582d451152f4ebd1537bf2c3884fbc49877f6 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 29 May 2025 17:54:41 +0700 Subject: [PATCH] update api path insignia --- src/api/07_insignia/api.insignia.ts | 33 +++++++----- .../07_insignia/components/2_Manage/Tab4.vue | 2 +- src/modules/07_insignia/store.ts | 4 +- .../07_insignia/views/02_ManageMain.vue | 21 ++++---- .../07_insignia/views/08_ManageEmpMain.vue | 54 +++++++++++++------ 5 files changed, 72 insertions(+), 42 deletions(-) diff --git a/src/api/07_insignia/api.insignia.ts b/src/api/07_insignia/api.insignia.ts index 83b1d84b6..4351ce912 100644 --- a/src/api/07_insignia/api.insignia.ts +++ b/src/api/07_insignia/api.insignia.ts @@ -32,11 +32,11 @@ export default { insigniaDelete: (profileId: string) => `${insignia}/request/status/delete/${profileId}`, insigniaEdit: (profileId: string) => `${insignia}/request/${profileId}`, - insigniaNosend: (insigniaPeriodId: any) => - `${insignia}/request/org/no-send/${insigniaPeriodId}`, + insigniaNosend: (insigniaPeriodId: any, type: string = "officer") => + `${insignia}/request/org/no-send/${type}/${insigniaPeriodId}`, insigniaAgency: () => `${insignia}/request/agency`, - insigniaDashboard: (insigniaPeriodId: string) => - `${insignia}/request/dashboard/${insigniaPeriodId}`, + insigniaDashboard: (insigniaPeriodId: string, type: string = "officer") => + `${insignia}/request/dashboard/${type}/${insigniaPeriodId}`, // record noteround: () => `${insignia}/request/note`, requestDocNote: (id: string) => `${insignia}/request/note/doc/${id}`, @@ -46,12 +46,21 @@ export default { noteAdd: (insigniaId: string) => `${insignia}/request/note/${insigniaId}`, noteByid: (id: string) => `${insignia}/request/note/${id}`, - insigniaSendToDirector: (roundId: string, ocId: string) => - `${insignia}/request/officer/approve/${roundId}/${ocId}`, - insigniaDirectorBackToEdit: (roundId: string, ocId: string) => - `${insignia}/request/director/reject/${roundId}/${ocId}`, - insigniaDirectorApproved: (roundId: string, ocId: string) => - `${insignia}/request/director/approve/${roundId}/${ocId}`, + insigniaSendToDirector: ( + roundId: string, + ocId: string, + type: string = "officer" + ) => `${insignia}/request/officer/approve/${type}/${roundId}/${ocId}`, + insigniaDirectorBackToEdit: ( + roundId: string, + ocId: string, + type: string = "officer" + ) => `${insignia}/request/director/reject/${type}/${roundId}/${ocId}`, + insigniaDirectorApproved: ( + roundId: string, + ocId: string, + type: string = "officer" + ) => `${insignia}/request/director/approve/${type}/${roundId}/${ocId}`, insigniaRequestSendNote: (insigniaPeriodId: string) => `${insignia}/request/send/note/${insigniaPeriodId}`, @@ -107,8 +116,8 @@ export default { uploadfileOnlyInsignia: (requestId: string) => `${insignia}/request/upload/${requestId}`, // สกจ. ตีกลับให้หัวหน้าเขต - rejectRequest: (id: string, ocId: string) => - `${insignia}/request/head/reject/${id}/${ocId}`, + rejectRequest: (id: string, ocId: string, type: string = "officer") => + `${insignia}/request/head/reject/${type}/${id}/${ocId}`, reportInsigniaNew: `${insignia}/report`, }; diff --git a/src/modules/07_insignia/components/2_Manage/Tab4.vue b/src/modules/07_insignia/components/2_Manage/Tab4.vue index 3e7637cb7..d8ed73741 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab4.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab4.vue @@ -63,7 +63,7 @@ const pagination = ref({ async function fecthOrg() { showLoader(); await http - .get(config.API.insigniaNosend(props.roundId)) + .get(config.API.insigniaNosend(props.roundId, DataStore.employeeClass)) .then((res) => { let data = res.data.result; rows.value = data.map((e: ResponseNoSend) => ({ diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts index c1b8892f5..9b96761d7 100644 --- a/src/modules/07_insignia/store.ts +++ b/src/modules/07_insignia/store.ts @@ -37,9 +37,9 @@ export const useInsigniaDataStore = defineStore("insignia", () => { const typeinsigniaOptions = ref([ { id: "all", name: "ทั้งหมด" }, ]); - const employeeClass = ref("all"); + const employeeClass = ref("officer"); const employeeClassOps = ref([ - { name: "ทั้งหมด", id: "all" }, + // { name: "ทั้งหมด", id: "all" }, { name: "ข้าราชการ กทม.สามัญ", id: "officer" }, { name: "ลูกจ้างประจำ", id: "perm" }, ]); diff --git a/src/modules/07_insignia/views/02_ManageMain.vue b/src/modules/07_insignia/views/02_ManageMain.vue index 72865ea7e..1f284b5d0 100644 --- a/src/modules/07_insignia/views/02_ManageMain.vue +++ b/src/modules/07_insignia/views/02_ManageMain.vue @@ -234,7 +234,7 @@ async function fecthInsigniaByOc( ocId: string, role: string, status: string, - isDeputy: boolean = false + isDeputy: boolean = DataStore.isDeputy ) { DataStore.rows = []; if (roundId && ocId && role && status) { @@ -424,7 +424,7 @@ function requestSendNote() { } /** - * function อัพเดตข้อมูลคุณสมบัติ + * function อัปเดตข้อมูลคุณสมบัติ */ async function updateDataProperty() { dialogConfirm($q, async () => { @@ -443,7 +443,7 @@ async function updateDataProperty() { "officer", tab.value ); - success($q, "อัพเดตข้อมูลคุณสมบัติสำเร็จ"); + success($q, "อัปเดตข้อมูลคุณสมบัติสำเร็จ"); }) .catch((err) => { messageError($q, err); @@ -538,21 +538,22 @@ onUnmounted(() => { > ล็อกข้อมูล - + - อัพเดตข้อมูลคุณสมบัติ + อัปเดตข้อมูลคุณสมบัติ
diff --git a/src/modules/07_insignia/views/08_ManageEmpMain.vue b/src/modules/07_insignia/views/08_ManageEmpMain.vue index 3b35dc168..954319095 100644 --- a/src/modules/07_insignia/views/08_ManageEmpMain.vue +++ b/src/modules/07_insignia/views/08_ManageEmpMain.vue @@ -110,7 +110,7 @@ async function fecthlistRound() { async function fecthStat(id: string) { if (DataStore.isOfficer) { await http - .get(config.API.insigniaDashboard(id)) + .get(config.API.insigniaDashboard(id, "employee")) .then((res) => { stat.value = res.data.result; }) @@ -234,7 +234,7 @@ async function fecthInsigniaByOc( ocId: string, role: string, status: string, - isDeputy: boolean = false + isDeputy: boolean = DataStore.isDeputy ) { DataStore.rows = []; if (roundId && ocId && role && status) { @@ -280,7 +280,13 @@ function sendToDirector() { dialogConfirm($q, () => { showLoader(); http - .get(config.API.insigniaSendToDirector(round.value, DataStore.agency)) + .get( + config.API.insigniaSendToDirector( + round.value, + DataStore.agency, + "employee" + ) + ) .then(async () => { await fecthStat(round.value); await fecthInsigniaByOc( @@ -323,7 +329,11 @@ function backToEdit(reason: string) { showLoader(); http .put( - config.API.insigniaDirectorBackToEdit(round.value, DataStore.agency), + config.API.insigniaDirectorBackToEdit( + round.value, + DataStore.agency, + "employee" + ), { reason: reason, } @@ -357,7 +367,13 @@ function directorApproved() { () => { showLoader(); http - .get(config.API.insigniaDirectorApproved(round.value, DataStore.agency)) + .get( + config.API.insigniaDirectorApproved( + round.value, + DataStore.agency, + "employee" + ) + ) .then(async () => { await fecthInsigniaByOc( round.value, @@ -385,9 +401,12 @@ function directorApproved() { function backToEditinsignia2Role(reason: string) { dialogConfirm($q, () => { http - .put(config.API.rejectRequest(round.value, DataStore.typeOc), { - reason: reason, - }) + .put( + config.API.rejectRequest(round.value, DataStore.typeOc, "employee"), + { + reason: reason, + } + ) .then(async () => { await fecthInsigniaByOc( round.value, @@ -405,7 +424,7 @@ function backToEditinsignia2Role(reason: string) { } /** - * function อัพเดตข้อมูลคุณสมบัติ + * function อัปเดตข้อมูลคุณสมบัติ */ async function updateDataProperty() { dialogConfirm($q, async () => { @@ -424,7 +443,7 @@ async function updateDataProperty() { "officer", tab.value ); - success($q, "อัพเดตข้อมูลคุณสมบัติสำเร็จ"); + success($q, "อัปเดตข้อมูลคุณสมบัติสำเร็จ"); }) .catch((err) => { messageError($q, err); @@ -504,21 +523,22 @@ onUnmounted(() => { - + - อัพเดตข้อมูลคุณสมบัติ + อัปเดตข้อมูลคุณสมบัติ