From 19ce584ef41dcea429d93209d0c0a8802e24f8b1 Mon Sep 17 00:00:00 2001
From: Thanit Konmek <thanit@frappet.com>
Date: Tue, 22 Aug 2023 17:41:35 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=94=E0=B8=95=E0=B8=A3=E0=B8=87=20=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=A2=E0=B8=B1=E0=B9=89=E0=B8=87=20?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B1=E0=B8=9A=20=E0=B8=AD=E0=B8=99=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B9=83=E0=B8=AB=E0=B9=89?=
 =?UTF-8?q?=E0=B9=83=E0=B8=AA=E0=B9=88=E0=B9=80=E0=B8=AB=E0=B8=95=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5,=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/resign/ResignByid.vue          | 119 +++-
 .../08_registryEmployee/request/Main.ts       |   3 +
 .../08_registryEmployee/views/Main.vue        | 623 +++++++++++++-----
 3 files changed, 564 insertions(+), 181 deletions(-)

diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index b5f5e97c2..1b4ad5313 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -454,13 +454,40 @@
       </q-form>
     </q-card>
   </q-dialog> -->
+  <q-dialog v-model="modal" persistent>
+    <q-card style="width: 800px">
+      <q-form ref="myFormConfirm">
+        <DialogHeader
+          :title="`${actionPass ? 'การอนุมัติการลาออก' : 'การยับยั้งการลาออก'}`"
+          :close="closeModal"
+        />
+        <q-separator />
+        <q-card-section class="q-p-sm">
+          <div class="col-xs-12 col-sm-12 col-md-12">
+            <q-input
+              hide-bottom-space
+              dense
+              outlined
+              lazy-rules
+              :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
+              v-model="reasonReign"
+              :label="`${'กรอกเหตุผล'}`"
+              type="textarea"
+            />
+          </div>
+        </q-card-section>
+        <q-separator />
+        <DialogFooter :editvisible="true" :save="conditionPopup" />
+      </q-form>
+    </q-card>
+  </q-dialog>
 </template>
 <script setup lang="ts">
 import { useRouter, useRoute } from "vue-router";
 import { useQuasar, QForm } from "quasar";
 import { ref, onMounted } from "vue";
-// import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
-// import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
+import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
+import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useRetirementDataStore } from "@/modules/06_retirement/store";
 
@@ -487,6 +514,7 @@ const { statusText } = RetirementData;
 
 const id = ref<string>(route.params.id.toString());
 const myForm = ref<QForm | null>(null);
