From 91b1b381d1c1772b668986dac10130b0aac0ab21 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 11 Apr 2024 01:30:15 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B9=80?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=87=20&=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A0=E0=B8=97=E0=B8=87=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A1=E0=B8=B2=E0=B8=93=20?=
 =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../15_development/components/Other.vue       | 54 ++++++++++++++-----
 .../components/scholarship/DetailView.vue     |  9 +++-
 .../15_development/interface/request/Main.ts  |  4 +-
 3 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/modules/15_development/components/Other.vue b/src/modules/15_development/components/Other.vue
index 87360cbfd..348ca9ad8 100644
--- a/src/modules/15_development/components/Other.vue
+++ b/src/modules/15_development/components/Other.vue
@@ -22,14 +22,14 @@ const budgetOp = ref<DataOption[]>([
     id: "REGULATIONBUDGET",
     name: "งบตามข้อบัญญัติ",
   },
-  {
-    id: "BANGKOKBUDGET",
-    name: "งบประมาณกรุงเทพมหานคร",
-  },
   {
     id: "OUTSIDEBUDGET",
     name: "เงินนอกงบประมาณ",
   },
+  {
+    id: "BANGKOKBUDGET",
+    name: "ไม่ใช้งบประมาณ",
+  },
 ]);
 const budgetSubOp = ref<DataOption[]>([
   {
@@ -106,7 +106,29 @@ const filterSelector = (val: string, update: Function) => {
   });
 };
 
-const multiple = ref(null);
+async function calRiskLevel() {
+  if (store.formAddProject.chance && store.formAddProject.effects) {
+    const riskLevel =
+      (await store.formAddProject.chance) * store.formAddProject.effects;
+
+    store.formAddProject.riskLevel =
+      riskLevel == 1
+        ? "น้อยมาก"
+        : riskLevel == 2
+        ? "น้อย"
+        : riskLevel == 3 || riskLevel == 4 || riskLevel == 6
+        ? "ปานกลาง"
+        : riskLevel == 5 || riskLevel == 8 || riskLevel == 9 || riskLevel == 10
+        ? "สูง"
+        : riskLevel == 12 ||
+          riskLevel == 15 ||
+          riskLevel == 16 ||
+          riskLevel == 20 ||
+          riskLevel == 25
+        ? "สูงมาก"
+        : "";
+  }
+}
 
 onMounted(() => {
   getProvince();
@@ -340,28 +362,32 @@ onMounted(() => {
         type="textarea"
       />
     </div>
-    <div class="col-12">
-      <q-input
+    <div class="col-3">
+      <q-select
         outlined
         dense
         class="inputgreen"
         v-model="store.formAddProject.chance"
         label="โอกาสที่จะเกิด"
-        type="textarea"
-      />
+        :options="[1, 2, 3, 4]"
+        @update:model-value="calRiskLevel"
+      ></q-select>
     </div>
-    <div class="col-12">
-      <q-input
+    <div class="col-3">
+      <q-select
         outlined
         dense
         class="inputgreen"
         v-model="store.formAddProject.effects"
         label="ผลกระทบจากการเกิด"
-        type="textarea"
-      />
+        :options="[1, 2, 3, 4]"
+        @update:model-value="calRiskLevel"
+      >
+      </q-select>
     </div>
-    <div class="col-12">
+    <div class="col-6">
       <q-input
+        readonly
         outlined
         dense
         class="inputgreen"
diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 11d0173d6..f755ac0eb 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -411,7 +411,14 @@ onMounted(() => {
       {{ `${title}ข้าราชการฯที่ได้รับทุนการศึกษา/ฝึกอบรม` }}
     </div>
     <q-space />
-    <div class="row" v-if="scholarshipId">
+    <q-icon
+      name="download"
+      class="cursor-pointer"
+      size="sm"
+      style="color: var(--q-primary)"
+    >
+    </q-icon>
+    <div class="row q-ml-md" v-if="scholarshipId">
       <div class="q-gutter-sm" v-if="isStatus === 'PENDING'">
         <q-btn
           unelevated
diff --git a/src/modules/15_development/interface/request/Main.ts b/src/modules/15_development/interface/request/Main.ts
index ffa383090..f0af0d2e1 100644
--- a/src/modules/15_development/interface/request/Main.ts
+++ b/src/modules/15_development/interface/request/Main.ts
@@ -171,8 +171,8 @@ interface FormAddProject {
   approved: number | string | null;
   budgetPay: number | string | null;
   issues: string;
-  chance: string;
-  effects: string;
+  chance: number;
+  effects: number;
   riskLevel: string;
   riskManagement: string;
   expect: string;