From 759870d0aa89d97ad13847eb6b7365ab8cbbffc0 Mon Sep 17 00:00:00 2001
From: Thanit Konmek <thanit@frappet.com>
Date: Thu, 17 Aug 2023 13:31:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=84=E0=B8=94?=
 =?UTF-8?q?=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9E=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=97=E0=B8=B2=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=A2=E0=B9=8C=E0=B8=AD=E0=B8=B4=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B4=E0=B8=A2=E0=B8=AA=E0=B8=A0=E0=B8=A3=E0=B8=93?=
 =?UTF-8?q?=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/00_dashboard/api.message.ts           |  2 +-
 src/components/Selector.vue                   |  6 +-
 .../07_insignia/components/RecordInsignia.vue | 68 +++++++++++++++++--
 .../07_insignia/interface/index/Main.ts       |  7 +-
 src/views/Dashboard.vue                       | 32 ++++-----
 5 files changed, 91 insertions(+), 24 deletions(-)

diff --git a/src/api/00_dashboard/api.message.ts b/src/api/00_dashboard/api.message.ts
index 85e0c7b86..75902df05 100644
--- a/src/api/00_dashboard/api.message.ts
+++ b/src/api/00_dashboard/api.message.ts
@@ -3,7 +3,7 @@
  */
 import env from "../index";
 
-const message = `${env.API_DASHBOARD_URI}/message`;
+const message = `${env.API_PLACEMENT_URI}/message`;
 
 export default {
   msgNotificate: `${message}/my-notifications`,
diff --git a/src/components/Selector.vue b/src/components/Selector.vue
index a9c445fe2..351fad7a9 100644
--- a/src/components/Selector.vue
+++ b/src/components/Selector.vue
@@ -1,5 +1,8 @@
 <template>
   <q-select v-bind="attrs">
+    <template v-for="(_, slot) in slots" v-slot:[slot]="scope">
+      <slot :name="slot" v-bind="scope || {}" />
+    </template>
     <template v-slot:no-option>
       <q-item>
         <q-item-section class="text-black">
@@ -10,6 +13,7 @@
   </q-select>
 </template>
 <script setup lang="ts">
-import { ref, useAttrs, defineAsyncComponent } from "vue";
+import { ref, useAttrs, useSlots } from "vue";
 const attrs = ref<any>(useAttrs());
+const slots = ref<any>(useSlots());
 </script>
diff --git a/src/modules/07_insignia/components/RecordInsignia.vue b/src/modules/07_insignia/components/RecordInsignia.vue
index 25d261701..06ee10c56 100644
--- a/src/modules/07_insignia/components/RecordInsignia.vue
+++ b/src/modules/07_insignia/components/RecordInsignia.vue
@@ -13,6 +13,35 @@
     บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์
   </div>
   <q-card flat bordered class="col-12 q-my-md q-mt-sm rounded-borders">
+    <div class="q-pa-md row items-center">
+      <selector
+        hide-bottom-space
+        borderless
+        dense
+        lazy-rules
+        emit-value
+        map-options
+        options-dense
+        option-label="name"
+        option-value="id"
+        v-model="selectRound"
+        :options="selectRoundOption"
+        use-input
+        input-debounce="0"
+        input-class="text-bold text-grey"
+      >
+        <template v-slot:before
+          ><label class="text-bold text-grey" style="font-size: 16px"
+            >รอบ</label
+          >
+        </template>
+      </selector>
+      <!-- :class="getClass(edit)" -->
+      <!-- @filter="(inputValue:string,
+                      doneFn:Function) => filterSelector(inputValue, doneFn,'provinceOps'
+                      ) " -->
+    </div>
+    <q-separator />
     <q-tabs
       v-model="tab"
       align="left"
@@ -39,7 +68,7 @@
         />
       </div> -->
       <Transition>
-        <div v-if="arrow" class="bg-base rounded-borders q-pa-md">
+        <div class="bg-base rounded-borders q-pa-md q-mb-md">
           <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
             <!-- <div class="col-xs-6 col-md-2">
               <q-input
@@ -85,7 +114,7 @@
                 hide-bottom-space
               />
             </div> -->
-            <div class="col-xs-12 col-md-6">
+            <div class="col-xs-6 col-md-4">
               <q-file
                 class="bg-white"
                 outlined
@@ -100,7 +129,7 @@
                 </template>
               </q-file>
             </div>
-            <div class="col-xs-12 col-md-6">
+            <div class="col-xs-6 col-md-3">
               <q-file
                 class="bg-white"
                 outlined
@@ -115,7 +144,18 @@
                 </template>
               </q-file>
             </div>
