From 6f9edd15458b2754f8cc781ccc54daecede21d88 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 22 Aug 2023 09:15:41 +0700
Subject: [PATCH] no message

---
 .../05_placement/components/AppointMent/Detail.vue  | 13 ++++++++++---
 .../05_placement/components/AppointMent/Main.vue    |  2 ++
 .../components/Relocation/RelocationMain.vue        | 11 +++++++++++
 .../components/Relocation/RelocationbyId.vue        |  5 +++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue
index e95135d42..7e184c97d 100644
--- a/src/modules/05_placement/components/AppointMent/Detail.vue
+++ b/src/modules/05_placement/components/AppointMent/Detail.vue
@@ -42,7 +42,7 @@ const salary = ref<string>("");
 const educationOld = ref<string>("");
 const reason = ref<string>("");
 const date = ref<Date | null>(null);
-
+const status = ref<string>("");
 onMounted(async () => {
   await fecthappointmentByid();
 });
@@ -61,7 +61,8 @@ const fecthappointmentByid = async () => {
       title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
       title.value.positionLevelOld = data.positionLevelOld ?? "-";
       title.value.positionTypeOld = data.positionTypeOld ?? "-";
-
+      status.value = data.status,
+      console.log("🚀 ~ file: Detail.vue:65 ~ .then ~ status:", status.value)
       educationOld.value = data.educationOld;
       organizationPositionOld.value = data.organizationPositionOld;
       positionTypeOld.value = data.positionTypeOld;
@@ -71,6 +72,7 @@ const fecthappointmentByid = async () => {
       // organization.value = data.organization; //ไม่มี
       reason.value = data.reason;
       date.value = data.positionDate;
+      
     })
     .catch((e) => {
       messageError($q, e);
@@ -189,7 +191,8 @@ const getClass = (val: boolean) => {
         แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
       </div>
       <q-space />
-      <div class="q-gutter-sm" v-if="!edit">
+      <div  v-if="status !== 'DONE' && status !== 'REPORT'" >
+        <div class="q-gutter-sm" v-if="!edit">
         <q-btn outline color="primary" dense icon-right="mdi-file-edit-outline" class="q-px-sm" label="แก้ไข"
           style="width: 80px" @click="edit = !edit" />
       </div>
@@ -198,6 +201,10 @@ const getClass = (val: boolean) => {
         <q-btn outline color="red" dense class="q-px-sm" label="ยกเลิก" style="width: 80px" @click="edit = !edit" />
       </div>
     </div>
+
+
+     
+    </div>
     <div class="col-12"><q-separator /></div>
     <q-form ref="myForm">
       <div class="row col-12 q-pa-md">
diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue
index 3f0854ee7..ecf1cb1f9 100644
--- a/src/modules/05_placement/components/AppointMent/Main.vue
+++ b/src/modules/05_placement/components/AppointMent/Main.vue
@@ -105,6 +105,7 @@ const fecthlistappointment = async () => {
         positionNumber: e.positionNumber,
         positionPath: e.positionPath,
         status: status(e.status),
+        
         birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth),
       }));
       // console.log(rows.value);
@@ -474,6 +475,7 @@ const status = (val: string) => {
                 </q-td>
                 <q-td auto-width>
                   <q-btn
+                  v-if="props.row.status !== 'ส่งรายชื่อไปออกคำสั่ง' && props.row.status !== 'ออกคำสั่งแล้ว'"
                     icon="mdi-dots-vertical"
                     size="12px"
                     color="grey-7"
diff --git a/src/modules/05_placement/components/Relocation/RelocationMain.vue b/src/modules/05_placement/components/Relocation/RelocationMain.vue
index 7158c7e86..a80a56b3d 100644
--- a/src/modules/05_placement/components/Relocation/RelocationMain.vue
+++ b/src/modules/05_placement/components/Relocation/RelocationMain.vue
@@ -45,6 +45,7 @@ const visibleColumns = ref<string[]>([
   "fullname",
   "organizationName",
   "dateOfBirth",
+  "statusText",
   "btn",
 ]);
 const visibleColumns2 = ref<string[]>([
@@ -113,6 +114,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "statusText",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "statusText",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "btn",
     align: "left",
@@ -486,6 +496,7 @@ onMounted(async () => {
                 </q-td>
                 <q-td auto-width>
                   <q-btn
+                  v-if="props.row.status !== 'DONE' && props.row.status !== 'REPORT'"
                     icon="mdi-dots-vertical"
                     size="12px"
                     color="grey-7"
diff --git a/src/modules/05_placement/components/Relocation/RelocationbyId.vue b/src/modules/05_placement/components/Relocation/RelocationbyId.vue
index 07bf9456e..f7d7c7bd3 100644
--- a/src/modules/05_placement/components/Relocation/RelocationbyId.vue
+++ b/src/modules/05_placement/components/Relocation/RelocationbyId.vue
@@ -294,7 +294,7 @@ onMounted(async () => {
         แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
       </div>
       <q-space />
-      <div class="q-gutter-sm" v-if="!edit">
+      <div v-if="status !== 'REPORT' && status !== 'DONE'">      <div class="q-gutter-sm" v-if="!edit">
         <q-btn
           outline
           color="primary"
@@ -325,7 +325,8 @@ onMounted(async () => {
           style="width: 80px"
           @click="cancelBtn"
         />
-      </div>
+      </div></div>
+
     </div>
     <div class="col-12"><q-separator /></div>
     <q-form ref="myForm">