diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts index 4f993840f..446aada83 100644 --- a/src/api/11_discipline/api.discipline.ts +++ b/src/api/11_discipline/api.discipline.ts @@ -7,7 +7,12 @@ const appeal = `${env.API_URI}/discipline/complaint_appeal`; const disciplineReport = `${env.API_URI}/discipline/report`; export default { - directorList: (page: number, pageSize: number, keyword: string,path?:string) => + directorList: ( + page: number, + pageSize: number, + keyword: string, + path?: string + ) => `${disciplineMain}/director/${path}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, director: () => `${disciplineMain}/director`, directorbyId: (id: string) => `${disciplineMain}/director/${id}`, @@ -18,33 +23,23 @@ export default { /**ลบ ช่องทางการร้องเรียน * @param id type */ - complaintListOp: (page?:string) => `${disciplineMain}/complaint_Channel/${page}`, + complaintListOp: (page?: string) => + `${disciplineMain}/complaint_Channel/${page}`, complaintChannelbyId: (id: string) => `${disciplineMain}/complaint_Channel/${id}`, complaintAdd: () => `${disciplineMain}/complaint`, complaintbyId: (id: string) => `${disciplineMain}/complaint/${id}`, complaintReject: (id: string) => `${disciplineMain}/complaint/reject/${id}`, complaintResume: (id: string) => `${disciplineMain}/complaint/resume/${id}`, - complaintList: ( - page: number, - pageSize: number, - keyword: string, - status: string - ) => - `${disciplineMain}/complaint?page=${page}&pageSize=${pageSize}&keyword=${keyword}&status=${status}`, + complaintList: () => `${disciplineMain}/complaint/advance-search`, + complaintFileUpload: (id: string) => `${disciplineMain}/complaint/file/${id}`, complaintFileDelete: (id: string, docId: string) => `${disciplineMain}/complaint/file/${id}/${docId}`, complaintApprove: (id: string) => `${disciplineMain}/complaint/approve/${id}`, /** API สืบสวนข้อเท็จจริง*/ - investigateMain: ( - page: number, - pageSize: number, - keyword: string, - status: string - ) => - `${investigate}?page=${page}&pageSize=${pageSize}&keyword=${keyword}&status=${status}`, + investigateMain: () => `${investigate}/advance-search`, investigateById: (id: string) => `${investigate}/${id}`, investigateRelevantUploadFile: (id: string) => @@ -65,7 +60,7 @@ export default { `${investigate}/director/${disciplineId}/${id}`, /** ระบบวินัยเรื่องสอบสวน */ - disciplineDisciplinary: () => `${discipline}`, + disciplineDisciplinary: () => `${discipline}/advance-search`, disciplineDisciplinaryById: (id: string) => `${discipline}/${id}`, disciplineInvestigateById: (id: string) => `${discipline}/investigate/${id}`, disciplineComplaintsById: (id: string) => `${discipline}/complaint/${id}`, @@ -81,13 +76,18 @@ export default { disciplinaryCalendar: () => `${discipline}/calendar`, disciplinaryReport: () => `${discipline}/report`, /** รายการสรุปผลการพิจารณาทางวินัย*/ - listResult: () => `${disciplineMain}/result`, + listResult: () => `${disciplineMain}/result/advance-search`, listResultById: (id: string) => `${disciplineMain}/result/${id}`, disciplinaryEditDuty: (disciplineId: string, id: string) => `${discipline}/director/${disciplineId}/${id}`, /** ผู้ถูกพักราชการ */ - suspendMain: (page: number, pageSize: number, keyword: string,type:string) => + suspendMain: ( + page: number, + pageSize: number, + keyword: string, + type: string + ) => `${suspend}?page=${page}&pageSize=${pageSize}&keyword=${keyword}&profileType=${type}`, suspendById: (id: string) => `${suspend}/${id}`, @@ -122,11 +122,14 @@ export default { historyOrderById: (id: string) => `${env.API_URI}/order/history/discipline/${id}`, - complaintbyGetId: (id: string,page?:string) => `${disciplineMain}/complaint/${page}/${id}`, - investigateByGetId: (id: string,page?:string) => `${investigate}/${page}/${id}`, - disciplineDisciplinaryByGetId: (id: string,page?:string) => `${discipline}/${page}/${id}`, + complaintbyGetId: (id: string, page?: string) => + `${disciplineMain}/complaint/${page}/${id}`, + investigateByGetId: (id: string, page?: string) => + `${investigate}/${page}/${id}`, + disciplineDisciplinaryByGetId: (id: string, page?: string) => + `${discipline}/${page}/${id}`, - disciplineReportByType: (type:string) => `${disciplineReport}/${type}`, + disciplineReportByType: (type: string) => `${disciplineReport}/${type}`, - disciplineFault:(id:string)=>`${disciplineMain}/result/summary/${id}` + disciplineFault: (id: string) => `${disciplineMain}/result/summary/${id}`, }; diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue index a86b7e57e..8dfd73302 100644 --- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue +++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue @@ -4,6 +4,10 @@ import { useRouter } from "vue-router"; import { useQuasar } from "quasar"; // importStroe +import config from "@/app.config"; +import http from "@/plugins/http"; + +import { checkPermission } from "@/utils/permissions"; import { useCounterMixin } from "@/stores/mixin"; import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore"; @@ -11,10 +15,7 @@ import type { DataOption } from "@/modules/11_discipline/interface/index/Main"; // impoet Components import TableComplaint from "@/modules/11_discipline/components/1_Complaint/TableComplaint.vue"; - -import config from "@/app.config"; -import http from "@/plugins/http"; -import { checkPermission } from "@/utils/permissions"; +import DialogSearchAdvanced from "@/modules/11_discipline/components/DialogSearchAdvanced.vue"; const $q = useQuasar(); const router = useRouter(); @@ -41,17 +42,38 @@ const pagination = ref({ }); /** ดึงข้อมูล เรื่องร้องเรียน */ -async function getList() { +async function getList(data?: any) { + const body = { + page: pagination.value.page, + pageSize: pagination.value.rowsPerPage, + keyword: filterKeyword.value.trim(), + status: statusFilter.value, + ...(data && data.dateReceivedStart + ? { dateReceivedStart: data.dateReceivedStart } + : {}), + ...(data && data.dateReceivedEnd + ? { dateReceivedEnd: data.dateReceivedEnd } + : {}), + ...(data && data.respondentType + ? { respondentType: data.respondentType } + : {}), + ...(data && data.offenseDetails + ? { offenseDetails: data.offenseDetails } + : {}), + ...(data && data.levelConsideration + ? { levelConsideration: data.levelConsideration } + : {}), + ...(data && data.dateConsiderationStart + ? { dateConsiderationStart: data.dateConsiderationStart } + : {}), + ...(data && data.dateConsiderationEnd + ? { dateConsiderationEnd: data.dateConsiderationEnd } + : {}), + }; showLoader(); + await http - .get( - config.API.complaintList( - pagination.value.page, - pagination.value.rowsPerPage, - filterKeyword.value.trim(), - statusFilter.value - ) - ) + .post(config.API.complaintList(), body) // .then(async (res) => { totalList.value = Math.ceil( @@ -161,7 +183,7 @@ onMounted(async () => { > - + (useAttrs()); /** ดึงข้อมูลบสวน */ -async function getList() { +async function getList(data?: any) { + const body = { + page: pagination.value.page, + pageSize: pagination.value.rowsPerPage, + keyword: filterKeyword.value.trim(), + status: statusFilter.value, + ...(data && data.respondentType + ? { respondentType: data.respondentType } + : {}), + ...(data && data.offenseDetails + ? { offenseDetails: data.offenseDetails } + : {}), + ...(data && data.investigationDetail + ? { investigationDetail: data.investigationDetail } + : {}), + ...(data && data.investigationDateStart + ? { investigationDateStart: data.investigationDateStart } + : {}), + ...(data && data.investigationDateEnd + ? { investigationDateEnd: data.investigationDateEnd } + : {}), + ...(data && data.dateReceivedStart + ? { dateReceivedStart: data.dateReceivedStart } + : {}), + ...(data && data.dateReceivedEnd + ? { dateReceivedEnd: data.dateReceivedEnd } + : {}), + ...(data && data.investigationStatusResult + ? { investigationStatusResult: data.investigationStatusResult } + : {}), + }; showLoader(); await http - .get( - config.API.investigateMain( - pagination.value.page, - pagination.value.rowsPerPage, - filterKeyword.value.trim(), - statusFilter.value - ) - ) + .post(config.API.investigateMain(), body) .then(async (res) => { totalList.value = Math.ceil( res.data.result.total / pagination.value.rowsPerPage @@ -159,7 +184,7 @@ onMounted(async () => { - + (""); //search data table const status = ref("NEW"); -async function fetchListDisciplinary() { +async function fetchListDisciplinary(data?: any) { + const body = { + page: pagination.value.page, + pageSize: pagination.value.rowsPerPage, + keyword: filter.value.trim(), + status: status.value, + ...(data && data.respondentType + ? { respondentType: data.respondentType } + : {}), + ...(data && data.offenseDetails + ? { offenseDetails: data.offenseDetails } + : {}), + ...(data && data.disciplinaryFaultLevel + ? { disciplinaryFaultLevel: data.disciplinaryFaultLevel } + : {}), + ...(data && data.disciplinaryCaseFault + ? { disciplinaryCaseFault: data.disciplinaryCaseFault } + : {}), + ...(data && data.disciplinaryDateStart + ? { disciplinaryDateStart: data.disciplinaryDateStart } + : {}), + ...(data && data.disciplinaryDateEnd + ? { disciplinaryDateEnd: data.disciplinaryDateEnd } + : {}), + ...(data && data.dateReceivedStart + ? { dateReceivedStart: data.dateReceivedStart } + : {}), + ...(data && data.dateReceivedEnd + ? { dateReceivedEnd: data.dateReceivedEnd } + : {}), + }; showLoader(); await http - .get( - config.API.disciplineDisciplinary() + - `?page=${pagination.value.page}&pageSize=${ - pagination.value.rowsPerPage - }&keyword=${filter.value.trim()}&status=${status.value}` - ) + .post(config.API.disciplineDisciplinary(), body) .then(async (res) => { const data = res.data.result.data; totalList.value = Math.ceil( @@ -74,9 +99,9 @@ function filterStatus(statusReturn: string) { getSearch(); } -function getSearch() { +function getSearch(data?:any) { pagination.value.page = 1; - fetchListDisciplinary(); + fetchListDisciplinary(data); } watch( diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue index 95c00cddd..c45d1aefb 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue @@ -4,6 +4,8 @@ import { ref, useAttrs, watch } from "vue"; import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore"; import { checkPermission } from "@/utils/permissions"; +import DialogSearchAdvanced from "@/modules/11_discipline/components/DialogSearchAdvanced.vue"; + const total = defineModel("total", { required: true }); const totalList = defineModel("totalList", { required: true }); const pagination = defineModel("pagination", { required: true }); @@ -132,7 +134,7 @@ function updatePagination(newPagination: any) {