Merge branch 'develop' into devTee

src/modules/03_retire/views/addRetire.vue

@@ -181,9 +181,10 @@ onMounted(() => {
             v-if="routeName !== 'AddRetire'"
             style="padding-bottom: 0px"
           >
-            <span class="text-red" v-if="dataDetail.rejectReason">
+            <div class="q-pl-sm text-grey-7" v-if="dataDetail.cancelReason">
-              {{ dataDetail.rejectReason }}</span
+              เหตุผลการขอยกเลิก:
-            >
+              <spen class="text-red">{{ dataDetail.cancelReason }}</spen>
+            </div>
 
             <q-space />
             <q-btn

src/modules/10_registry/store/RequestEdit.ts

@@ -9,11 +9,11 @@ export const useRequestEditStore = defineStore("requestEditStore", () => {
     "ขอแก้ไขข้อมูล คู่สมรส",
     "ขอแก้ไขข้อมูล บิดา",
     "ขอแก้ไขข้อมูล มารดา",
+    "ขอแก้ไขข้อมูลบุตร",
     "ขอแก้ไขข้อมูลเครื่องราชฯ เหรียญจักรพรรดิมาลา",
     "ขอแก้ไขข้อมูลประวัติการศึกษา",
     "ขอแก้ไขข้อมูลประวัติการฝึกอบรม",
     "ขอแก้ไขที่อยู่ปัจจุบัน",
-    "ขอแก้ไขข้อมูลบุตร",
   ]);
   const optionStatus = ref<DataOption[]>([
     { id: "", name: "ทั้งหมด" },

src/views/MainLayout.vue

@@ -121,6 +121,7 @@ const fetchlistNotification = async (index: number, type: string) => {
           timereceive: date2Thai(e.createdAt),
           isOpen: e.isOpen,
           receiveDate: e.receiveDate,
+          payload: e.payload,
         });
       });
       notiList.value.push(...list);
@@ -331,22 +332,57 @@ function onInfo() {
               <div
                 v-for="(item, index) in notiList"
                 :key="index"
-                class="caption"
+                :class="
+                  item.payload
+                    ? 'caption q-pa-xs cursor-pointer'
+                    : 'caption q-pa-xs'
+                "
+                @click.stop.prevent="
+                  item.payload ? $router.push(`/${item.payload}`) : ''
+                "
               >
-                <q-item v-ripple class="mytry q-py-sm" dense>
+                <q-item
-                  <q-item-section avatar top style="min-width: 10px">
+                  :class="
-                    <q-avatar
+                    !item.isOpen
-                      rounded
+                      ? 'mytry q-py-xs my-menu-link'
-                      color="primary"
+                      : 'mytry q-py-xs'
-                      size="25px"
+                  "
-                      text-color="white"
+                  :clickable="item.payload !== ''"
-                    >
+                  :v-ripple="item.payload !== ''"
+                  dense
+                >
+                  <q-item-section avatar top style="min-width: 40px">
+                    <q-avatar color="primary" size="22px" text-color="white">
                       <span class="text-weight-medium text-uppercase">{{
                         item.body[0]
                       }}</span>
                     </q-avatar>
                   </q-item-section>
                   <q-item-section>
+                    <q-item-label caption class="text-black"
+                      >{{ item.body }}
+                      <q-btn
+                        v-if="item.payload !== ''"
+                        size="sm"
+                        flat
+                        round
+                        dense
+                        icon="mdi-link"
+                        color="primary"
+                      ></q-btn>
+                    </q-item-label>
+                    <q-item-label caption class="row items-center text-grey-7">
+                      {{ date2Thai(item.receiveDate) }}
+                      {{
+                        new Date(item.receiveDate).toLocaleTimeString(
+                          "th-TH",
+                          thaiOptions
+                        )
+                      }}
+                      น.</q-item-label
+                    >
+                  </q-item-section>
+                  <!-- <q-item-section>
                     <q-item-label caption class="text-grey-7">
                       {{ date2Thai(item.receiveDate) }}
                       {{
@@ -372,7 +408,7 @@ function onInfo() {
                       style="font-size: 12px"
                       >{{ item.timereceive }}</q-item-label
                     >
-                  </q-item-section>
+                  </q-item-section> -->
                   <div>
                     <q-btn
                       size="sm"