diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 7c8af9609..26a57b105 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -225,6 +225,7 @@ onMounted(async () => {
         "officer",
         props.tab
       );
+      DataStore.mainTab = props.tab;
     }
   }
 });
diff --git a/src/modules/07_insignia/components/2_Manage/Tab2.vue b/src/modules/07_insignia/components/2_Manage/Tab2.vue
index 769b20258..7bf0aca0a 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab2.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab2.vue
@@ -157,6 +157,7 @@ onMounted(async () => {
         "officer",
         props.tab
       );
+      DataStore.mainTab = props.tab;
     }
   }
 });
diff --git a/src/modules/07_insignia/components/2_Manage/Tab3.vue b/src/modules/07_insignia/components/2_Manage/Tab3.vue
index 6aa4cc83c..3ee740c1a 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab3.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab3.vue
@@ -143,6 +143,7 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 onMounted(async () => {
+
   organizationOptions.value = DataStore.optionsTypeOc;
   organization.value = await (DataStore.agency != null
     ? DataStore.agency
@@ -156,6 +157,7 @@ onMounted(async () => {
         "officer",
         props.tab
       );
+      DataStore.mainTab = props.tab;
     }
   }
 });
diff --git a/src/modules/07_insignia/components/2_Manage/Tab4.vue b/src/modules/07_insignia/components/2_Manage/Tab4.vue
index 6c643a822..992f63d36 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab4.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab4.vue
@@ -5,10 +5,12 @@ import { useQuasar } from "quasar";
 import type { QTableProps } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { useInsigniaDataStore } from "@/modules/07_insignia/store";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError } = mixin;
