From 92cc7ba7d99d3ce0decaf328d4e95452bd51db1b Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Wed, 25 Sep 2024 13:41:48 +0700 Subject: [PATCH] no message --- src/api/11_discipline/api.discipline.ts | 4 ++-- .../components/2_InvestigateFacts/Form.vue | 5 +++-- .../3_InvestigateDisciplinary/Form.vue | 3 ++- .../6_BasicInformation/Director/MainPage.vue | 7 ++++++- src/modules/11_discipline/store/Main.ts | 19 +++++++++++++++++++ .../components/DialogCreateCommand.vue | 1 - 6 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts index d9bb269fd..7c5db13d3 100644 --- a/src/api/11_discipline/api.discipline.ts +++ b/src/api/11_discipline/api.discipline.ts @@ -6,8 +6,8 @@ const suspend = `${env.API_URI}/discipline/suspend`; const appeal = `${env.API_URI}/discipline/complaint_appeal`; export default { - directorList: (page: number, pageSize: number, keyword: string) => - `${disciplineMain}/director?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, + 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}`, diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index 8c75c4a1e..a499c9917 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -11,7 +11,7 @@ import { useInvestigateDisStore } from "@/modules/11_discipline/store/Investigat import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore"; import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; -import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact"; +import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact"; import type { OptionData } from "@/modules/07_insignia/interface/index/Main"; import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue"; @@ -373,7 +373,8 @@ async function getList() { config.API.directorList( page.value, rowsPerPage.value, - filterKeyword.value + filterKeyword.value, + mainStore.pathDirector(route.name as string) ) ) // diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index f53c11c41..b466b04d9 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -445,7 +445,8 @@ async function fetchDListDirector() { config.API.directorList( page.value, rowsPerPage.value, - filterKeyword2.value + filterKeyword2.value, + mainStore.pathDirector(route.name as string) ) ) .then((res) => { diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue index a43e7ef35..ac5695aed 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue @@ -4,9 +4,11 @@ import { useQuasar } from "quasar"; import config from "@/app.config"; import http from "@/plugins/http"; +import { useRoute } from "vue-router"; import { checkPermission } from "@/utils/permissions"; import { useCounterMixin } from "@/stores/mixin"; import { useDisciplineDirectorDataStore } from "@/modules/11_discipline/store/DirectorStore"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { DirectorRowsResponse } from "@/modules/11_discipline/interface/response/director"; @@ -15,6 +17,8 @@ import DialogEdit from "@/modules/11_discipline/components/6_BasicInformation/Di const $q = useQuasar(); const dataStore = useDisciplineDirectorDataStore(); +const mainStore = useDisciplineMainStore(); +const route = useRoute(); const mixin = useCounterMixin(); const { messageError, showLoader, hideLoader, dialogRemove, success } = mixin; @@ -53,7 +57,8 @@ async function getList() { config.API.directorList( currentPage.value, rowsPerPage.value, - filterKeyword.value + filterKeyword.value, + mainStore.pathDirector(route.name as string) ) ) .then((res) => { diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts index 2f0bcbf83..41fbe7991 100644 --- a/src/modules/11_discipline/store/Main.ts +++ b/src/modules/11_discipline/store/Main.ts @@ -333,6 +333,24 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { } } + /** + * แปลง status เป็น text #กรรมการ + * @param val status + * @returns text + */ + function pathDirector(val: string) { + switch (val) { + case "disciplineInvestigatefactsEdit": + case "disciplineInvestigatefactsDetail": + return "inves"; + case "disciplineDisciplinaryEdit": + case "disciplineDisciplinaryDetail": + return "discip"; + case "disciplineDirector": + return "main"; + } + } + /** * แปลง status เป็น text #สอบสวนความผิดทางวินัย * @param val status @@ -481,5 +499,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { pathInves, pathDiscip, pathComplaintsChannal, + pathDirector }; }); diff --git a/src/modules/18_command/components/DialogCreateCommand.vue b/src/modules/18_command/components/DialogCreateCommand.vue index c9215b008..674d30582 100644 --- a/src/modules/18_command/components/DialogCreateCommand.vue +++ b/src/modules/18_command/components/DialogCreateCommand.vue @@ -216,7 +216,6 @@ function closeModal() { } function clearValue() { - commandType.value = ""; commandNo.value = ""; commandYear.value = new Date().getFullYear();