no message

src/modules/06_retirement/components/Expulsion/expulsionMain.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 ?? "",
@@ -421,12 +431,20 @@ const saveOrder = async () => {
                     </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 auto-width>
                   <q-btn
+                  v-if="props.row.status !== 'DONE' && props.row.status !=='REPORT'"
                     dense
                     size="12px"
                     flat

src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue

@@ -72,37 +72,43 @@
         แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
       </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="conditionSave"
-        />
-        <q-btn
-          outline
-          color="red"
-          dense
-          class="q-px-sm"
-          label="ยกเลิก"
-          style="width: 80px"
-          @click="edit = !edit"
-        />
+      <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="conditionSave"
+          />
+          <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>