+const myFormConfirm = ref<QForm | null>(null);
 const edit = ref<boolean>(false);
 const dataDetail = ref<ResponseItems>({
   datetext: "",
@@ -522,6 +550,13 @@ const reason = ref<string>("");
 const location = ref<string>("");
 const status = ref<string>("");
 
+const modal = ref<boolean>(false);
+const actionPass = ref<boolean>(false);
+const reasonReign = ref<string>("");
+
+const closeModal = () => (modal.value = false);
+const openModal = () => (modal.value = true);
+
 // const modalPass = ref<boolean>(false);
 // const modalPassNot = ref<boolean>(false);
 onMounted(() => {
@@ -558,39 +593,60 @@ const fetchData = async (id: string) => {
 };
 
 const popUp = (action: "pass" | "passNot") => {
-  if (action === "pass") {
-    $q.dialog({
-      title: "ยืนยันการอนุมัติการลาออก",
-      message: "ต้องการยืนยันอนุมัติการลาออกนี้ใช่หรือไม่?",
-      cancel: {
-        flat: true,
-        color: "negative",
-      },
-      persistent: true,
-    }).onOk(async () => {
-      confirmpopUp();
-    });
-  } else if (action === "passNot") {
-    $q.dialog({
-      title: "ยืนยันการยับยั้งการลาออก",
-      message: "ต้องการยืนยันการยับยั้งการลาออกนี้ใช่หรือไม่?",
-      cancel: {
-        flat: true,
-        color: "negative",
-      },
-      persistent: true,
-    }).onOk(async () => {
-      rejectpopUp();
+  reasonReign.value = "";
+  actionPass.value = action === "pass";
+  openModal();
+  //   if (action === "pass") {
+  //     $q.dialog({
+  //       title: "ยืนยันการอนุมัติการลาออก",
+  //       message: "ต้องการยืนยันอนุมัติการลาออกนี้ใช่หรือไม่?",
+  //       cancel: {
+  //         flat: true,
+  //         color: "negative",
+  //       },
+  //       persistent: true,
+  //     }).onOk(async () => {
+  //       confirmpopUp();
+  //     });
+  //   } else if (action === "passNot") {
+  //     $q.dialog({
+  //       title: "ยืนยันการยับยั้งการลาออก",
+  //       message: "ต้องการยืนยันการยับยั้งการลาออกนี้ใช่หรือไม่?",
+  //       cancel: {
+  //         flat: true,
+  //         color: "negative",
+  //       },
+  //       persistent: true,
+  //     }).onOk(async () => {
+  //       rejectpopUp();
+  //     });
+  //   }
+};
+
+const conditionPopup = () => {
+  if (myFormConfirm.value !== null) {
+    myFormConfirm.value.validate().then(async (check) => {
+      if (check) {
+        if (actionPass.value) {
+          await confirmpopUp();
+        } else {
+          await rejectpopUp();
+        }
+      }
     });
   }
 };
 
 const confirmpopUp = async () => {
+  const body = {
+    reason: reasonReign.value,
+  };
   await http
-    .get(config.API.resignConfirm(id.value))
+    .put(config.API.resignConfirm(id.value), body)
     .then(() => {
       console.log("ยืนยัน");
-      success($q, "บันทึกสำเร็จ");
+      success($q, "การอนุมัติสำเร็จ");
+      closeModal();
     })
     .catch((e) => {
       console.log(e);
@@ -602,11 +658,14 @@ const confirmpopUp = async () => {
 };
 
 const rejectpopUp = async () => {
-  console.log("ยกเลิก");
+  const body = {
+    reason: reasonReign.value,
+  };
   await http
-    .get(config.API.resignReject(id.value))
+    .put(config.API.resignReject(id.value), body)
     .then(() => {
-      success($q, "บันทึกสำเร็จ");
+      success($q, "การยับยั้งสำเร็จ");
+      closeModal();
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/08_registryEmployee/request/Main.ts b/src/modules/08_registryEmployee/request/Main.ts
index 78ad46293..0be4e8822 100644
--- a/src/modules/08_registryEmployee/request/Main.ts
+++ b/src/modules/08_registryEmployee/request/Main.ts
@@ -24,6 +24,8 @@ interface FormRegistryEmployee {
   draftOrganizationOrganization: String | null;
   newAgency: String | null;
   currentAgency: String | null;
+  status: String;
+  statustext: String;
 }
 interface ResponseEmployeeTemp {
   id: string;
@@ -49,5 +51,6 @@ interface ResponseEmployeeTemp {
   leaveDateOrder: Date | null;
   draftPositionEmployee: String | null;
   draftOrganizationOrganization: String | null;
+  draftOrgEmployeeStatus: String;
 }
 export type { ResponseEmployeeTemp, FormRegistryEmployee };
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 78d7a400c..d74ddafcd 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -7,26 +7,64 @@
       <q-btn flat round color="primary" @click="clickAdd" icon="mdi-plus">
         <q-tooltip>เพิ่มข้อมูล</q-tooltip>
       </q-btn>
-      <q-btn flat round color="primary" icon="mdi-account-arrow-right" @click="clickAddOrder" />
+      <q-btn
+        flat
+        round
+        color="primary"
+        icon="mdi-account-arrow-right"
+        @click="clickAddOrder"
+      >
+        <q-tooltip>ส่งรายชื่อไปออกคำสั่ง</q-tooltip>
+      </q-btn>
       <q-space />
       <div class="items-center" style="display: flex">
         <!-- ค้นหาข้อความใน table -->
-        <q-input standout dense v-model="filter" ref="filterRef" outlined debounce="300" placeholder="ค้นหา"
-          style="max-width: 200px" class="q-ml-sm">
+        <q-input
+          standout
+          dense
+          v-model="filter"
+          ref="filterRef"
+          outlined
+          debounce="300"
+          placeholder="ค้นหา"
+          style="max-width: 200px"
+          class="q-ml-sm"
+        >
           <template v-slot:append>
             <q-icon v-if="filter == ''" name="search" />
-            <q-icon v-if="filter !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
+            <q-icon
+              v-if="filter !== ''"
+              name="clear"
+              class="cursor-pointer"
+              @click="resetFilter"
+            />
           </template>
         </q-input>
         <!-- แสดงคอลัมน์ใน table -->
-        <q-select v-model="visibleColumnsEmployeeTemp" :display-value="$q.lang.table.columns" multiple outlined dense
-          :options="columns" options-dense option-value="name" map-options emit-value style="min-width: 150px"
-          class="gt-xs q-ml-sm" />
+        <q-select
+          v-model="visibleColumnsEmployeeTemp"
+          :display-value="$q.lang.table.columns"
+          multiple
+          outlined
+          dense
+          :options="columns"
+          options-dense
+          option-value="name"
+          map-options
+          emit-value
+          style="min-width: 150px"
+          class="gt-xs q-ml-sm"
+        />
       </div>
     </div>
     <div class="col-12 q-pt-sm">
-      <d-table :rows="rows" :columns="columns" :visible-columns="visibleColumnsEmployeeTemp" :filter="filter"
-        row-key="id">
+      <d-table
+        :rows="rows"
+        :columns="columns"
+        :visible-columns="visibleColumnsEmployeeTemp"
+        :filter="filter"
+        row-key="id"
+      >
         <template v-slot:header="props">
           <q-tr :props="props">
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -37,16 +75,32 @@
         </template>
         <template v-slot:body="props">
           <q-tr :props="props" class="cursor-pointer">
-            <q-td key="no" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="no"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.rowIndex + 1 }}
             </q-td>
-            <q-td key="fullname" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="fullname"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.fullname }}
             </q-td>
-            <q-td key="newAgency" :props="props" @click="redirectToPage(props.row.id)">
-              <div class="col-12" v-if="props.row.draftOrganizationOrganization == null &&
-                props.row.draftPositionEmployee == null
-                ">
+            <q-td
+              key="newAgency"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
+              <div
+                class="col-12"
+                v-if="
+                  props.row.draftOrganizationOrganization == null &&
+                  props.row.draftPositionEmployee == null
+                "
+              >
                 <div class="text-weight-medium">
                   {{ "-" }}
                 </div>
@@ -60,8 +114,15 @@
                 </div>
               </div>
             </q-td>
-            <q-td key="currentAgency" :props="props" @click="redirectToPage(props.row.id)">
-              <div class="col-12" v-if="props.row.oc == null && props.row.position == null">
+            <q-td
+              key="currentAgency"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
+              <div
+                class="col-12"
+                v-if="props.row.oc == null && props.row.position == null"
+              >
                 <div class="text-weight-medium">
                   {{ "-" }}
                 </div>
@@ -78,82 +139,182 @@
             <!-- <q-td
               key="positionEmployeePosition"
               :props="props"
-              @click="redirectToPage(props.row.id)"
+              @click="redirectToPage(props.row.id,props.row.status)"
             >
               {{ props.row.positionEmployeePosition }}
             </q-td>
             <q-td
               key="positionEmployeePositionSide"
               :props="props"
-              @click="redirectToPage(props.row.id)"
+              @click="redirectToPage(props.row.id,props.row.status)"
             >
               {{ props.row.positionEmployeePositionSide }}
             </q-td>
             <q-td
               key="positionLine"
               :props="props"
-              @click="redirectToPage(props.row.id)"
+              @click="redirectToPage(props.row.id,props.row.status)"
             >
               {{ props.row.positionLine }}
             </q-td>
             <q-td
               key="positionEmployeeGroup"
               :props="props"
-              @click="redirectToPage(props.row.id)"
+              @click="redirectToPage(props.row.id,props.row.status)"
             >
               {{ props.row.positionEmployeeGroup }}
             </q-td>
-            <q-td key="oc" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td key="oc" :props="props" @click="redirectToPage(props.row.id,props.row.status)">
               {{ props.row.oc }}
             </q-td> -->
-            <q-td key="amount" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="amount"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.amount }}
             </q-td>
-            <q-td key="govAge" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="govAge"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.govAge }}
             </q-td>
-            <q-td key="dateAppoint" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="dateAppoint"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.dateAppoint }}
             </q-td>
-            <q-td key="dateStart" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="dateStart"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.dateStart }}
             </q-td>
-            <q-td key="salaryDate" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="salaryDate"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.salaryDate }}
             </q-td>