-            <div class="col-xs-6 col-md-2">
+            <div class="col-xs-12 col-md-5">
+              <q-input
+                class="bg-white"
+                outlined
+                dense
+                lazy-rules
+                v-model="reason"
+                :label="`${'หมายเหตุ'}`"
+                hide-bottom-space
+              />
+            </div>
+            <!-- <div class="col-xs-6 col-md-2">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="dateGoverment"
@@ -190,8 +230,18 @@
                   </q-input>
                 </template>
               </datepicker>
+            </div> -->
+            <div class="col-xs-6 col-md-4">
+              <p>
+                วันที่ประกาศราชกิจจานุเบกษา <b>{{ date2Thai(new Date()) }}</b>
+              </p>
             </div>
-            <div class="col-xs-12 col-md-6 justify-end">
+            <div class="col-xs-6 col-md-3">
+              <p>
+                วันที่ได้รับ <b>{{ date2Thai(new Date()) }}</b>
+              </p>
+            </div>
+            <div class="col-xs-12 col-md-5 d-flex justify-end">
               <q-btn label="บันทึก" @click="save" color="public" />
             </div>
           </div>
@@ -310,6 +360,7 @@ import { ref, onMounted } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
 
 import type { DataOption } from "@/modules/05_placement/interface/index/Main";
+import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 import type { QTableProps, QInput } from "quasar";
 
 // const router = useRouter();
@@ -325,6 +376,7 @@ const issue = ref<string>("");
 const book = ref<string>("");
 const volume = ref<string>("");
 const section = ref<string>("");
+const reason = ref<string>("");
 const government = ref<any>(null);
 const document = ref<any>(null);
 
@@ -336,6 +388,12 @@ const selectType = ref<string>("");
 const selectTypeOption = ref<DataOption[]>([]);
 const selectTypeOptionFilter = ref<DataOption[]>([]);
 
+const selectRound = ref<string>("1");
+const selectRoundOption = ref<OptionData[]>([
+  { id: "1", name: "รอบการเสนอขอพระราชทานเครื่องราชฯ ปี 2566" },
+]);
+const selectRoundOptionFilter = ref<OptionData[]>([]);
+
 const visibleColumns = ref<String[]>([
   "no",
   "status",
diff --git a/src/modules/07_insignia/interface/index/Main.ts b/src/modules/07_insignia/interface/index/Main.ts
index e4ea7770c..a90772c1d 100644
--- a/src/modules/07_insignia/interface/index/Main.ts
+++ b/src/modules/07_insignia/interface/index/Main.ts
@@ -1 +1,6 @@
-export type {};
+interface OptionData {
+  id: string;
+  name: string;
+}
+
+export type { OptionData };
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 9668dfe25..a6c72593d 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -26,22 +26,22 @@ const iteminbox = ref<any>([]);
 const splitterModel = ref<number>(30);
 const link = ref<string>("0");
 const inboxList = ref<DataInbox[]>([
-  {
-    no: "1",
-    sender: "เจ้าหน้าที่ทะเบียนประวัติ",
-    subject: "ขอแก้ไขข้อมูลทะเบียนประวัติ",
-    timereceive: new Date(),
-    body: "ขอแก้ไขข้อมูลทะเบียนประวัติ เรื่อง ชื่อ-นามสกุล",
-    ratingModel: 0,
-  },
-  {
-    no: "2",
-    sender: "เจ้าหน้าที่ทะเบียนประวัติ",
-    subject: "ขอแก้ไขข้อมูลทะเบียนประวัติ",
-    timereceive: new Date(),
-    body: "ขอแก้ไขข้อมูลทะเบียนประวัติ เรื่อง ชื่อ-นามสกุล",
-    ratingModel: 0,
-  },
+  //   {
+  //     no: "1",
+  //     sender: "เจ้าหน้าที่ทะเบียนประวัติ",
+  //     subject: "ขอแก้ไขข้อมูลทะเบียนประวัติ",
+  //     timereceive: new Date(),
+  //     body: "ขอแก้ไขข้อมูลทะเบียนประวัติ เรื่อง ชื่อ-นามสกุล",
+  //     ratingModel: 0,
+  //   },
+  //   {
+  //     no: "2",
+  //     sender: "เจ้าหน้าที่ทะเบียนประวัติ",
+  //     subject: "ขอแก้ไขข้อมูลทะเบียนประวัติ",
+  //     timereceive: new Date(),
+  //     body: "ขอแก้ไขข้อมูลทะเบียนประวัติ เรื่อง ชื่อ-นามสกุล",
+  //     ratingModel: 0,
+  //   },
 ]);
 const data = ref<DataInbox[]>([
   //   {