no message

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) =>
+  directorList: (page: number, pageSize: number, keyword: string,path?:string) =>
-    `${disciplineMain}/director?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
+    `${disciplineMain}/director/${path}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
   director: () => `${disciplineMain}/director`,
   directorbyId: (id: string) => `${disciplineMain}/director/${id}`,
 

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)
       )
     )
     //

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) => {

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) => {

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
   };
 });

src/modules/18_command/components/DialogCreateCommand.vue

@@ -216,7 +216,6 @@ function closeModal() {
 }
 
 function clearValue() {
-  commandType.value = "";
   commandNo.value = "";
   commandYear.value = new Date().getFullYear();