-            <q-td key="refSalary" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="refSalary"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.refSalary }}
             </q-td>
-            <q-td key="age" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="age"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.age }}
             </q-td>
-            <q-td key="fullnameOld" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="fullnameOld"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.fullnameOld }}
             </q-td>
-            <q-td key="createdAt" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="createdAt"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.createdAt }}
             </q-td>
-            <q-td key="isLeave" :props="props" @click="redirectToPage(props.row.id)">
+            <q-td
+              key="isLeave"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.isLeave }}
             </q-td>
-            <q-td key="leaveDateOrder" :props="props" @click="redirectToPage(props.row.id)">
+
+            <q-td
+              key="leaveDateOrder"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
               {{ props.row.leaveDateOrder }}
             </q-td>
-
+            <q-td
+              key="statustext"
+              :props="props"
+              @click="redirectToPage(props.row.id, props.row.status)"
+            >
+              {{ props.row.statustext }}
+            </q-td>
             <q-td auto-width>
-              <q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
+              <q-btn
+                icon="mdi-dots-vertical"
+                size="12px"
+                color="grey-7"
+                flat
+                round
+                dense
+              >
                 <q-menu transition-show="jump-down" transition-hide="jump-up">
                   <q-list dense style="min-width: 160px">
-                    <q-item clickable v-close-popup @click="editDetail(props.row)">
-                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                        <q-icon color="blue" size="xs" name="mdi-account-settings" />
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="editDetail(props.row)"
+                      :disable="
+                        props.row.status == 'REPORT' ||
+                        props.row.status == 'DONE'
+                      "
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                        <q-icon
+                          :color="
+                            props.row.status == 'REPORT' ||
+                            props.row.status == 'DONE'
+                              ? 'grey'
+                              : 'blue'
+                          "
+                          size="xs"
+                          name="mdi-account-settings"
+                        />
                       </q-item-section>
                       <q-item-section>กำหนดตำแหน่ง</q-item-section>
                     </q-item>
                     <q-separator />