+const DataStore = useInsigniaDataStore();
 const props = defineProps({
   roundId: {
     type: String,
@@ -44,6 +46,7 @@ const rows = ref<any[]>([]);
 
 onMounted(async () => {
   await fecthOrg();
+  DataStore.mainTab = props.tab;
 });
 watch(props, async () => {
   if (props.tab === "organization") {
diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue
index 9f8d22610..fc5b0caa8 100644
--- a/src/modules/07_insignia/components/2_Manage/listManage.vue
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -30,7 +30,7 @@ const round = ref<string>("");
 const roundName = ref<string>("");
 const optionRound = ref<any>([]);
 const optiontypeOc = ref<any>([]);
-const tab = ref<any>("pending");
+const tab = ref<any>("");
 const stat = ref<any>({
   allUserUser: 0,
   orgAllCount: 0,
@@ -39,6 +39,7 @@ const stat = ref<any>({
 });
 
 onMounted(async () => {
+  tab.value = DataStore.mainTab;
   await checkRole();
   await fecthlistRound();
 });
diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue
index 5feb02441..e5b50659c 100644
--- a/src/modules/07_insignia/components/3_result/DialogForm.vue
+++ b/src/modules/07_insignia/components/3_result/DialogForm.vue
@@ -408,6 +408,7 @@ const searchcardid = () => {
                 borderless
                 :enableTimePicker="false"
                 week-start="0"
+                :readonly="disbleStatus || status == 'DONE'"
               >
                 <template #year="{ year }">
                   {{ year + 543 }}
@@ -495,6 +496,7 @@ const searchcardid = () => {
                 borderless
                 :enableTimePicker="false"
                 week-start="0"
+                :readonly="disbleStatus || status == 'DONE'"
               >
                 <template #year="{ year }">
                   {{ year + 543 }}
diff --git a/src/modules/07_insignia/components/4_Allocate/Main.vue b/src/modules/07_insignia/components/4_Allocate/Main.vue
index 46c3c7327..59e6b1e0e 100644
--- a/src/modules/07_insignia/components/4_Allocate/Main.vue
+++ b/src/modules/07_insignia/components/4_Allocate/Main.vue
@@ -94,11 +94,16 @@ const fecthInsignia = async () => {
 };
 
 const fecthInsigniaType = async () => {
+  console.log(DataStore.mainTab);
+
   await http(config.API.insigniaType)
     .then((res) => {
       let data = res.data.result;
       DataStore.fetchDatainsigniaType(data);
-      tab.value = DataStore.insigniaType[0].name;
+      if (DataStore.mainTab) {
+        tab.value = DataStore.mainTab;
+      } else tab.value = DataStore.insigniaType[0].name;
+
       loadView.value = true;
       fecthInsignia();
     })
@@ -177,6 +182,7 @@ const selectorRound = (round: string) => {
 };
 
 const fecthlistInsignia = async () => {
+  DataStore.mainTab = tab.value;
   showLoader();
   await http
     .get(config.API.insigniaManageType(tab.value, Number(roundYear.value)))
diff --git a/src/modules/07_insignia/components/5_Borrow/Main.vue b/src/modules/07_insignia/components/5_Borrow/Main.vue
index 9543979e6..9845236a2 100644
--- a/src/modules/07_insignia/components/5_Borrow/Main.vue
+++ b/src/modules/07_insignia/components/5_Borrow/Main.vue
@@ -114,6 +114,9 @@ const visibleColumns = ref<String[]>([
   "name",
   "type",
   "employeeType",
+  "date",
+  "volumeNo",
+  "section",
   "page",
   "number",
   "vatnumber",
@@ -155,6 +158,15 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "employeeType",
+    align: "left",
+    label: "สถานภาพ",
+    field: "employeeType",
+    sortable: true,
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "type",
     align: "left",
@@ -165,10 +177,38 @@ const columns = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "employeeType",
+    name: "dateReceive",
     align: "left",
-    label: "สถานภาพ",
-    field: "employeeType",
+    label: "วันที่ได้รับพระราชทาน",
+    field: "dateReceive",
+    sortable: true,
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+
+  {
+    name: "date",
+    align: "left",
+    label: "วันที่ในราชกิจนุเบกษา",
+    field: "date",
+    sortable: true,
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "volumeNo",
+    align: "left",
+    label: "เล่มที่ในราชกิจนุเบกษา",
+    field: "volumeNo",
+    sortable: true,
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "section",
+    align: "left",
+    label: "ตอนที่ในราชกิจนุเบกษา",
+    field: "section",
     sortable: true,
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts
index 31faded03..3d3fc8b24 100644
--- a/src/modules/07_insignia/store.ts
+++ b/src/modules/07_insignia/store.ts
@@ -22,6 +22,7 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
 
   const typeReport = ref<string>("");
   const titleReport = ref<string>("");
+  const mainTab = ref<string | undefined>('pending');
 
   const setTypeandTitle = (type: string, title: string) => {
     typeReport.value = type;
@@ -110,6 +111,7 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
 
   return {
     optionsTypeOc,
+    mainTab,
     typeOc,
     rows,
     typeinsigniaOptions,
diff --git a/src/modules/07_insignia/storeAllocate.ts b/src/modules/07_insignia/storeAllocate.ts
index 14732def1..40b3127a8 100644
--- a/src/modules/07_insignia/storeAllocate.ts
+++ b/src/modules/07_insignia/storeAllocate.ts
@@ -14,6 +14,7 @@ export const useAllocateDataStore = defineStore("insigniaallocate", () => {
   const insigniaType = ref<any>()
   const rows = ref<any>([])
   const listInsignia = ref<any>([])
+  const mainTab = ref<string>("")
 
   const fetchDatainsignia = async (data: any) => {
     insignia.value = ''
@@ -22,8 +23,10 @@ export const useAllocateDataStore = defineStore("insigniaallocate", () => {
       insigniaOp.value.push({ name: e.name, id: e.id, type: e.insigniaType.id })
     });
   }
-  const fetchDatainsigniaType = async (data: any) => {
+  const fetchDatainsigniaType = async (data: any,) => {
     insigniaType.value = data.map((e: any) => ({ name: e.id, label: e.name }))
+    // mainTab.value = insigniaType.value[0].name
+
   }
   const listinsignia = async (data: any) => {
     rows.value = [];
@@ -64,6 +67,7 @@ export const useAllocateDataStore = defineStore("insigniaallocate", () => {
     listinsignia,
     selectInsignia,
     profileType,
-    insigniaName
+    insigniaName,
+    mainTab
   };
 });
diff --git a/src/modules/07_insignia/storeBrrow.ts b/src/modules/07_insignia/storeBrrow.ts
index 87d961766..342b59f1a 100644
--- a/src/modules/07_insignia/storeBrrow.ts
+++ b/src/modules/07_insignia/storeBrrow.ts
@@ -40,6 +40,10 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
       requestInsigniaId: e.requestInsigniaId,
       employeeType: profileType(e.profileType),
       profileType: e.profileType,
+      dateReceive: (e.dateReceive),
+      date: date2Thai(e.date),
+      volumeNo: e.volumeNo,
+      section: e.section,
       page: e.page,
       number: e.no,
       vatnumber: e.number,
diff --git a/src/modules/07_insignia/storeResult.ts b/src/modules/07_insignia/storeResult.ts
index 4f1d41f77..27ed3b1b4 100644
--- a/src/modules/07_insignia/storeResult.ts
+++ b/src/modules/07_insignia/storeResult.ts
@@ -47,6 +47,7 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
       type: e.requestInsignia,
       employeeType: profileType(e.profileType),
       profileType: e.profileType,
+      date: date2Thai(e.date),
       volumeNo: e.volumeNo,
       section: e.section,
       page: e.page,
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index 8b8a761a7..865ff1b9c 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -94,6 +94,7 @@ const visibleColumns = ref<String[]>([
   "name",
   "type",
   "dateReceive",
+  "date",
   "employeeType",
   "volumeNo",
   "section",
@@ -169,10 +170,19 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "date",
+    align: "left",
+    label: "วันที่ในราชกิจนุเบกษา",
+    field: "date",
+    sortable: true,
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "volumeNo",
     align: "left",
-    label: "เล่มในราชกิจนุเบกษา",
+    label: "เล่มที่ในราชกิจนุเบกษา",
     field: "volumeNo",
     sortable: true,
     sort: (a: string, b: string) =>
@@ -181,7 +191,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "section",
     align: "left",
-    label: "ตอนในราชกิจนุเบกษา",
+    label: "ตอนที่ในราชกิจนุเบกษา",
     field: "section",
     sortable: true,
     sort: (a: string, b: string) =>
@@ -191,7 +201,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "page",
     align: "left",
-    label: "หน้าในราชกิจนุเบกษา",
+    label: "หน้าที่ในราชกิจนุเบกษา",
     field: "page",
     sortable: true,
     sort: (a: string, b: string) =>