Merge branch 'develop' into warunee-dev

# Conflicts: # src/modules/11_discipline/store/ComplaintsStore.ts
2023-11-30 18:04:34 +07:00 · 2023-11-30 18:04:34 +07:00 · a6dfc53ef5
commit a6dfc53ef5
parent f247167e9a a476af0ad9
17 changed files with 745 additions and 442 deletions
--- a/src/modules/11_discipline/store/ComplaintsStore.ts
+++ b/src/modules/11_discipline/store/ComplaintsStore.ts
@ -65,7 +65,7 @@ export const useComplainstDataStore = defineStore(
      { id: "URGENT", name: "ด่วน" },
      { id: "VERY_URGENT", name: "ด่วนมาก" },
    ]);
-
+    
    function levelConsiderationTran(val: string) {
      return (
        levelConsiderationtOptions.value.find((v: any) => v.id === val)?.name ??