-                    <q-item clickable v-close-popup @click="clickDelete(props.row.id)">
-                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                        <q-icon color="red" size="xs" name="mdi-delete" />
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="clickDelete(props.row.id)"
+                      :disable="
+                        props.row.status == 'REPORT' ||
+                        props.row.status == 'DONE'
+                      "
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                        <q-icon
+                          :color="
+                            props.row.status == 'REPORT' ||
+                            props.row.status == 'DONE'
+                              ? 'grey'
+                              : 'red-7'
+                          "
+                          size="xs"
+                          name="mdi-delete"
+                        />
                       </q-item-section>
                       <q-item-section>ลบ</q-item-section>
                     </q-item>
@@ -173,16 +334,34 @@
       <DialogHeader tittle="กำหนดตำแหน่ง" :close="modalOpenClose" />
       <q-separator />
       <q-card-section class="q-pa-sm">
-        <d-table :rows="rowsPosition" :columns="columnsPosition" row-key="id" selection="single"
-          v-model:selected="selectedPosition" :visible-columns="visibleColumnsPosition">
+        <d-table
+          :rows="rowsPosition"
+          :columns="columnsPosition"
+          row-key="id"
+          selection="single"
+          v-model:selected="selectedPosition"
+          :visible-columns="visibleColumnsPosition"
+        >
           <template v-slot:body-selection="scope">
-            <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
+            <q-checkbox
+              keep-color
+              color="primary"
+              dense
+              v-model="scope.selected"
+            />
           </template>
         </d-table>
       </q-card-section>
       <q-separator />
       <q-card-actions align="right">
