diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 7bd5d227d..c2717c0e1 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -402,6 +402,64 @@ const menuList = readonly<any[]>([
   //     },
   //   ],
   // },
+  {
+    key: 11,
+    icon: "mdi-scale-balance",
+    activeIcon: "mdi-calendar",
+    label: "วินัย",
+    path: "/discipline",
+    role: "coin",
+    children: [
+      {
+        key: 11.1,
+        label: "เรื่องร้องเรียน",
+        path: "/discipline-complaints",
+        role: "coin",
+      },
+      {
+        key: 11.2,
+        label: "สืบสวนข้อเท็จจริง",
+        path: "/discipline-investigatefacts",
+        role: "coin",
+      },
+      {
+        key: 11.3,
+        label: "สอบสวนความผิดวินัย",
+        path: "/discipline-disciplinary",
+        role: "coin",
+      },
+      {
+        key: 11.4,
+        label: "ออกคำสั่ง",
+        path: "",
+        role: "coin",
+      },
+      {
+        key: 11.5,
+        label: "รายงาน",
+        path: "",
+        role: "coin",
+      },
+      {
+        label: "ข้อมูลพื้นฐาน",
+        path: "",
+        key: 11.6,
+        role: "coin",
+        children: [
+          {
+            label: "กรรมการ",
+            path: "",
+            role: "coin",
+          },
+          {
+            label: "ช่องทางการร้องเรียน",
+            path: "",
+            role: "coin",
+          },
+        ],
+      },
+    ],
+  },
 ]);
 
 const tabList = readonly<tabType[]>([
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 86f5b97f9..f8579443e 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -261,10 +261,14 @@ const props = defineProps({
 });
 
 onMounted(async () => {
-  organization.value = await (DataStore.agency != null
-    ? DataStore.agency
-    : DataStore.typeOc);
+  // organization.value = await (DataStore.agency != null
+  //   ? DataStore.agency
+  //   : DataStore.typeOc);
+
   organizationOptions.value = await DataStore.optionsTypeOc;
+  organization.value = await DataStore.typeOc;
+  console.log(organization.value);
+
   if (organization.value !== "" || organization.value !== undefined) {
     if (props.fecthInsigniaByOc) {
       props.fecthInsigniaByOc(
@@ -347,17 +351,17 @@ const fecthlistperson = async (id: string) => {
 const clickAdd = async () => {
   dataPerson.id
     ? await myForm.value!.validate().then((result: boolean) => {
-      if (result) {
-        dialogConfirm(
-          $q,
-          async () => {
-            await addlistperson(dataPerson.id);
-          },
-          "ยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ",
-          "ต้องการยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ นี้หรือไม่?"
-        );
-      }
-    })
+        if (result) {
+          dialogConfirm(
+            $q,
+            async () => {
+              await addlistperson(dataPerson.id);
+            },
+            "ยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ",
+            "ต้องการยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ นี้หรือไม่?"
+          );
+        }
+      })
     : dialogMessageNotify($q, "กรุณาเลือกราชชื่อที่ต้องการเพิ่ม");
 };
 //เพิ่มราชชื่อข้าราชการ
@@ -415,11 +419,15 @@ const downloadFileexcel = async () => {
 
   showLoader();
   await http
-    .put(config.API.insigniaDowanload(DataStore.requestId), {
-      profileType:
-        DataStore.employeeClass == "all" ? null : DataStore.employeeClass,
-      InsigniaId: DataStore.typeinsignia == "all" ? null : findInsigniaId.id,
-    }, { responseType: "blob" })
+    .put(
+      config.API.insigniaDowanload(DataStore.requestId),
+      {
+        profileType:
+          DataStore.employeeClass == "all" ? null : DataStore.employeeClass,
+        InsigniaId: DataStore.typeinsignia == "all" ? null : findInsigniaId.id,
+      },
+      { responseType: "blob" }
+    )
     .then(async (res) => {
       await downloadFile(
         res,
@@ -695,114 +703,232 @@ const clearInsigniaFilters = (name: string) => {
   <div class="col-12 row q-pa-md">
     <div class="row col-12">
       <div class="row col-12 q-col-gutter-sm">
-        <q-select class="col-4" v-if="roleDataStore.adminRole" v-model="organization" label="หน่วยงาน" dense emit-value
-          map-options :options="filterOrganizationOP" option-value="id" option-label="name" lazy-rules use-input
-          hide-bottom-space :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false"
-          style="min-width: 150px" @update:model-value="changtypeOc" @filter="(inputValue: any,
+        <q-select
+          v-if="roleDataStore.adminRole"
+          v-model="organization"
+          label="หน่วยงาน"
+          dense
+          emit-value
+          map-options
+          :options="filterOrganizationOP"
+          option-value="id"
+          option-label="name"
+          lazy-rules
+          use-input
+          hide-bottom-space
+          :readonly="false"
+          :borderless="false"
+          :outlined="true"
+          :hide-dropdown-icon="false"
+          style="width: 400px"
+          @update:model-value="changtypeOc"
+          @filter="(inputValue: any,
             doneFn: Function) => filterSelector(inputValue, doneFn, 'filterOrganizationOP'
-            )" />
-        <q-select class="col-1" v-model="DataStore.typeinsignia" label="ประเภทเครื่องราชฯ ที่ยืนขอ" dense emit-value
-          map-options :options="typeinsigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
-          use-input :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false"
-          style="min-width: 180px" @update:model-value="
-            DataStore.searchDataTable(
-              DataStore.typeinsignia,
-              DataStore.employeeClass
-            )
-            " @filter="(inputValue: any,
-    doneFn: Function) => filterSelector(inputValue, doneFn, 'typeinsigniaOptions'
-    )">
-          <template v-if="DataStore.typeinsignia !== 'all'" v-slot:append>
-            <q-icon name="cancel" @click.stop.prevent="
-              clearInsigniaFilters('typeinsigniaOptions'),
-              DataStore.searchDataTable(
-                DataStore.typeinsignia,
-                DataStore.employeeClass
-              )
-              " class="cursor-pointer" />
-          </template>
-          <template v-slot:no-option>
-                <q-item>
-                  <q-item-section class="text-grey">
-                    ไม่มีข้อมูล
-                  </q-item-section>
-                </q-item>
-              </template>
-        </q-select>
-        <div>
-          <q-select class="col-2" v-model="DataStore.employeeClass" dense outlined lazy-rules hide-bottom-space
-            :label="`${'สถานภาพ'}`" emit-value use-input map-options option-label="name" :options="employeeClassOps"
-            option-value="id" :readonly="false" :borderless="false" style="min-width: 150px" @update:model-value="
-              DataStore.searchDataTable(
-                DataStore.typeinsignia,
-                DataStore.employeeClass
-              )
-              " @filter="(inputValue: any,
-    doneFn: Function) => filterSelector(inputValue, doneFn, 'employeeClassOps'
-    )">
-            <template v-if="DataStore.employeeClass !== 'all'" v-slot:append>
-              <q-icon name="cancel" @click.stop.prevent="
-                clearInsigniaFilters('employeeClassOps'),
-                DataStore.searchDataTable(
-                  DataStore.typeinsignia,
-                  DataStore.employeeClass
-                )
-                " class="cursor-pointer" />
-            </template>
-            <template v-slot:no-option>
-                <q-item>
-                  <q-item-section class="text-grey">
-                    ไม่มีข้อมูล
-                  </q-item-section>
-                </q-item>
-              </template>
-          </q-select>
-        </div>
-        <div>
-          <q-btn size="md" icon="mdi-download" flat round color="primary" @click="downloadFileexcel">
-            <q-tooltip>ดาวน์โหลด</q-tooltip>
-          </q-btn>
-          <q-btn size="12px" flat round color="add" icon="mdi-plus" @click="clickmodalAdd" v-if="(DataStore.isLock == false &&
-              DataStore.requestStatus == 'st5' &&
-              roleDataStore.adminRole) ||
-            checkStatus == true
-            ">
-            <q-tooltip>เพิ่ม</q-tooltip>
-          </q-btn>
-        </div>
+            )"
+        />
         <q-space />
 
-        <q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
-          debounce="300" placeholder="ค้นหา">
+        <q-input
+          class="col-xs-12 col-sm-3 col-md-2"
+          standout
+          dense
+          v-model="filterKeyword"
+          ref="filterRef"
+          outlined
+          debounce="300"
+          placeholder="ค้นหา"
+        >
           <template v-slot:append>
             <q-icon v-if="filterKeyword == ''" name="search" />
-            <q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
+            <q-icon
+              v-if="filterKeyword !== ''"
+              name="clear"
+              class="cursor-pointer"
+              @click="resetFilter"
+            />
           </template>
         </q-input>
 
-        <q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
-          emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
-          class="col-xs-12 col-sm-3 col-md-2" />
+        <q-select
+          v-model="visibleColumns"
+          multiple
+          outlined
+          dense
+          options-dense
+          :display-value="$q.lang.table.columns"
+          emit-value
+          map-options
+          :options="columns"
+          option-value="name"
+          options-cover
+          style="min-width: 150px"
+          class="col-xs-12 col-sm-3 col-md-2"
+        />
       </div>
+      <q-card bordered class="q-pa-sm col-12 bg-grey-1 q-mt-sm">
+        <div class="row col-12 q-col-gutter-sm">
+          <q-select
+            :class="roleDataStore.adminRole ? 'col-1':'col-3'"
+            v-model="DataStore.typeinsignia"
+            label="ประเภทเครื่องราชฯ ที่ยืนขอ"
+            dense
+            emit-value
+            map-options
+            :options="typeinsigniaOptions"
+            option-value="id"
+            option-label="name"
+            lazy-rules
+            hide-bottom-space
+            use-input
+            :readonly="false"
+            :borderless="false"
+            :outlined="true"
+            :hide-dropdown-icon="false"
+            style="min-width: 180px"
+            @update:model-value="
+              DataStore.searchDataTable(
+                DataStore.typeinsignia,
+                DataStore.employeeClass
+              )
+            "
+            @filter="(inputValue: any,
+      doneFn: Function) => filterSelector(inputValue, doneFn, 'typeinsigniaOptions'
+      )"
+          >
+            <template v-if="DataStore.typeinsignia !== 'all'" v-slot:append>
+              <q-icon
+                name="cancel"
+                @click.stop.prevent="
+                  clearInsigniaFilters('typeinsigniaOptions'),
+                    DataStore.searchDataTable(
+                      DataStore.typeinsignia,
+                      DataStore.employeeClass
+                    )
+                "
+                class="cursor-pointer"
+              />
+            </template>
+            <template v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+              </q-item>
+            </template>
+          </q-select>
+          <q-select
+            v-model="DataStore.employeeClass"
+            dense
+            outlined
+            lazy-rules
+            hide-bottom-space
+            :label="`${'สถานภาพ'}`"
+            emit-value
+            use-input
+            map-options
+            option-label="name"
+            :options="employeeClassOps"
+            option-value="id"
+            :readonly="false"
+            :borderless="false"
+            style="width: 280px"
+            @update:model-value="
+              DataStore.searchDataTable(
+                DataStore.typeinsignia,
+                DataStore.employeeClass
+              )
+            "
+            @filter="(inputValue: any,
+    doneFn: Function) => filterSelector(inputValue, doneFn, 'employeeClassOps'
+    )"
+          >
+            <template v-if="DataStore.employeeClass !== 'all'" v-slot:append>
+              <q-icon
+                name="cancel"
+                @click.stop.prevent="
+                  clearInsigniaFilters('employeeClassOps'),
+                    DataStore.searchDataTable(
+                      DataStore.typeinsignia,
+                      DataStore.employeeClass
+                    )
+                "
+                class="cursor-pointer"
+              />
+            </template>
+            <template v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+              </q-item>
+            </template>
+          </q-select>
+          <q-space />
+          <div>
+            <q-btn
+              size="md"
+              icon="mdi-download"
+              flat
+              round
+              color="primary"
+              @click="downloadFileexcel"
+            >
+              <q-tooltip>ดาวน์โหลด</q-tooltip>
+            </q-btn>
+            <q-btn
+              size="12px"
+              flat
+              round
+              color="add"
+              icon="mdi-plus"
+              @click="clickmodalAdd"
+              v-if="
+                (DataStore.isLock == false &&
+                  DataStore.requestStatus == 'st5' &&
+                  roleDataStore.adminRole) ||
+                checkStatus == true
+              "
+            >
+              <q-tooltip>เพิ่ม</q-tooltip>
+            </q-btn>
+          </div>
+        </div>
+      </q-card>
       <div class="col-12 q-pt-sm">
-        <q-table ref="table" :columns="columns" :rows="DataStore.rows" :filter="filterKeyword" row-key="name" flat
-          bordered :paging="true" dense class="custom-header-table" :visible-columns="visibleColumns"
-          :pagination-label="paginationLabel" v-model:pagination="pagination">
+        <q-table
+          ref="table"
+          :columns="columns"
+          :rows="DataStore.rows"
+          :filter="filterKeyword"
+          row-key="name"
+          flat
+          bordered
+          :paging="true"
+          dense
+          class="custom-header-table"
+          :visible-columns="visibleColumns"
+          :pagination-label="paginationLabel"
+          v-model:pagination="pagination"
+        >
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
               <q-th></q-th>
-              <q-th auto-width v-if="(DataStore.isLock == false &&
-                  DataStore.requestStatus == 'st5') ||
-                checkStatus == true
-                " />
+              <q-th
+                auto-width
+                v-if="
+                  (DataStore.isLock == false &&
+                    DataStore.requestStatus == 'st5') ||
+                  checkStatus == true
+                "
+              />
               <q-th v-else></q-th>
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer" @click.stop="nextPage(props.row.profileId)">
+            <q-tr
+              :props="props"
+              class="cursor-pointer"
+              @click.stop="nextPage(props.row.profileId)"
+            >
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
@@ -837,50 +963,112 @@ const clearInsigniaFilters = (name: string) => {
                 {{ props.row.dateSend }}
               </q-td>
               <q-td key="note" class="text-center">
-                <q-btn v-if="props.row.reason" icon="mdi-information-outline" size="12px" color="blue" flat round dense
-                  @click.stop="clickShowreson(props.row.name, props.row.reason)">
+                <q-btn
+                  v-if="props.row.reason"
+                  icon="mdi-information-outline"
+                  size="12px"
+                  color="blue"
+                  flat
+                  round
+                  dense
+                  @click.stop="clickShowreson(props.row.name, props.row.reason)"
+                >
                   <q-tooltip>หมายเหตุ</q-tooltip>
                 </q-btn>
               </q-td>
               <q-td key="warn" class="text-center" v-if="props.row.statusMark">
-                <q-btn icon="mdi-information-outline" size="12px" color="red" flat round dense @click.stop="
-                  clickShowWarn(
-                    props.row.markDiscipline,
-                    props.row.markLeave,
-                    props.row.markRate
-                  )
-                  ">
-                  <q-tooltip>แจ้งเตือน</q-tooltip></q-btn>
+                <q-btn
+                  icon="mdi-information-outline"
+                  size="12px"
+                  color="red"
+                  flat
+                  round
+                  dense
+                  @click.stop="
+                    clickShowWarn(
+                      props.row.markDiscipline,
+                      props.row.markLeave,
+                      props.row.markRate
+                    )
+                  "
+                >
+                  <q-tooltip>แจ้งเตือน</q-tooltip></q-btn
+                >
               </q-td>
               <q-td v-else auto-width></q-td>
 
-              <q-td v-close-popup auto-width v-if="(DataStore.isLock == false &&
-                  DataStore.requestStatus == 'st5' &&
-                  roleDataStore.adminRole) ||
-                checkStatus == true
-                ">
-                <q-btn v-if="roleDataStore.adminRole ||
-                  (roleDataStore.insignia1Role &&
-                    (requestStatus == 'st1' || requestStatus == 'st4'))
-                  " icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense @click.stop>
+              <q-td
+                v-close-popup
+                auto-width
+                v-if="
+                  (DataStore.isLock == false &&
+                    DataStore.requestStatus == 'st5' &&
+                    roleDataStore.adminRole) ||
+                  checkStatus == true
+                "
+              >
+                <q-btn
+                  v-if="
+                    roleDataStore.adminRole ||
+                    (roleDataStore.insignia1Role &&
+                      (requestStatus == 'st1' || requestStatus == 'st4'))
+                  "
+                  icon="mdi-dots-vertical"
+                  size="12px"
+                  color="grey-7"
+                  flat
+                  round
+                  dense
+                  @click.stop
+                >
                   <q-menu transition-show="jump-down" transition-hide="jump-up">
                     <q-list dense style="min-width: 250px">
-                      <q-item clickable @click.stop="clickmodalEdit(props.row)" v-close-popup>
-                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-item
+                        clickable
+                        @click.stop="clickmodalEdit(props.row)"
+                        v-close-popup
+                      >
+                        <q-item-section
+                          style="min-width: 0px"
+                          avatar
+                          class="q-py-sm"
+                        >
                           <q-tooltip>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-tooltip>
                           <q-icon color="primary" size="xs" name="mdi-pencil" />
                         </q-item-section>
-                        <q-item-section>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section>
+                        <q-item-section
+                          >แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section
+                        >
                       </q-item>
-                      <q-item clickable @click.stop="clickReject(props.row.id)" v-close-popup>
-                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-item
+                        clickable
+                        @click.stop="clickReject(props.row.id)"
+                        v-close-popup
+                      >
+                        <q-item-section
+                          style="min-width: 0px"
+                          avatar
+                          class="q-py-sm"
+                        >
                           <q-tooltip>ไม่ยื่นขอ</q-tooltip>
-                          <q-icon color="blue" size="xs" name="mdi-alert-circle-outline" />
+                          <q-icon
+                            color="blue"
+                            size="xs"
+                            name="mdi-alert-circle-outline"
+                          />
                         </q-item-section>
                         <q-item-section>ไม่ยื่นขอ</q-item-section>
                       </q-item>
-                      <q-item clickable @click.stop="clickDelete(props.row.id)" v-close-popup>
-                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-item
+                        clickable
+                        @click.stop="clickDelete(props.row.id)"
+                        v-close-popup
+                      >
+                        <q-item-section
+                          style="min-width: 0px"
+                          avatar
+                          class="q-py-sm"
+                        >
                           <q-tooltip>ลบออก</q-tooltip>
                           <q-icon color="red" size="xs" name="mdi-delete" />
                         </q-item-section>
@@ -891,16 +1079,30 @@ const clearInsigniaFilters = (name: string) => {
                 </q-btn>
               </q-td>
               <q-td v-else auto-width></q-td>
-              <q-td auto-width v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'">
-                <btnDownloadFile :profileId="props.row.profileId" :round="DataStore.roundId"
-                  :optionRound="DataStore.optionRound" />
+              <q-td
+                auto-width
+                v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'"
+              >
+                <btnDownloadFile
+                  :profileId="props.row.profileId"
+                  :round="DataStore.roundId"
+                  :optionRound="DataStore.optionRound"
+                />
               </q-td>
               <q-td v-else auto-width></q-td>
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination v-model="pagination.page" active-color="primary" color="primary" :max="scope.pagesNumber"
-              :max-pages="5" size="sm" boundary-links direction-links></q-pagination>
+            <q-pagination
+              v-model="pagination.page"
+              active-color="primary"
+              color="primary"
+              :max="scope.pagesNumber"
+              :max-pages="5"
+              size="sm"
+              boundary-links
+              direction-links
+            ></q-pagination>
           </template>
         </q-table>
       </div>
@@ -912,8 +1114,14 @@ const clearInsigniaFilters = (name: string) => {
       <q-toolbar class="q-py-md">
         <q-toolbar-title class="text-h6">เพิ่มรายชื่อ </q-toolbar-title>
 
-        <q-btn icon="close" unelevated round dense @click="modalAdd = false"
-          style="color: #ff8080; background-color: #ffdede" />
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="modalAdd = false"
+          style="color: #ff8080; background-color: #ffdede"
+        />
       </q-toolbar>
       <q-separator />
       <q-card-section class="q-pa-sm bg-grey-1">
@@ -922,24 +1130,49 @@ const clearInsigniaFilters = (name: string) => {
             <q-card flat bordered class="fit q-pa-sm">
               <q-toolbar style="padding: 0">
                 <q-space />
-                <q-input borderless outlined dense debounce="300" placeholder="ค้นหา" v-model="filterKeyword2">
+                <q-input
+                  borderless
+                  outlined
+                  dense
+                  debounce="300"
+                  placeholder="ค้นหา"
+                  v-model="filterKeyword2"
+                >
                   <template v-slot:append>
                     <q-icon name="search" />
                   </template>
                 </q-input>
               </q-toolbar>
-              <q-table flat bordered dense :rows="rows2" :columns="columns2" :filter="filterKeyword2" row-key="fullname"
-                class="custom-header-table" :pagination-label="paginationLabel2" v-model:pagination="pagination2">
+              <q-table
+                flat
+                bordered
+                dense
+                :rows="rows2"
+                :columns="columns2"
+                :filter="filterKeyword2"
+                row-key="fullname"
+                class="custom-header-table"
+                :pagination-label="paginationLabel2"
+                v-model:pagination="pagination2"
+              >
                 <template v-slot:header="props">
                   <q-tr :props="props">
-                    <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                    <q-th
+                      v-for="col in props.cols"
+                      :key="col.name"
+                      :props="props"
+                    >
                       <span class="text-weight-medium">{{ col.label }}</span>
                     </q-th>
                   </q-tr>
                 </template>
                 <template v-slot:body="props">
-                  <q-tr :props="props" class="cursor-pointer" :class="{ 'text-primary': props.row.id === dataPerson.id }"
-                    @click="selectPerson(props.row)">
+                  <q-tr
+                    :props="props"
+                    class="cursor-pointer"
+                    :class="{ 'text-primary': props.row.id === dataPerson.id }"
+                    @click="selectPerson(props.row)"
+                  >
                     <q-td style="width: 75px">{{ props.rowIndex + 1 }}</q-td>
                     <q-td style="width: 250px" key="citizenId" :props="props">
                       {{ props.row.citizenId }}
@@ -950,8 +1183,15 @@ const clearInsigniaFilters = (name: string) => {
                   </q-tr>
                 </template>
                 <template v-slot:pagination="scope">
-                  <q-pagination v-model="pagination2.page" color="primary" :max="scope.pagesNumber" :max-pages="5"
-                    size="sm" boundary-links direction-links></q-pagination>
+                  <q-pagination
+                    v-model="pagination2.page"
+                    color="primary"
+                    :max="scope.pagesNumber"
+                    :max-pages="5"
+                    size="sm"
+                    boundary-links
+                    direction-links
+                  ></q-pagination>
                 </template>
               </q-table>
             </q-card>
@@ -962,28 +1202,71 @@ const clearInsigniaFilters = (name: string) => {
                 <div class="q-pa-md">
                   <div class="row q-gutter-sm">
                     <div class="col-12">
-                      <q-input borderless outlined dense label="ตำแหน่งในสายงาน" placeholder="ตำแหน่งในสายงาน"
-                        v-model="dataPerson.position" readonly />
+                      <q-input
+                        borderless
+                        outlined
+                        dense
+                        label="ตำแหน่งในสายงาน"
+                        placeholder="ตำแหน่งในสายงาน"
+                        v-model="dataPerson.position"
+                        readonly
+                      />
                     </div>
                     <div class="col-12">
-                      <q-input borderless outlined dense label="สังกัด" placeholder="สังกัด"
-                        v-model="dataPerson.organizationOrganization" readonly />
+                      <q-input
+                        borderless
+                        outlined
+                        dense
+                        label="สังกัด"
+                        placeholder="สังกัด"
+                        v-model="dataPerson.organizationOrganization"
+                        readonly
+                      />
                     </div>
                     <div class="col-12">
-                      <q-input borderless outlined dense label="ระดับ" placeholder="ระดับ " v-model="dataPerson.level"
-                        readonly />
+                      <q-input
+                        borderless
+                        outlined
+                        dense
+                        label="ระดับ"
+                        placeholder="ระดับ "
+                        v-model="dataPerson.level"
+                        readonly
+                      />
                     </div>
                     <div class="col-12">
-                      <q-select v-model="insigniaType" label="ประเภทเครื่องราชฯ" dense emit-value map-options
-                        :options="insigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
-                        :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" :rules="[
+                      <q-select
+                        v-model="insigniaType"
+                        label="ประเภทเครื่องราชฯ"
+                        dense
+                        emit-value
+                        map-options
+                        :options="insigniaOptions"
+                        option-value="id"
+                        option-label="name"
+                        lazy-rules
+                        hide-bottom-space
+                        :readonly="false"
+                        :borderless="false"
+                        :outlined="true"
+                        :hide-dropdown-icon="false"
+                        :rules="[
                           (val) => !!val || `กรุณาเลือกประเภทเครื่องราช`,
-                        ]" />
+                        ]"
+                      />
                     </div>
                     <div class="col-12">
-                      <q-input type="textarea" class="full-width inputgreen cursor-pointer" hide-bottom-space outlined
-                        dense lazy-rules :rules="[(val) => !!val || `กรุณากรอกหมายเหตุ`]" v-model="reason"
-                        :label="`หมายเหตุ`" />
+                      <q-input
+                        type="textarea"
+                        class="full-width inputgreen cursor-pointer"
+                        hide-bottom-space
+                        outlined
+                        dense
+                        lazy-rules
+                        :rules="[(val) => !!val || `กรุณากรอกหมายเหตุ`]"
+                        v-model="reason"
+                        :label="`หมายเหตุ`"
+                      />
                     </div>
                   </div>
                 </div>
@@ -1005,18 +1288,42 @@ const clearInsigniaFilters = (name: string) => {
   <q-dialog v-model="modalEdit" persistent>
     <q-card style="width: 450px; max-width: 80vw">
       <q-form ref="myForm">
-        <DialogHeader tittle="แก้ไขเครื่องราชฯ ที่ยื่นขอ" :close="closeModalEdit" />
+        <DialogHeader
+          tittle="แก้ไขเครื่องราชฯ ที่ยื่นขอ"
+          :close="closeModalEdit"
+        />
         <q-separator />
         <q-card-section class="q-pa-sm bg-grey-1">
           <div class="row col-12 q-py-md">
-            <q-select v-model="insignia" label="ชื่อเครื่องราชฯ" dense emit-value map-options :options="insigniaOptions"
-              option-value="id" option-label="name" lazy-rules hide-bottom-space :readonly="false" :borderless="false"
-              :outlined="true" :hide-dropdown-icon="false" style="width: 100%" />
+            <q-select
+              v-model="insignia"
+              label="ชื่อเครื่องราชฯ"
+              dense
+              emit-value
+              map-options
+              :options="insigniaOptions"
+              option-value="id"
+              option-label="name"
+              lazy-rules
+              hide-bottom-space
+              :readonly="false"
+              :borderless="false"
+              :outlined="true"
+              :hide-dropdown-icon="false"
+              style="width: 100%"
+            />
           </div>
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn dense unelevated label="บันทึก" color="public" @click="clickSave" class="q-px-md">
+          <q-btn
+            dense
+            unelevated
+            label="บันทึก"
+            color="public"
+            @click="clickSave"
+            class="q-px-md"
+          >
             <!-- icon="mdi-content-save-outline" -->
             <q-tooltip>บันทึก</q-tooltip>
           </q-btn>
@@ -1026,27 +1333,59 @@ const clearInsigniaFilters = (name: string) => {
   </q-dialog>
 
   <!-- popup เหตุผลไม่ยื่นขอ -->
-  <DialogPopupReason :modal="modelPopupReject" title="เหตุผลการไม่ยื่นขอ" label="หมายเหตุ"
-    :click-close="closemodelPopupReject" :savaForm="savaReasonReject" />
+  <DialogPopupReason
+    :modal="modelPopupReject"
+    title="เหตุผลการไม่ยื่นขอ"
+    label="หมายเหตุ"
+    :click-close="closemodelPopupReject"
+    :savaForm="savaReasonReject"
+  />
   <!--  เหตุผลที่ลบออก -->
-  <DialogPopupReason :modal="modelPopupDelete" title="เหตุผลการลบออก" label="หมายเหตุ"
-    :click-close="closemodelPopupDelete" :savaForm="savaReasonDelete" />
+  <DialogPopupReason
+    :modal="modelPopupDelete"
+    title="เหตุผลการลบออก"
+    label="หมายเหตุ"
+    :click-close="closemodelPopupDelete"
+    :savaForm="savaReasonDelete"
+  />
   <!--  หมายเหตุ -->
-  <DialogInformation :modal="dialogNote" :title="dialogTitle" :desc="dialogDesc" :click-close="clickCloseReson" />
+  <DialogInformation
+    :modal="dialogNote"
+    :title="dialogTitle"
+    :desc="dialogDesc"
+    :click-close="clickCloseReson"
+  />
   <!-- แจ้งเตือน -->
   <q-dialog v-model="dialogWarn">
     <q-card style="width: 800px; max-width: 80vw">
       <q-toolbar class="q-py-md">
         <q-toolbar-title class="text-h6">แจ้งเตือน </q-toolbar-title>
 
-        <q-btn icon="close" unelevated round dense v-close-popup style="color: #ff8080; background-color: #ffdede" />
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          v-close-popup
+          style="color: #ff8080; background-color: #ffdede"
+        />
       </q-toolbar>
       <q-separator />
       <div class="q-pa-md">
         <div class="q-gutter-sm">
-          <q-item tag="label" v-ripple v-for="list in checkboxData" :key="list.id">
+          <q-item
+            tag="label"
+            v-ripple
+            v-for="list in checkboxData"
+            :key="list.id"
+          >
             <q-item-section avatar>
-              <q-checkbox v-model="list.val" :val="`${list.id}`" color="teal" disable />
+              <q-checkbox
+                v-model="list.val"
+                :val="`${list.id}`"
+                color="teal"
+                disable
+              />
               <!-- <q-radio v-model="checkboxList" :val="list.id" color="teal" /> -->
             </q-item-section>
             <q-item-section>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab2.vue b/src/modules/07_insignia/components/2_Manage/Tab2.vue
index c30cbf972..d5e2261ca 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab2.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab2.vue
@@ -148,10 +148,11 @@ const columns = ref<QTableProps["columns"]>([
 // ข้อมูลตาราง (จำลอง)
 
 onMounted(async () => {
-  organizationOptions.value = DataStore.optionsTypeOc;
-  organization.value = await (DataStore.agency != null
-    ? DataStore.agency
-    : DataStore.typeOc);
+  organizationOptions.value = await DataStore.optionsTypeOc;
+  organization.value = await DataStore.typeOc;
+  // organization.value = await (DataStore.agency != null
+  //   ? DataStore.agency
+  //   : DataStore.typeOc);
   if (organization.value !== "" || organization.value !== undefined) {
     if (props.fecthInsigniaByOc) {
       await props.fecthInsigniaByOc(
@@ -163,7 +164,7 @@ onMounted(async () => {
       DataStore.mainTab = props.tab;
     }
   }
-  filterOrganizationOP.value = organizationOptions.value
+  filterOrganizationOP.value = organizationOptions.value;
 });
 // เลือกหน่วยงาน
 const changtypeOc = () => {
@@ -214,32 +215,28 @@ const closeReson = () => {
 const filterSelector = (val: any, update: Function, name: any) => {
   update(() => {
     const needle = val.toLowerCase();
-    if (name === 'typeinsigniaOptions') {
-      DataStore.typeinsignia = ''
-        typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    }
-    else if(name === 'employeeClassOps'){
-      DataStore.employeeClass = ''
-        employeeClassOps.value = DataStore.employeeClassOps.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    }
-    else if(name === 'filterOrganizationOP'){
+    if (name === "typeinsigniaOptions") {
+      DataStore.typeinsignia = "";
+      typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter(
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
+    } else if (name === "employeeClassOps") {
+      DataStore.employeeClass = "";
+      employeeClassOps.value = DataStore.employeeClassOps.filter(
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
+    } else if (name === "filterOrganizationOP") {
       filterOrganizationOP.value = organizationOptions.value.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
     }
-
-    }
-  )
-}
+  });
+};
 const clearInsigniaFilters = (name: string) => {
   if (name === "typeinsigniaOptions") {
     DataStore.typeinsignia = "all";
     typeinsigniaOptions.value = DataStore.typeinsigniaOptions;
-  } else if (name === 'employeeClassOps') {
+  } else if (name === "employeeClassOps") {
     DataStore.employeeClass = "all";
     employeeClassOps.value = DataStore.employeeClassOps;
   }
@@ -250,7 +247,6 @@ const clearInsigniaFilters = (name: string) => {
     <div class="row col-12">
       <div class="row col-12 q-col-gutter-sm">
         <q-select
-        class="col-4"
           v-if="roleDataStore.adminRole"
           v-model="organization"
           label="หน่วยงาน"
@@ -267,14 +263,54 @@ const clearInsigniaFilters = (name: string) => {
           :borderless="false"
           :outlined="true"
           :hide-dropdown-icon="false"
-          style="min-width: 150px"
+          style="width: 400px"
           @update:model-value="changtypeOc"
           @filter="(inputValue:any,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'filterOrganizationOP'
                       ) "
         />
+        <q-space />
+
+        <q-input
+          class="col-xs-12 col-sm-3 col-md-2"
+          standout
+          dense
+          v-model="filterKeyword"
+          ref="filterRef"
+          outlined
+          debounce="300"
+          placeholder="ค้นหา"
+        >
+          <template v-slot:append>
+            <q-icon v-if="filterKeyword == ''" name="search" />
+            <q-icon
+              v-if="filterKeyword !== ''"
+              name="clear"
+              class="cursor-pointer"
+              @click="resetFilter"
+            />
+          </template>
+        </q-input>
+
+        <q-select
+          v-model="visibleColumns"
+          multiple
+          outlined
+          dense
+          options-dense
+          :display-value="$q.lang.table.columns"
+          emit-value
+          map-options
+          :options="columns"
+          option-value="name"
+          options-cover
+          style="min-width: 150px"
+          class="col-xs-12 col-sm-3 col-md-2"
+        />
+      </div>
+      <q-card bordered class="q-pa-sm col-12 bg-grey-1 q-mt-sm">
+        <div class="row col-12 q-col-gutter-sm">
         <q-select
-        class="col-1"
           v-model="DataStore.typeinsignia"
           label="ประเภทเครื่องราชฯ ที่ยืนขอ"
           dense
@@ -315,102 +351,58 @@ const clearInsigniaFilters = (name: string) => {
             />
           </template>
           <template v-slot:no-option>
-                <q-item>
-                  <q-item-section class="text-grey">
-                    ไม่มีข้อมูล
-                  </q-item-section>
-                </q-item>
-              </template>
+            <q-item>
+              <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+            </q-item>
+          </template>
         </q-select>
-        <div>
-          <q-select
-          class="col-2"
-            v-model="DataStore.employeeClass"
-            dense
-            outlined
-            lazy-rules
-            hide-bottom-space
-            :label="`${'สถานภาพ'}`"
-            emit-value
-            use-input
-            map-options
-            option-label="name"
-            :options="employeeClassOps"
-            option-value="id"
-            :readonly="false"
-            :borderless="false"
-            style="min-width: 150px"
-            @update:model-value="
-              DataStore.searchDataTable(
-                DataStore.typeinsignia,
-                DataStore.employeeClass
-              )
-            "
-            @filter="(inputValue:any,
-                      doneFn:Function) => filterSelector(inputValue, doneFn,'employeeClassOps'
-                      ) "
-          >
-            <template v-if="DataStore.employeeClass !== 'all'" v-slot:append>
-              <q-icon
-                name="cancel"
-                @click.stop.prevent="
-                  clearInsigniaFilters('employeeClassOps'),
-                    DataStore.searchDataTable(
-                      DataStore.typeinsignia,
-                      DataStore.employeeClass
-                    )
-                "
-                class="cursor-pointer"
-              />
-            </template>
-            <template v-slot:no-option>
-                <q-item>
-                  <q-item-section class="text-grey">
-                    ไม่มีข้อมูล
-                  </q-item-section>
-                </q-item>
-              </template>
-          </q-select>
-        </div>
-        <q-space />
-
-        <q-input
-          class="col-xs-12 col-sm-3 col-md-2"
-          standout
+        <q-select
+          v-model="DataStore.employeeClass"
           dense
-          v-model="filterKeyword"
-          ref="filterRef"
           outlined
-          debounce="300"
-          placeholder="ค้นหา"
+          lazy-rules
+          hide-bottom-space
+          :label="`${'สถานภาพ'}`"
+          emit-value
+          use-input
+          map-options
+          option-label="name"
+          :options="employeeClassOps"
+          option-value="id"
+          :readonly="false"
+          :borderless="false"
+          style="width: 300px"
+          @update:model-value="
+            DataStore.searchDataTable(
+              DataStore.typeinsignia,
+              DataStore.employeeClass
+            )
+          "
+          @filter="(inputValue:any,
+                    doneFn:Function) => filterSelector(inputValue, doneFn,'employeeClassOps'
+                    ) "
         >
-          <template v-slot:append>
-            <q-icon v-if="filterKeyword == ''" name="search" />
+          <template v-if="DataStore.employeeClass !== 'all'" v-slot:append>
             <q-icon
-              v-if="filterKeyword !== ''"
-              name="clear"
+              name="cancel"
+              @click.stop.prevent="
+                clearInsigniaFilters('employeeClassOps'),
+                  DataStore.searchDataTable(
+                    DataStore.typeinsignia,
+                    DataStore.employeeClass
+                  )
+              "
               class="cursor-pointer"
-              @click="resetFilter"
             />
           </template>
-        </q-input>
-
-        <q-select
-          v-model="visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="columns"
-          option-value="name"
-          options-cover
-          style="min-width: 150px"
-          class="col-xs-12 col-sm-3 col-md-2"
-        />
-      </div>
+          <template v-slot:no-option>
+            <q-item>
+              <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+            </q-item>
+          </template>
+        </q-select>
+        </div>
+      </q-card>
       <div class="col-12 q-pt-sm">
         <q-table
           ref="table"
diff --git a/src/modules/07_insignia/components/2_Manage/Tab3.vue b/src/modules/07_insignia/components/2_Manage/Tab3.vue
index e16e9e537..a761ef7b0 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab3.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab3.vue
@@ -28,7 +28,7 @@ const props = defineProps({
 });
 const typeinsigniaOptions = ref<any>(DataStore.typeinsigniaOptions);
 const employeeClassOps = ref<any>(DataStore.employeeClassOps);
-  const filterOrganizationOP = ref<any>([]);
+const filterOrganizationOP = ref<any>([]);
 const organization = ref<string>("1");
 const organizationOptions = ref<any>([{ id: "1", name: "ทั้งหมด" }]);
 const visibleColumns = ref<string[]>([
@@ -147,10 +147,10 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 onMounted(async () => {
   organizationOptions.value = DataStore.optionsTypeOc;
-  organization.value = await (DataStore.agency != null
-    ? DataStore.agency
-    : DataStore.typeOc);
-
+  // organization.value = await (DataStore.agency != null
+  //   ? DataStore.agency
+  //   : DataStore.typeOc);
+  organization.value = await DataStore.typeOc;
   if (organization.value !== "" || organization.value !== undefined) {
     if (props.fecthInsigniaByOc) {
       await props.fecthInsigniaByOc(
@@ -162,7 +162,7 @@ onMounted(async () => {
       DataStore.mainTab = props.tab;
     }
   }
-  filterOrganizationOP.value = organizationOptions.value
+  filterOrganizationOP.value = organizationOptions.value;
 });
 const changtypeOc = async () => {
   if (props.fecthInsigniaByOc) {
@@ -211,32 +211,28 @@ const closeReson = () => {
 const filterSelector = (val: any, update: Function, name: any) => {
   update(() => {
     const needle = val.toLowerCase();
-    if (name === 'typeinsigniaOptions') {
-      DataStore.typeinsignia = ''
-        typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    }
-    else if(name === 'employeeClassOps'){
-      DataStore.employeeClass = ''
-        employeeClassOps.value = DataStore.employeeClassOps.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    }
-    else if(name === 'filterOrganizationOP'){
+    if (name === "typeinsigniaOptions") {
+      DataStore.typeinsignia = "";
+      typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter(
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
+    } else if (name === "employeeClassOps") {
+      DataStore.employeeClass = "";
+      employeeClassOps.value = DataStore.employeeClassOps.filter(
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
+    } else if (name === "filterOrganizationOP") {
       filterOrganizationOP.value = organizationOptions.value.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
     }
-
-    }
-  )
-}
+  });
+};
 const clearInsigniaFilters = (name: string) => {
   if (name === "typeinsigniaOptions") {
     DataStore.typeinsignia = "all";
     typeinsigniaOptions.value = DataStore.typeinsigniaOptions;
-  } else if (name === 'employeeClassOps') {
+  } else if (name === "employeeClassOps") {
     DataStore.employeeClass = "all";
     employeeClassOps.value = DataStore.employeeClassOps;
   }
@@ -247,7 +243,6 @@ const clearInsigniaFilters = (name: string) => {
     <div class="row col-12">
       <div class="row col-12 q-col-gutter-sm">
         <q-select
-        class="col-4"
           v-if="roleDataStore.adminRole"
           v-model="organization"
           label="หน่วยงาน"
@@ -264,111 +259,12 @@ const clearInsigniaFilters = (name: string) => {
           :borderless="false"
           :outlined="true"
           :hide-dropdown-icon="false"
-          style="min-width: 150px"
+          style="width: 400px"
           @update:model-value="changtypeOc"
           @filter="(inputValue:any,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'filterOrganizationOP'
                       ) "
         />
-        <q-select
-        class="col-1"
-          v-model="DataStore.typeinsignia"
-          label="ประเภทเครื่องราชฯ ที่ยืนขอ"
-          dense
-          emit-value
-          map-options
-          :options="typeinsigniaOptions"
-          option-value="id"
-          option-label="name"
-          lazy-rules
-          hide-bottom-space
-          use-input
-          :readonly="false"
-          :borderless="false"
-          :outlined="true"
-          :hide-dropdown-icon="false"
-          style="min-width: 180px"
-          @update:model-value="
-            DataStore.searchDataTable(
-              DataStore.typeinsignia,
-              DataStore.employeeClass
-            )
-          "
-          @filter="(inputValue:any,
-                      doneFn:Function) => filterSelector(inputValue, doneFn,'typeinsigniaOptions'
-                      ) "
-        >
-          <template v-if="DataStore.typeinsignia !== 'all'" v-slot:append>
-            <q-icon
-              name="cancel"
-              @click.stop.prevent="
-                clearInsigniaFilters('typeinsigniaOptions'),
-                  DataStore.searchDataTable(
-                    DataStore.typeinsignia,
-                    DataStore.employeeClass
-                  )
-              "
-              class="cursor-pointer"
-            />
-          </template>
-          <template v-slot:no-option>
-                <q-item>
-                  <q-item-section class="text-grey">
-                    ไม่มีข้อมูล
-                  </q-item-section>
-                </q-item>
-              </template>
-        </q-select>
-        <div>
-          <q-select
-          class="col-2"
-            v-model="DataStore.employeeClass"
-            dense
-            outlined
-            lazy-rules
-            hide-bottom-space
-            :label="`${'สถานภาพ'}`"
-            emit-value
-            use-input
-            map-options
-            option-label="name"
-            :options="employeeClassOps"
-            option-value="id"
-            :readonly="false"
-            :borderless="false"
-            style="min-width: 150px"
-            @update:model-value="
-              DataStore.searchDataTable(
-                DataStore.typeinsignia,
-                DataStore.employeeClass
-              )
-            "
-            @filter="(inputValue:any,
-                      doneFn:Function) => filterSelector(inputValue, doneFn,'employeeClassOps'
-                      ) "
-          >
-            <template v-if="DataStore.employeeClass !== 'all'" v-slot:append>
-              <q-icon
-                name="cancel"
-                @click.stop.prevent="
-                  clearInsigniaFilters('employeeClassOps'),
-                    DataStore.searchDataTable(
-                      DataStore.typeinsignia,
-                      DataStore.employeeClass
-                    )
-                "
-                class="cursor-pointer"
-              />
-            </template>
-            <template v-slot:no-option>
-                <q-item>
-                  <q-item-section class="text-grey">
-                    ไม่มีข้อมูล
-                  </q-item-section>
-                </q-item>
-              </template>
-          </q-select>
-        </div>
         <q-space />
 
         <q-input
@@ -408,6 +304,101 @@ const clearInsigniaFilters = (name: string) => {
           class="col-xs-12 col-sm-3 col-md-2"
         />
       </div>
+      <q-card bordered class="q-pa-sm col-12 bg-grey-1 q-mt-sm">
+        <div class="row col-12 q-col-gutter-sm">
+          <q-select
+            v-model="DataStore.typeinsignia"
+            label="ประเภทเครื่องราชฯ ที่ยืนขอ"
+            dense
+            emit-value
+            map-options
+            :options="typeinsigniaOptions"
+            option-value="id"
+            option-label="name"
+            lazy-rules
+            hide-bottom-space
+            use-input
+            :readonly="false"
+            :borderless="false"
+            :outlined="true"
+            :hide-dropdown-icon="false"
+            style="min-width: 180px"
+            @update:model-value="
+              DataStore.searchDataTable(
+                DataStore.typeinsignia,
+                DataStore.employeeClass
+              )
+            "
+            @filter="(inputValue:any,
+                        doneFn:Function) => filterSelector(inputValue, doneFn,'typeinsigniaOptions'
+                        ) "
+          >
+            <template v-if="DataStore.typeinsignia !== 'all'" v-slot:append>
+              <q-icon
+                name="cancel"
+                @click.stop.prevent="
+                  clearInsigniaFilters('typeinsigniaOptions'),
+                    DataStore.searchDataTable(
+                      DataStore.typeinsignia,
+                      DataStore.employeeClass
+                    )
+                "
+                class="cursor-pointer"
+              />
+            </template>
+            <template v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+              </q-item>
+            </template>
+          </q-select>
+          <q-select
+            v-model="DataStore.employeeClass"
+            dense
+            outlined
+            lazy-rules
+            hide-bottom-space
+            :label="`${'สถานภาพ'}`"
+            emit-value
+            use-input
+            map-options
+            option-label="name"
+            :options="employeeClassOps"
+            option-value="id"
+            :readonly="false"
+            :borderless="false"
+            style="width: 300px"
+            @update:model-value="
+              DataStore.searchDataTable(
+                DataStore.typeinsignia,
+                DataStore.employeeClass
+              )
+            "
+            @filter="(inputValue:any,
+                      doneFn:Function) => filterSelector(inputValue, doneFn,'employeeClassOps'
+                      ) "
+          >
+            <template v-if="DataStore.employeeClass !== 'all'" v-slot:append>
+              <q-icon
+                name="cancel"
+                @click.stop.prevent="
+                  clearInsigniaFilters('employeeClassOps'),
+                    DataStore.searchDataTable(
+                      DataStore.typeinsignia,
+                      DataStore.employeeClass
+                    )
+                "
+                class="cursor-pointer"
+              />
+            </template>
+            <template v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+              </q-item>
+            </template>
+          </q-select>
+        </div>
+      </q-card>
       <div class="col-12 q-pt-sm">
         <q-table
           ref="table"
diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue
index 74ae0eb88..53f5223a0 100644
--- a/src/modules/07_insignia/components/2_Manage/listManage.vue
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -97,6 +97,7 @@ const fecthAgency = async () => {
     .then(async (res) => {
       loadview.value = true;
       DataStore.agency = res.data.result;
+      DataStore.typeOc = DataStore.agency
       if (roleDataStore.adminRole) {
         await fecthType(); // ถ้าไม่มีหนวยงานจะเรียกหน่วยงานทั้งหมด
       } else {
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index 46900cc12..79d622382 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -272,6 +272,7 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 watch(tab, () => {
   if (tab.value !== "doc") {
+    DataStore.insignia = ''
     fecthlistInsignia();
     insigniaTypeOption.value = DataStore.insigniaOp.filter(
       (e: any) => e.insigniaType == tab.value || e.name == "ทั้งหมด"
@@ -543,7 +544,7 @@ const clearInsigniaFilters = (name: string) => {
         class="q-pa-none"
       >
         <div class="q-pa-md">
-          <div class="row col-12 q-pb-sm q-col-gutter-x-xs">
+          <div class="row col-12 q-pb-sm q-col-gutter-x-xs no-wrap">
             <div>
               <q-file
                 dense
@@ -551,7 +552,7 @@ const clearInsigniaFilters = (name: string) => {
                 outlined
                 v-model="fileResult"
                 label="บันทึกผลการได้รับพระราชทานเครื่องราชอิสริยาภรณ์"
-                style="min-width: 300px"
+                style="min-width: 350px"
                 accept=".xlsx"
               >
                 <template v-slot:prepend>
@@ -583,7 +584,7 @@ const clearInsigniaFilters = (name: string) => {
                 outlined
                 v-model="fileinvoice"
                 label="บันทึกผลการจ่ายใบกำกับ"
-                style="min-width: 300px"
+                style="min-width: 350px"
                 accept=".xlsx"
               >
                 <template v-slot:prepend>
diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
new file mode 100644
index 000000000..d04385ff3
--- /dev/null
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div>
+    <h1>เรื่องร้องเรียน</h1>
+  </div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
new file mode 100644
index 000000000..9908a051e
--- /dev/null
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div>
+    <h1>สืบสวนข้อเท็จจริง</h1>
+  </div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
new file mode 100644
index 000000000..86b199249
--- /dev/null
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div>
+    <h1>สอบสวนความผิดวินัย</h1>
+  </div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/11_discipline/components/4_Order/MainPage.vue b/src/modules/11_discipline/components/4_Order/MainPage.vue
new file mode 100644
index 000000000..d04385ff3
--- /dev/null
+++ b/src/modules/11_discipline/components/4_Order/MainPage.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div>
+    <h1>เรื่องร้องเรียน</h1>
+  </div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/11_discipline/components/5_Report/MainPage.vue b/src/modules/11_discipline/components/5_Report/MainPage.vue
new file mode 100644
index 000000000..d04385ff3
--- /dev/null
+++ b/src/modules/11_discipline/components/5_Report/MainPage.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div>
+    <h1>เรื่องร้องเรียน</h1>
+  </div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue b/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue
new file mode 100644
index 000000000..d04385ff3
--- /dev/null
+++ b/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div>
+    <h1>เรื่องร้องเรียน</h1>
+  </div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue b/src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue
new file mode 100644
index 000000000..d04385ff3
--- /dev/null
+++ b/src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div>
+    <h1>เรื่องร้องเรียน</h1>
+  </div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/11_discipline/interface/index/Main.ts b/src/modules/11_discipline/interface/index/Main.ts
new file mode 100644
index 000000000..9870350dd
--- /dev/null
+++ b/src/modules/11_discipline/interface/index/Main.ts
@@ -0,0 +1,4 @@
+
+export type {
+
+};
diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts
new file mode 100644
index 000000000..0f41d90f9
--- /dev/null
+++ b/src/modules/11_discipline/router.ts
@@ -0,0 +1,38 @@
+
+const complaintMain = () => import("@/modules/11_discipline/components/1_Complaint/MainPage.vue")
+const factsMain = () => import("@/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue")
+const disciplinaryMain = () => import("@/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue")
+
+
+export default [
+    {
+        path: "/discipline/complaints",
+        name: "/discipline-complaints",
+        component: complaintMain,
+        meta: {
+            Auth: true,
+            Key: [11.1],
+            Role: "coin",
+        },
+    },
+    {
+        path: "/discipline/investigatefacts",
+        name: "/discipline-investigatefacts",
+        component: factsMain,
+        meta: {
+            Auth: true,
+            Key: [11.2],
+            Role: "coin",
+        },
+    },
+    {
+        path: "/discipline/disciplinary",
+        name: "/discipline-disciplinary",
+        component: disciplinaryMain,
+        meta: {
+            Auth: true,
+            Key: [9],
+            Role: "coin",
+        },
+    },
+]
\ No newline at end of file
diff --git a/src/modules/11_discipline/stroes/ComplaintsStore.ts b/src/modules/11_discipline/stroes/ComplaintsStore.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/router/index.ts b/src/router/index.ts
index 8676b6de3..effe76e05 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -13,7 +13,8 @@ import ModuleRetirement from "@/modules/06_retirement/router";
 import ModuleInsignia from "@/modules/07_insignia/router";
 import ModuleRegistryEmployee from "@/modules/08_registryEmployee/router";
 import ModuleOrder from "@/modules/10_order/router";
-import ModuleLeave from "@/modules/09_leave/router"
+import ModuleLeave from "@/modules/09_leave/router";
+import ModuleDiscipline from "@/modules/11_discipline/router"
 
 // TODO: ใช้หรือไม่?
 import keycloak from "@/plugins/keycloak";
@@ -45,7 +46,8 @@ const router = createRouter({
         ...ModuleInsignia,
         ...ModuleRegistryEmployee,
         ...ModuleOrder,
-        ...ModuleLeave
+        ...ModuleLeave,
+        ...ModuleDiscipline
       ],
     },
     /**
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 8b9c8c849..c5770894d 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -562,7 +562,7 @@ const clickDelete = (id: string) => {
                     @click="doLogout"
                   /><!--  -->
                 </div>
-                </div>
+              </div>
 
               <div class="column col-12">
                 <q-separator />
@@ -646,7 +646,8 @@ const clickDelete = (id: string) => {
                     menuItem.key == 6 ||
                     menuItem.key == 7 ||
                     menuItem.key == 8 ||
-                    menuItem.key == 9
+                    menuItem.key == 9 ||
+                    menuItem.key == 11
                   "
                 >
                   <div class="row items-center no-wrap">
@@ -808,7 +809,8 @@ const clickDelete = (id: string) => {
                   menuItem.key == 6 ||
                   menuItem.key == 7 ||
                   menuItem.key == 8 ||
-                  menuItem.key == 9
+                  menuItem.key == 9 ||
+                  menuItem.key == 11
                 "
               >
                 <template v-slot:header>
@@ -823,13 +825,20 @@ const clickDelete = (id: string) => {
                 </template>
 
                 <!-- เมนูย่อย 2 ชั้น (สรรหา) -->
-                <div v-if="menuItem.key == 5">
+                <div v-if="menuItem.key == 5 || menuItem.key == 11">
                   <div v-for="(subMenu, i) in menuItem.children" :key="i">
                     <q-expansion-item
                       switch-toggle-side
                       dense-toggle
                       :label="subMenu.label"
-                      v-if="subMenu.key !== 5.1"
+                      v-if="
+                        subMenu.key !== 5.1 &&
+                        subMenu.key !== 11.1 &&
+                        subMenu.key !== 11.2 &&
+                        subMenu.key !== 11.3 &&
+                        subMenu.key !== 11.4 &&
+                        subMenu.key !== 11.5
+                      "
                       class="expan2"
                       dense
                     >
@@ -858,7 +867,7 @@ const clickDelete = (id: string) => {
                       :to="{ name: `${subMenu.path}` }"
                     >
                       <q-item-section>
-                        <q-item-label>{{ subMenu.label }}</q-item-label>
+                        <q-item-label>{{ subMenu.label }} </q-item-label>
                       </q-item-section>
                     </q-item>
                   </div>