Merge branch 'develop' into devTee

src/modules/11_discipline/store/InvestigateDisStore.ts

@@ -59,7 +59,7 @@ export const useInvestigateDisStore = defineStore(
     const statusOps = ref<DataOption[]>([
       { id: "NEW", name: "กำลังสอบสวน" },
       { id: "STOP", name: "ยุติเรื่อง" },
-      { id: "COMPLETE", name: "ส่งไปสอบสวน" },
+      { id: "DONE", name: "ส่งไปสรุปผลการพิจารณา" },
     ]);
 
     const causeTextOptions = ref<DataOption[]>([
@@ -86,6 +86,7 @@ export const useInvestigateDisStore = defineStore(
 
       rows.value = datalist;
     }
+
     async function fecthDirector(data: directorType[]) {
       let datalistDirector: responseType[] = data.map((e: directorType) => ({
         id: e.id,
@@ -125,42 +126,6 @@ export const useInvestigateDisStore = defineStore(
           return "-";
       }
     }
-    function convertSatatus(val: string) {
-      switch (val) {
-        case "0":
-          return "เสร็จสิ้นแล้ว";
-        case "1":
-          return "ยุติเรื่อง";
-      }
-    }
-    function activeStatus(val: string) {
-      switch (val) {
-        case "0":
-          return "กำลังยืนยันผล";
-        case "1":
-          return "ยืนยันผลเเล้ว";
-        case "2":
-          return "ยืนยันผล";
-      }
-    }
-    function convertPenaltyLevel(val: string) {
-      switch (val) {
-        case "0":
-          return "ไม่ร้ายแรง";
-        case "1":
-          return "ภาคทัณฑ์";
-        case "3":
-          return "ตัดเงินเดือน";
-        case "4":
-          return "ลดขั้นเงินเดือน";
-        case "5":
-          return "ร้ายแรง";
-        case "6":
-          return "ปลดออก";
-        case "7":
-          return "ไล่ออก";
-      }
-    }
 
     const visibleColumns = ref<String[]>([
       "no",

src/modules/11_discipline/store/InvestigateFactStore.ts

@@ -50,7 +50,7 @@ export const useInvestigateFactStore = defineStore(
     const faultOps = ref<DataOption[]>([
       { id: "NEW", name: "กำลังสืบสวน" },
       { id: "STOP", name: "ยุติเรื่อง" },
-      { id: "COMPLETE", name: "ส่งไปสอบสวน" },
+      { id: "SEND_DISCIPLINARY", name: "ส่งไปสอบสวน" },
     ]);
     const investigationStatusResultOptions = ref<DataOption[]>([
       { id: "NOT_SPECIFIED", name: "ยังไม่ระบุ" },