-        <q-btn dense unelevated label="บันทึก" color="public" @click="checkSave" class="q-px-md"><!-- icon="mdi-content-save-outline"
+        <q-btn
+          dense
+          unelevated
+          label="บันทึก"
+          color="public"
+          @click="checkSave"
+          class="q-px-md"
+          ><!-- icon="mdi-content-save-outline"
         <q-tooltip>บันทึก</q-tooltip> -->
         </q-btn>
       </q-card-actions>
@@ -192,14 +371,24 @@
   <!-- dialog ส่งรายชื่อไปออกคำสั่ง -->
   <q-dialog v-model="modaladdOrder">
     <q-card style="width: 900px; max-width: 80vw">
-      <DialogHeader tittle="ส่งรายชื่อไปออกคำสั่ง" :close="clickCloseSendModal" />
+      <DialogHeader
+        tittle="ส่งรายชื่อไปออกคำสั่ง"
+        :close="clickCloseSendModal"
+      />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-end">
           <div class="col-5">
             <q-toolbar style="padding: 0">
-              <q-input borderless outlined dense debounce="300" v-model="filter" placeholder="ค้นหา"
-                style="width: 850px; max-width: auto">
+              <q-input
+                borderless
+                outlined
+                dense
+                debounce="300"
+                v-model="filter"
+                placeholder="ค้นหา"
+                style="width: 850px; max-width: auto"
+              >
                 <template v-slot:append>
                   <q-icon name="search" />
                 </template>
@@ -208,37 +397,80 @@
           </div>
         </div>
 
-        <d-table :rows="rowsOrder" :columns="columnsOrder" :visible-columns="visibleColumnsOrder" :filter="filter"
-          row-key="id" selection="single" v-model:selected="selectedToOrder">
+        <d-table
+          :rows="rowsOrder"
+          :columns="columnsOrder"
+          :visible-columns="visibleColumnsOrder"
+          :filter="filter"
+          row-key="id"
+          selection="single"
+          v-model:selected="selectedToOrder"
+        >
           <template v-slot:body-selection="scope">
-            <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
+            <q-checkbox
+              keep-color
+              color="primary"
+              dense
+              v-model="scope.selected"
+            />
           </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
               <q-td>
-                <q-checkbox keep-color color="primary" dense v-model="props.selected" />
+                <q-checkbox
+                  keep-color
+                  color="primary"
+                  dense
+                  v-model="props.selected"
+                />
               </q-td>
+
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
               <q-td key="fullname" :props="props">
                 {{ props.row.fullname }}
               </q-td>
-              <q-td key="positionEmployeePosition" :props="props">
-                {{ props.row.positionEmployeePosition }}
+              <q-td key="newAgency" :props="props">
+                <div
+                  class="col-12"
+                  v-if="
+                    props.row.draftOrganizationOrganization == null &&
+                    props.row.draftPositionEmployee == null
+                  "
+                >
+                  <div class="text-weight-medium">
+                    {{ "-" }}
+                  </div>
+                </div>
+                <div class="col-12" v-else>
+                  <div class="text-weight-medium">
+                    {{ props.row.draftOrganizationOrganization ?? "-" }}
+                  </div>
+                  <div class="text-weight-light">
+                    {{ props.row.draftPositionEmployee ?? "-" }}
+                  </div>
+                </div>
               </q-td>
-              <q-td key="positionEmployeePositionSide" :props="props">
-                {{ props.row.positionEmployeePositionSide }}
-              </q-td>
-              <q-td key="positionLine" :props="props">
-                {{ props.row.positionLine }}
-              </q-td>
-              <q-td key="positionEmployeeGroup" :props="props">
-                {{ props.row.positionEmployeeGroup }}
-              </q-td>
-              <q-td key="oc" :props="props">
-                {{ props.row.oc }}
+              <q-td key="currentAgency" :props="props">
+                <div
+                  class="col-12"
+                  v-if="props.row.oc == null && props.row.position == null"
+                >
+                  <div class="text-weight-medium">
+                    {{ "-" }}
+                  </div>
+                </div>
+                <div class="col-12" v-else>
+                  <div class="text-weight-medium">
+                    {{ props.row.oc ?? "-" }}
+                  </div>
+                  <div class="text-weight-light">
+                    {{ props.row.position ?? "-" }}
+                  </div>
+                </div>
               </q-td>
