no message

src/modules/06_retirement/components/Discharged/dischargedMain.vue

@@ -43,6 +43,7 @@ const visibleColumns = ref<string[]>([
   "position",
   "positionLevel",
   "organizationPositionOld",
+  "createdAt",
   "statustext",
 ]);
 const visibleColumns2 = ref<string[]>([
@@ -114,6 +115,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",
@@ -206,7 +216,7 @@ const getData = async () => {
       let list: ResponseData[] = [];
       data.map((r: ResponseData) => {
         list.push({
-          createdAt: new Date(),
+          createdAt:date2Thai(r.createdAt),
           date: new Date(),
           firstName: r.firstName ?? "",
           id: r.id ?? "",
@@ -420,11 +430,19 @@ const saveOrder = async () => {
                     </q-tooltip> -->
                   </div>
                 </q-td>
+                <q-td
+                  key="createdAt"
+                  :props="props"
+                  @click="nextPage(props.row)"
+                >
+                  {{ props.row.createdAt }}
+                </q-td>
                 <q-td key="statustext" :props="props">
                   {{ props.row.statustext }}
                 </q-td>
                 <q-td auto-width>
                   <q-btn
+                  v-if="props.row.status !=='DONE' && props.row.status !=='REPORT'"
                     dense
                     size="12px"
                     flat

src/modules/06_retirement/components/Discharged/dischargedRegistry.vue

@@ -72,7 +72,8 @@
         แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
       </div>
       <q-space />
-      <div class="q-gutter-sm" v-if="!edit">
+      <div v-if="responseData.status !=='DONE' && responseData.status !=='REPORT'">      
+        <div class="q-gutter-sm" v-if="!edit">
         <q-btn
           outline
           color="primary"
@@ -103,7 +104,8 @@
           style="width: 80px"
           @click="edit = !edit"
         />
-      </div>
+      </div></div>
+
     </div>
     <div class="col-12"><q-separator /></div>
     <q-form ref="myForm">