no message

src/modules/05_placement/components/Other/Detail.vue

@@ -5,9 +5,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 
 import type { ResponseTitle } from "@/modules/05_placement/interface/response/Receive";
-import type {
-  ResponseDataDetail,
-} from "@/modules/05_placement/interface/response/Transfer";
+import type { ResponseDataDetail } from "@/modules/05_placement/interface/response/Transfer";
 import type { QTableProps, QForm } from "quasar";
 
 import http from "@/plugins/http";
@@ -237,37 +235,43 @@ const getClass = (val: boolean) => {
         แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
       </div>
       <q-space />
-      <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>
-      <div class="q-gutter-sm" v-else>
-        <q-btn
-          outline
-          color="public"
-          dense
-          class="q-px-sm"
-          label="บันทึก"
-          style="width: 80px"
-          @click="clickEdit"
-        />
-        <q-btn
-          outline
-          color="red"
-          dense
-          class="q-px-sm"
-          label="ยกเลิก"
-          style="width: 80px"
-          @click="(edit = !edit), fecthOther()"
-        />
+      <div
+        v-if="
+          responseData.status !== 'DONE' && responseData.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>
+        <div class="q-gutter-sm" v-else>
+          <q-btn
+            outline
+            color="public"
+            dense
+            class="q-px-sm"
+            label="บันทึก"
+            style="width: 80px"
+            @click="clickEdit"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            class="q-px-sm"
+            label="ยกเลิก"
+            style="width: 80px"
+            @click="(edit = !edit), fecthOther()"
+          />
+        </div>
       </div>
     </div>
     <div class="col-12"><q-separator /></div>

src/modules/05_placement/components/Other/Main.vue

@@ -54,7 +54,7 @@ const visibleColumns = ref<string[]>([
   "position",
   "positionLevel",
   "organizationPositionOld",
-
+  "createdAt",
   "statustext",
 ]);
 
@@ -92,7 +92,7 @@ const fecthlistOthet = async () => {
       // listRecevice.value = response;
       console.log(response);
       rows.value = response.map((r: any) => ({
-        createdAt: new Date(),
+        createdAt: date2Thai(r.createdAt),
         date: new Date(),
         firstName: r.firstname ?? "",
         personalId: r.id ?? "",
@@ -214,6 +214,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่ดำเนินการ",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "statustext",
     align: "left",
@@ -380,7 +389,7 @@ const status = (val: string) => {
             color="add"
             icon="mdi-account-arrow-right"
           >
-            <q-tooltip>ส่งไปออกคำสั่งรายการอื่นๆ</q-tooltip>
+            <q-tooltip>ประเภทคำสั่งรายการอื่นๆ</q-tooltip>
           </q-btn>
 
           <q-space />
@@ -472,11 +481,19 @@ const status = (val: string) => {
                   </q-tooltip> -->
                   </div>
                 </q-td>
+                <q-td key="createdAt" :props="props">
+                  {{ props.row.createdAt }}
+                </q-td>
                 <q-td key="statustext" :props="props">
                   {{ props.row.statustext }}
                 </q-td>
-                <q-td key="statustext" :props="props">
+
+                <q-td auto-width>
                   <q-btn
+                    v-if="
+                      props.row.status !== 'DONE' &&
+                      props.row.status !== 'REPORT'
+                    "
                     flat
                     round
                     class="text-red-14"
@@ -496,7 +513,7 @@ const status = (val: string) => {
 
   <q-dialog v-model="modal">
     <q-card style="width: 1200px; max-width: 80vw">
-      <DialogHeader title="ส่งไปออกคำสั่งอื่นๆ" :close="clickClose" />
+      <DialogHeader title="ประเภทคำสั่งอื่นๆ" :close="clickClose" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-between">