From d626279c6c1936a19d063ae8e85b1577808e72f6 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Mon, 17 Jul 2023 10:38:48 +0700
Subject: [PATCH] =?UTF-8?q?=20ui=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=A3=E0=B8=AD=E0=B8=9A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AA=E0=B8=99=E0=B8=AD=E0=B8=82=E0=B8=AD=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=97=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=AD=E0=B8=B4=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B4=E0=B8=A2=E0=B8=B2=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/interface/request/main/main.ts            |   8 +
 src/modules/07_insignia/router.ts             |  24 +++
 .../views/1_Proposals/addProposals.vue        | 171 ++++++++++++++++++
 .../views/1_Proposals/listProposals.vue       |   9 +-
 src/views/MainLayout.vue                      |  21 ++-
 5 files changed, 220 insertions(+), 13 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 3552d4a07..fc19715ec 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -221,6 +221,14 @@ const menuList = readonly<any[]>([
     label: "เครื่องราชอิสริยาภรณ์",
     path: "insignia",
     role: "insignia",
+    children: [
+      {
+        key: 8.1,
+        label: "รายการเสนอขอ" /* รายชื่อผู้สอบผ่าน */,
+        path: "insigniaProposals",
+        role: "insignia",
+      },
+    ],
   },
   {
     key: 9,
diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts
index 20a41a5c3..fd30260db 100644
--- a/src/modules/07_insignia/router.ts
+++ b/src/modules/07_insignia/router.ts
@@ -3,6 +3,10 @@
  */
 
 const Main = () => import("@/modules/07_insignia/views/Main.vue");
+const insigniaProposals = () =>
+  import("@/modules/07_insignia/views/1_Proposals/listProposals.vue");
+const roundAdd = () =>
+  import("@/modules/07_insignia/views/1_Proposals/addProposals.vue");
 
 export default [
   {
@@ -15,4 +19,24 @@ export default [
       Role: "insignia",
     },
   },
+  {
+    path: "/insignia/round-proposals",
+    name: "insigniaProposals",
+    component: insigniaProposals,
+    meta: {
+      Auth: true,
+      Key: [7.1],
+      Role: "insignia",
+    },
+  },
+  {
+    path: "/insignia/round/add",
+    name: "roundAdd",
+    component: roundAdd,
+    meta: {
+      Auth: true,
+      Key: [7.1],
+      Role: "insignia",
+    },
+  },
 ];
diff --git a/src/modules/07_insignia/views/1_Proposals/addProposals.vue b/src/modules/07_insignia/views/1_Proposals/addProposals.vue
index e69de29bb..1e63df651 100644
--- a/src/modules/07_insignia/views/1_Proposals/addProposals.vue
+++ b/src/modules/07_insignia/views/1_Proposals/addProposals.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="col-xs-12 col-sm-12 col-md-11">
+    <div class="toptitle col-12 row items-center">
+      <q-btn
+        icon="mdi-arrow-left"
+        unelevated
+        round
+        dense
+        flat
+        color="primary"
+        class="q-mr-sm"
+        @click="router.go(-1)"
+      />
+      <div>เพิ่มรอบการเสนอขอพระราชทานเครื่องราชอิสริยาภรณ์</div>
+    </div>
+    <div class="col-12">
+      <q-card bordered>
+        <div class="col-12 row q-col-gutter-md q-pa-md">
+          <div class="col-xs-12 col-sm-12 row">
+            <q-separator />
+            <div class="col-12 row q-pa-sm q-col-gutter-sm">
+              <q-input
+                class="col-10"
+                dense
+                outlined
+                v-model="roundInsig"
+                label="รอบการเสนอขอพระราชทานเครื่องราชฯ"
+              />
+              <q-input
+                class="col-2"
+                dense
+                outlined
+                v-model="year"
+                label="ปีที่เสนอ"
+              />
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="dateStart"
+                :locale="'th'"
+                autoApply
+                class="col-xs-12 col-sm-5"
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    outlined
+                    dense
+                    class="col-xs-12 col-sm-5"
+                    :model-value="
+                      dateStart != null ? date2Thai(dateStart) : null
+                    "
+                    :label="`${'วันเริ่มต้น'}`"
+                    :rules="[(val) => !!val || `${'กรุณาเลือกวันเริ่มต้น'}`]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="dateEnd"
+                class="col-xs-12 col-sm-5"
+                :locale="'th'"
+                autoApply
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    outlined
+                    dense
+                    class="col-xs-12 col-sm-4"
+                    :model-value="dateEnd != null ? date2Thai(dateEnd) : null"
+                    :label="`${'วันสิ้นสุด'}`"
+                    :rules="[
+                      (val) => !!val || `${'กรุณาเลือกวันที่วันสิ้นสุด'}`,
+                    ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+
+              <q-input
+                class="col-xs-12 col-sm-2"
+                dense
+                outlined
+                v-model="datelast"
+                label="จำนวนวันแจ้งเตือนก่อนวันสิ้นสุด"
+              />
+              <q-file
+                class="col-xs-12 col-sm-10"
+                outlined
+                dense
+                v-model="files"
+                label="อัปโหลดเอกสารประกอบ"
+                hide-bottom-space
+                lazy-rules
+                :rules="[
+                  (val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน',
+                ]"
+              >
+                <template v-slot:prepend>
+                  <q-icon name="attach_file" />
+                </template>
+              </q-file>
+            </div>
+          </div>
+        </div>
+        <q-separator />
+        <q-separator />
+        <div class="row col-12 q-pa-sm">
+          <q-space />
+          <q-btn
+            unelevated
+            dense
+            class="q-px-md items-center"
+            color="light-blue-10"
+            label="บันทึก"
+            @click="router.go(-1)"
+          />
+        </div>
+      </q-card>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import type { QTableProps } from "quasar";
+import { ref } from "vue";
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
+
+const mixin = useCounterMixin();
+const { date2Thai } = mixin;
+const router = useRouter();
+const $q = useQuasar();
+const dateStart = ref<any>(new Date());
+const dateEnd = ref<any>(new Date());
+
+const routeName = router.currentRoute.value.name;
+</script>
diff --git a/src/modules/07_insignia/views/1_Proposals/listProposals.vue b/src/modules/07_insignia/views/1_Proposals/listProposals.vue
index da8a7ef99..ebda6400a 100644
--- a/src/modules/07_insignia/views/1_Proposals/listProposals.vue
+++ b/src/modules/07_insignia/views/1_Proposals/listProposals.vue
@@ -118,9 +118,9 @@
                   round
                   color="indigo"
                   @click.stop.prevent="clickProposals(props.row.id)"
-                  icon="mdi-clipboard-arrow-down"
+                  icon="mdi-file-download"
                 >
-                  <q-tooltip>ดาวน์โหลดเอกสารประกอบ</q-tooltip>
+                  <q-tooltip>ดาวน์โหลดเอกสารประกอบ </q-tooltip>
                 </q-btn>
               </q-td>
               <q-td auto-width>
@@ -284,10 +284,7 @@ const clickDelete = (id: string) => {
 };
 
 const clickAdd = () => {
-  modal.value = true;
-};
-const clickClose = async () => {
-  modal.value = false;
+  router.push({ name: "roundAdd" });
 };
 
 // ค้นหาในตาราง
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index d8d241366..441a9ee82 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -716,7 +716,10 @@ if (keycloak.tokenParsed != null) {
                 expand-icon="mdi-chevron-down"
                 expanded-icon="mdi-chevron-up"
                 v-if="
-                  menuItem.key == 3 || menuItem.key == 5 || menuItem.key == 6
+                  menuItem.key == 3 ||
+                  menuItem.key == 5 ||
+                  menuItem.key == 6 ||
+                  menuItem.key == 8
                 "
               >
                 <template v-slot:header>
@@ -727,7 +730,7 @@ if (keycloak.tokenParsed != null) {
                       font-size="20px"
                     />
                   </q-item-section>
-                  <q-item-section >{{ menuItem.label }}</q-item-section>
+                  <q-item-section>{{ menuItem.label }}</q-item-section>
                 </template>
 
                 <!-- เมนูย่อย 2 ชั้น (สรรหา) -->
@@ -751,7 +754,9 @@ if (keycloak.tokenParsed != null) {
                         :to="{ name: `${subMenu2.path}` }"
                       >
                         <q-item-section>
-                          <q-item-label class="font-400">{{ subMenu2.label }} </q-item-label>
+                          <q-item-label class="font-400"
+                            >{{ subMenu2.label }}
+                          </q-item-label>
                         </q-item-section>
                       </q-item>
                     </q-expansion-item>
@@ -781,7 +786,9 @@ if (keycloak.tokenParsed != null) {
                   :to="{ name: `${subMenu.path}` }"
                 >
                   <q-item-section>
-                    <q-item-label class="font-400">{{ subMenu.label }}</q-item-label>
+                    <q-item-label class="font-400">{{
+                      subMenu.label
+                    }}</q-item-label>
                   </q-item-section>
                 </q-item>
               </q-expansion-item>
@@ -930,7 +937,7 @@ if (keycloak.tokenParsed != null) {
 .menuSub .q-item {
   border-radius: 0 100px 100px 0;
   margin-right: 2%;
-  font-weight: 500 ;
+  font-weight: 500;
 }
 .expan2 .q-item {
   padding-left: 10%;
@@ -938,8 +945,8 @@ if (keycloak.tokenParsed != null) {
 /* .menuSubAct {
   background: #1e2529d9;
 } */
-.font-400{
-  font-weight: 400 ;
+.font-400 {
+  font-weight: 400;
 }
 .expan2 .menuSubHover {
   padding-left: 30%;