Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

# Conflicts:
#	src/modules/11_discipline/store/InvestigateDisStore.ts

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

@@ -23,7 +23,6 @@ export const useComplainstDataStore = defineStore(
     const visibleColumns = ref<string[]>([]);
     const columns = ref<QTableProps["columns"]>([]);
 
-    
     function fetchComplainstAdd(data: ArrayPerson[]) {
       rowsAdd.value = data;
     }
@@ -119,8 +118,7 @@ export const useComplainstDataStore = defineStore(
     function filterSelector(val: string, update: Function, type: string) {
       update(() => {
         const needle = val.toLowerCase();
-
-        if (type === "filtercomplainantType") {
+        if (type === "filterrespondentType") {
           complainantoptions.value = complainantoptionsMain.value.filter(
             (v: any) => v.name.toLowerCase().indexOf(needle) > -1
           );

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

@@ -47,10 +47,10 @@ export const useInvestigateDisStore = defineStore(
         title: e.title,
         respondentType: convertRespondentType(e.respondentType),
         offenseDetails: convertFault(e.offenseDetails),
-        disciplinaryFaultLevel: e.disciplinaryFaultLevel,
-        disciplinaryCaseFault: e.disciplinaryCaseFault,
-        status: e.status,
-        createdAt: date2Thai(e.createdAt),
+        disciplinaryFaultLevel: e.disciplinaryFaultLevel ?? "-",
+        disciplinaryCaseFault: e.disciplinaryCaseFault ?? "-",
+        status: e.status ?? "-",
+        createdAt: e.createdAt ? date2Thai(e.createdAt) : "-",
       }));
 
       rows.value = datalist;
@@ -90,6 +90,8 @@ export const useInvestigateDisStore = defineStore(
           return "ความผิดวินัยไม่ร้ายแรง";
         case "DEADLY":
           return "ความผิดวินัยร้ายแรง";
+        default:
+          return "-";
       }
     }
     function convertSatatus(val: string) {
@@ -306,6 +308,7 @@ export const useInvestigateDisStore = defineStore(
       optionsTypefault,
       optionsfaultLevel,
       fecthDirector,
+
       visibleColumns,
       columns,
       visibleColumnsDirector,