diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts index 33fbed13c..d9bb269fd 100644 --- a/src/api/11_discipline/api.discipline.ts +++ b/src/api/11_discipline/api.discipline.ts @@ -17,7 +17,7 @@ export default { /**ลบ ช่องทางการร้องเรียน * @param id type */ - complaintListOp: () => `${disciplineMain}/complaint_Channel`, + complaintListOp: (page?:string) => `${disciplineMain}/complaint_Channel/${page}`, complaintChannelbyId: (id: string) => `${disciplineMain}/complaint_Channel/${id}`, complaintAdd: () => `${disciplineMain}/complaint`, diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue index ffec67393..a76f74722 100644 --- a/src/modules/11_discipline/components/1_Complaint/Form.vue +++ b/src/modules/11_discipline/components/1_Complaint/Form.vue @@ -14,7 +14,7 @@ import type { DataOption } from "@/modules/11_discipline/interface/index/Main"; import type { FormData, ArrayFileList, -} from "@/modules/11_discipline/interface/request/complaint"; +} from "@/modules/11_discipline/interface/request/Complaint"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue"; @@ -264,9 +264,15 @@ function deletePerson(id: string) { /** ช่องทางการร้องเรียน และฟังก์ชั่นการดึงข้อมูลช่องทางการร้องเรียนมาจาก api*/ function getListChannel() { - http.get(config.API.complaintListOp()).then((res) => { - channelOptions.value = res.data.result.data; - }); + http + .get( + config.API.complaintListOp( + mainStore.pathComplaintsChannal(route.name as string) + ) + ) + .then((res) => { + channelOptions.value = res.data.result.data; + }); } /** ฟังก์ชั่นเช็คการแก้ไขฟอร์มแล้วไม่ได้กดบันทึก */ diff --git a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue index bd9e11ab8..0a156ed43 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue @@ -5,16 +5,19 @@ import router from "@/router"; import config from "@/app.config"; import http from "@/plugins/http"; import { useQuasar } from "quasar"; +import { useRoute } from "vue-router"; import { useCounterMixin } from "@/stores/mixin"; import { useDisciplineChannelDataStore } from "@/modules/11_discipline/store/ChannelStore"; - +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import { checkPermission } from "@/utils/permissions"; import Header from "@/components/DialogHeader.vue"; const $q = useQuasar(); //ใช้ noti quasar const dataStore = useDisciplineChannelDataStore(); +const mainStore = useDisciplineMainStore(); +const route = useRoute(); const mixin = useCounterMixin(); const { dialogRemove, showLoader, messageError, hideLoader, success } = mixin; @@ -75,7 +78,11 @@ function clickRead(check: boolean, name: string) { async function getComplaintChanal() { showLoader(); await http - .get(config.API.complaintChannel()) + .get( + config.API.complaintListOp( + mainStore.pathComplaintsChannal(route.name as string) + ) + ) .then((res) => { const data = res.data.result.data; dataStore.fetchData(data); diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts index a91c3ff94..2f0bcbf83 100644 --- a/src/modules/11_discipline/store/Main.ts +++ b/src/modules/11_discipline/store/Main.ts @@ -268,32 +268,57 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { } /** - * แปลง status เป็น text #เรื่องร้องเรียน - * @param val status - * @returns text - */ -function pathComplaints(val: string) { - switch (val) { - case "disciplineComplaintsEdit": - case "disciplineComplaintsDetail": - return "main"; - case "disciplineInvestigatefactsEdit": - case "disciplineInvestigatefactsDetail": - return "inves"; - case "disciplineDisciplinaryEdit": - case "disciplineDisciplinaryDetail": - return "discip"; - case "disciplineEditResult": - case "disciplineResultDetail": - return "result"; + * แปลง status เป็น text #เรื่องร้องเรียน channal + * @param val status + * @returns text + */ + function pathComplaintsChannal(val: string) { + switch (val) { + case "disciplineChannel": + return "main"; + case "disciplineComplaintsAdd": + return "create-complain"; + case "disciplineComplaintsEdit": + case "disciplineComplaintsDetail": + return "complain"; + case "disciplineInvestigatefactsEdit": + case "disciplineInvestigatefactsDetail": + return "inves"; + case "disciplineDisciplinaryEdit": + case "disciplineDisciplinaryDetail": + return "discip"; + case "disciplineEditResult": + case "disciplineResultDetail": + return "result"; + } + } + /** + * แปลง status เป็น text #เรื่องร้องเรียน + * @param val status + * @returns text + */ + function pathComplaints(val: string) { + switch (val) { + case "disciplineComplaintsEdit": + case "disciplineComplaintsDetail": + return "main"; + case "disciplineInvestigatefactsEdit": + case "disciplineInvestigatefactsDetail": + return "inves"; + case "disciplineDisciplinaryEdit": + case "disciplineDisciplinaryDetail": + return "discip"; + case "disciplineEditResult": + case "disciplineResultDetail": + return "result"; + } } -} /** - * แปลง status เป็น text #สืบสวนข้อเท็จจริง - * @param val status - * @returns text - */ + * แปลง status เป็น text #สืบสวนข้อเท็จจริง + * @param val status + * @returns text + */ function pathInves(val: string) { switch (val) { case "disciplineInvestigatefactsEdit": @@ -308,21 +333,21 @@ function pathComplaints(val: string) { } } - /** - * แปลง status เป็น text #สอบสวนความผิดทางวินัย - * @param val status - * @returns text - */ - function pathDiscip(val: string) { - switch (val) { - case "disciplineDisciplinaryEdit": - case "disciplineDisciplinaryDetail": - return "main"; - case "disciplineEditResult": - case "disciplineResultDetail": - return "result"; - } + /** + * แปลง status เป็น text #สอบสวนความผิดทางวินัย + * @param val status + * @returns text + */ + function pathDiscip(val: string) { + switch (val) { + case "disciplineDisciplinaryEdit": + case "disciplineDisciplinaryDetail": + return "main"; + case "disciplineEditResult": + case "disciplineResultDetail": + return "result"; } + } /** * แปลง option ที่รับมาเป็น ไทย @@ -454,6 +479,7 @@ function pathComplaints(val: string) { fetchDataRowsSend, pathComplaints, pathInves, - pathDiscip + pathDiscip, + pathComplaintsChannal, }; });