Merge branch 'develop' into devTee

src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue

@@ -261,7 +261,10 @@ watchEffect(() => {
                       {{ props.rowIndex + 1 }}
                     </div>
 
-                    <div v-else-if="col.name == 'org'" class="text-html">
+                    <div
+                      v-else-if="col.name == 'organizationPositionOld'"
+                      class="text-html"
+                    >
                       {{
                         props.row.organizationPositionOld
                           ? props.row.organizationPositionOld

src/modules/06_retirement/store/Main.ts

@@ -13,8 +13,10 @@ export const useRetirementDataStore = defineStore("retirement", () => {
         return "ไม่อนุมัติ";
       case "REPORT":
         return "ส่งรายชื่อไปออกคำสั่ง";
+      case "WAITING":
+        return "รอออกคำสั่ง";
       case "DONE":
-        return "ออกคำสั่งเสร็จแล้ว";
+        return "ออกคำสั่งเสร็จสิ้น";
       case "DONECANCEL":
         return "ยกเลิกการลาออก";
       case "CANCEL":

src/modules/06_retirement/store/resignMain.ts

@@ -13,7 +13,7 @@ export const useDataStore = defineStore("resign", () => {
       group: "1",
     },
     {
-      name: "รอออกคำสั่ง",
+      name: "อนุมัติแล้ว",
       value: "APPROVE",
       group: "1",
     },
@@ -23,7 +23,12 @@ export const useDataStore = defineStore("resign", () => {
       group: "1",
     },
     {
-      name: "ออกคำสั่งเสร็จแล้ว",
+      name: "รอออกคำสั่ง",
+      value: "WAITING",
+      group: "1",
+    },
+    {
+      name: "ออกคำสั่งเสร็จสิ้น",
       value: "DONE",
       group: "1",
     },
@@ -39,7 +44,7 @@ export const useDataStore = defineStore("resign", () => {
       group: "2",
     },
     {
-      name: "รอออกคำสั่ง",
+      name: "อนุมัติแล้ว",
       value: "APPROVE",
       group: "2",
     },
@@ -48,6 +53,11 @@ export const useDataStore = defineStore("resign", () => {
       value: "REPORT",
       group: "2",
     },
+    {
+      name: "รอออกคำสั่ง",
+      value: "WAITING",
+      group: "2",
+    },
     {
       name: "ออกคำสั่งสำเร็จ",
       value: "DONE",