+
               <q-td key="amount" :props="props">
                 {{ props.row.amount }}
               </q-td>
@@ -269,9 +501,13 @@
               <q-td key="isLeave" :props="props">
                 {{ props.row.isLeave }}
               </q-td>
+
               <q-td key="leaveDateOrder" :props="props">
                 {{ props.row.leaveDateOrder }}
               </q-td>
+              <q-td key="statustext" :props="props">
+                {{ props.row.statustext }}
+              </q-td>
             </q-tr>
           </template>
         </d-table>
@@ -322,7 +558,7 @@ const {
   dialogMessage,
   dialogRemove,
   dialogConfirm,
-  dialogMessageNotify
+  dialogMessageNotify,
 } = mixin;
 
 const modaladdOrder = ref<boolean>(false);
@@ -368,12 +604,13 @@ const visibleColumnsOrder = ref<String[]>([
   "salaryDate",
   "age",
   "amount",
-  "isLeave",
+  "statustext",
   "leaveDateOrder",
+  "newAgency",
+  "currentAgency",
 ]);
 
-const visibleColumnsEmployeeTemp = ref<String[]>([]);
-visibleColumnsEmployeeTemp.value = [
+const visibleColumnsEmployeeTemp = ref<String[]>([
   "no",
   "fullname",
   "fullnameOld",
@@ -390,10 +627,12 @@ visibleColumnsEmployeeTemp.value = [
   "salaryDate",
   "age",
   "amount",
+  "statustext",
   "leaveDateOrder",
   "newAgency",
   "currentAgency",
-];
+]);
+
 // "isLeave",
 const columns = ref<QTableProps["columns"]>([
   {
@@ -645,6 +884,20 @@ const columns = ref<QTableProps["columns"]>([
     // sort: (a: string, b: string) =>
     //   a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "statustext",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "statustext",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+  },
 ]);
 const rows = ref<FormRegistryEmployee[]>([]);
 
@@ -788,13 +1041,12 @@ const columnsOrder = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px; min-width: 200px",
     style: "font-size: 14px; ",
   },
-
   {
-    name: "positionEmployeePosition",
+    name: "newAgency",
     align: "left",
-    label: "ตำแหน่ง",
+    label: "หน่วยงานที่รับการบรรจุ",
     sortable: true,
-    field: "positionEmployeePosition",
+    field: "newAgency",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -804,25 +1056,11 @@ const columnsOrder = ref<QTableProps["columns"]>([
       }),
   },
   {
-    name: "positionEmployeePositionSide",
+    name: "currentAgency",
     align: "left",
-    label: "ด้านของตำแหน่ง",
+    label: "หน่วยงานปัจจุบัน",
     sortable: true,
-    field: "positionEmployeePositionSide",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
-  },
-  {
-    name: "positionLine",
-    align: "left",
-    label: "สายงาน",
-    sortable: true,
-    field: "positionLine",
+    field: "currentAgency",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -832,34 +1070,77 @@ const columnsOrder = ref<QTableProps["columns"]>([
       }),
   },
 
-  {
-    name: "positionEmployeeGroup",
-    align: "left",
-    label: "กลุ่มงาน",
-    sortable: true,
-    field: "positionEmployeeGroup",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
-  },
-  {
-    name: "oc",
-    align: "left",
-    label: "สังกัด",
-    sortable: true,
-    field: "oc",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, {
-        numeric: true,
-        sensitivity: "base",
-      }),
-  },
+  //   {
+  //     name: "positionEmployeePosition",
+  //     align: "left",
+  //     label: "ตำแหน่ง",
+  //     sortable: true,
+  //     field: "positionEmployeePosition",
+  //     headerStyle: "font-size: 14px",
+  //     style: "font-size: 14px",
+  //     sort: (a: string, b: string) =>
+  //       a.localeCompare(b, undefined, {
+  //         numeric: true,
+  //         sensitivity: "base",
+  //       }),
+  //   },
+  //   {
+  //     name: "positionEmployeePositionSide",
+  //     align: "left",
+  //     label: "ด้านของตำแหน่ง",
+  //     sortable: true,
+  //     field: "positionEmployeePositionSide",
+  //     headerStyle: "font-size: 14px",
+  //     style: "font-size: 14px",
+  //     sort: (a: string, b: string) =>
+  //       a.localeCompare(b, undefined, {
+  //         numeric: true,
+  //         sensitivity: "base",
+  //       }),
+  //   },
+  //   {
+  //     name: "positionLine",
+  //     align: "left",
+  //     label: "สายงาน",
+  //     sortable: true,
+  //     field: "positionLine",
+  //     headerStyle: "font-size: 14px",
+  //     style: "font-size: 14px",
+  //     sort: (a: string, b: string) =>
+  //       a.localeCompare(b, undefined, {
+  //         numeric: true,
+  //         sensitivity: "base",
+  //       }),
+  //   },
+
+  //   {
+  //     name: "positionEmployeeGroup",
+  //     align: "left",
+  //     label: "กลุ่มงาน",
+  //     sortable: true,
+  //     field: "positionEmployeeGroup",
+  //     headerStyle: "font-size: 14px",
+  //     style: "font-size: 14px",
+  //     sort: (a: string, b: string) =>
+  //       a.localeCompare(b, undefined, {
+  //         numeric: true,
+  //         sensitivity: "base",
+  //       }),
+  //   },
+  //   {
+  //     name: "oc",
+  //     align: "left",
+  //     label: "สังกัด",
+  //     sortable: true,
+  //     field: "oc",
+  //     headerStyle: "font-size: 14px",
+  //     style: "font-size: 14px",
+  //     sort: (a: string, b: string) =>
+  //       a.localeCompare(b, undefined, {
+  //         numeric: true,
+  //         sensitivity: "base",
+  //       }),
+  //   },
   {
     name: "amount",
     align: "left",
@@ -964,17 +1245,17 @@ const columnsOrder = ref<QTableProps["columns"]>([
     // sort: (a: string, b: string) =>
     //   a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-  {
-    name: "isLeave",
-    align: "left",
-    label: "สถานะ",
-    sortable: true,
-    field: "isLeave",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    // sort: (a: string, b: string) =>
-    //   a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
+  //   {
+  //     name: "isLeave",
+  //     align: "left",
+  //     label: "สถานะ",
+  //     sortable: true,
+  //     field: "isLeave",
+  //     headerStyle: "font-size: 14px",
+  //     style: "font-size: 14px",
+  //     // sort: (a: string, b: string) =>
+  //     //   a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  //   },
   {
     name: "leaveDateOrder",
     align: "left",
@@ -986,8 +1267,23 @@ const columnsOrder = ref<QTableProps["columns"]>([
     // sort: (a: string, b: string) =>
     //   a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "statustext",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "statustext",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+  },
 ]);
 const rowsOrder = ref<FormRegistryEmployee[]>([]);
+const filters = ref<FormRegistryEmployee[]>([]);
 const selected = ref([]);
 onMounted(async () => {
   await nodeTree();
@@ -997,8 +1293,8 @@ const checkNull = (text: string) =>
   text == null
     ? ""
     : text == "00000000-0000-0000-0000-000000000000"
-      ? ""
-      : text;
+    ? ""
+    : text;
 
 const getPosition = async (id: string) => {
   showLoader();
@@ -1079,23 +1375,24 @@ const getPosition = async (id: string) => {
 
 const clickAddOrder = () => {
   modaladdOrder.value = true;
-  const filteredRows = rowsOrder.value.filter(
-    (row) => row.draftPositionEmployee !== null
+  const row = filters.value.filter(
+    (r: FormRegistryEmployee) => r.status == "PENDING"
   );
-  rowsOrder.value = filteredRows;
+
+  rowsOrder.value = row;
 };
 
 const clickCloseSendModal = () => {
   modaladdOrder.value = false;
 };
 const checkSave = () => {
-  dialogConfirm($q, async () => await saveData())
-}
+  dialogConfirm($q, async () => await saveData());
+};
 const saveData = async () => {
   if (selectedPosition.value.length == 0) {
     dialogMessageNotify(
       $q,
-      "ไม่สามารถบันทึกข้อมูลได้ กรุณาเลือกตำแหน่ง",
+      "ไม่สามารถบันทึกข้อมูลได้ กรุณาเลือกตำแหน่ง"
       // "กรุณาเลือกตำแหน่ง",
       // "warning",
       // undefined,
@@ -1110,8 +1407,8 @@ const saveData = async () => {
   }
 };
 const checkSaveOrder = () => {
-  dialogConfirm($q, () => SaveOrder())
-}
+  dialogConfirm($q, () => SaveOrder());
+};
 const SaveOrder = async () => {
   // ส่งไปออกคำสั่ง
   let pId: string[] = [];
@@ -1194,8 +1491,10 @@ const clickAdd = () => {
 };
 
 // ดูรายการแก้ไขรายชื่อ
-const redirectToPage = (id?: string) => {
-  router.push(`/registry-employee/edit/${id}`);
+const redirectToPage = (id?: string, status?: string) => {
+  if (!(status == "REPORT" || status == "DONE")) {
+    router.push(`/registry-employee/edit/${id}`);
+  }
 };
 const editDetail = async (row: any) => {
   await getPosition(row.id);
@@ -1204,10 +1503,9 @@ const editDetail = async (row: any) => {
   modal.value = true;
 };
 
-
 const clickDelete = (id: string) => {
-  dialogRemove($q, async () => await deleteData(id))
-}
+  dialogRemove($q, async () => await deleteData(id));
+};
 
 const deleteData = async (id: string) => {
   showLoader();
@@ -1222,7 +1520,7 @@ const deleteData = async (id: string) => {
     })
     .finally(() => {
       hideLoader();
-    })
+    });
 };
 
 const nodeTree = async () => {
@@ -1266,10 +1564,12 @@ const showEmployeeTemp = async () => {
       criterias: cirteria,
     })
     .then((res) => {
-      let data = res.data.result;
+      const data = res.data.result;
       rows.value = [];
+      filters.value = [];
+      let list: FormRegistryEmployee[] = [];
       data.map((e: ResponseEmployeeTemp) => {
-        rows.value.push({
+        list.push({
           id: e.id,
           fullname: e.fullname,
           fullnameOld: e.fullnameOld,
@@ -1299,10 +1599,12 @@ const showEmployeeTemp = async () => {
           currentAgency: "",
           draftPositionEmployee: e.draftPositionEmployee,
           draftOrganizationOrganization: e.draftOrganizationOrganization,
+          status: e.draftOrgEmployeeStatus ?? "",
+          statustext: statusText(e.draftOrgEmployeeStatus ?? ""),
         });
-
-        rowsOrder.value = rows.value.filter((e: any) => e.draftPositionEmployee !== null);
       });
+      rows.value = list;
+      filters.value = list;
     })
     .catch((e) => {
       messageError($q, e);
@@ -1312,6 +1614,26 @@ const showEmployeeTemp = async () => {
     });
 };
 
+const statusText = (val: String) => {
+  switch (val) {
+    case "WAITTING":
+      return "รอดำเนินการ";
+    case "PENDING":
+      return "เลือกตำแหน่งแล้ว";
+    case "APPROVE":
+      return "อนุมัติ";
+    case "REJECT":
+      return "ไม่อนุมัติ";
+    case "REPORT":
+      return "ส่งรายชื่อไปออกคำสั่ง";
+    case "DONE":
+      return "ออกคำสั่งเสร็จแล้ว";
+
+    default:
+      return "-";
+  }
+};
+
 // const showEmployeeTempOrder = async () => {
 //   let cirteria = [];
 
@@ -1380,6 +1702,5 @@ const showEmployeeTemp = async () => {
 const onSelected = async (id: string) => {
   //   await fetchPositionNumber(id);
 };
-
 </script>
 <style lang="scss"></style>