From f70a20497da691b4a6bbaab10450b747ca3ea346 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 2 Oct 2023 16:41:09 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20field=20=20=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8=20?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B8=E0=B8=92=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A8=E0=B8=B6=E0=B8=81=E0=B8=A9=E0=B8=B2=20=E0=B8=9E?=
 =?UTF-8?q?=E0=B9=89=E0=B8=99=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=97=E0=B8=AB=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=20=E0=B9=83=E0=B8=99=E0=B8=AA?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=99=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/Other/Detail.vue  | 73 +++++++++++++++++++
 .../interface/response/OhterMain.ts           |  1 +
 2 files changed, 74 insertions(+)

diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue
index 3a50ad8d6..ad55e7d6f 100644
--- a/src/modules/05_placement/components/Other/Detail.vue
+++ b/src/modules/05_placement/components/Other/Detail.vue
@@ -71,6 +71,8 @@ const Otherdata = ref<OtherdataInterface>({
   lastname: "",
 });
 const avatar = ref<string>("");
+const educationOld = ref<string>("");
+const militaryDate = ref<Date | null>(null);
 
 //-----(fetch data by id)-----//
 const fecthOther = async () => {
@@ -106,6 +108,8 @@ const fecthOther = async () => {
       date.value =
         data.positionDate !== null ? new Date(data.positionDate) : null;
       reason.value = data.reason ?? "";
+      educationOld.value = data.educationOld ?? "-";
+      militaryDate.value = data.militaryDate ?? null;
     })
     .catch((e) => {
       messageError($q, e);
@@ -146,6 +150,8 @@ const saveOther = async () => {
     positionLevelOld: positionLevelOld.value,
     positionNumberOld: posNo.value,
     amountOld: Number(salary.value),
+    educationOld: educationOld.value,
+    militaryDate: militaryDate.value,
   };
   await http
     .put(config.API.otherByid(paramsId.toString()), data)
@@ -291,6 +297,27 @@ onMounted(async () => {
     <q-form ref="myForm">
       <div class="row col-12 q-pa-md">
         <div class="col-12 row bg-white q-col-gutter-md">
+          <div class="row col-12 q-pa-md">
+            <div class="col-12">
+              <div class="text-weight-bold">วุฒิการศึกษา</div>
+            </div>
+            <div class="col-12">
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="educationOld"
+                :rules="[(val) => !!val || `${'กรุณากรอกวุฒิการศึกษา'}`]"
+                hide-bottom-space
+                :label="`${'วุฒิการศึกษา'}`"
+                type="text"
+              />
+            </div>
+          </div>
+
           <div class="col-xs-12 row items-center">
             <div class="col-12">
               <div class="text-weight-bold">ตำแหน่งและหน่วยงานเดิม</div>
@@ -416,6 +443,52 @@ onMounted(async () => {
               </datepicker>
             </div>
           </div>
+          <div class="col-xs-6 col-sm-6 row items-center">
+            <div class="col-12">
+              <datepicker
+                menu-class-name="modalfix"
+                :readonly="!edit"
+                v-model="militaryDate"
+                :locale="'th'"
+                autoApply
+                :enableTimePicker="false"
+                week-start="0"
+              >
+                <template #year="{ year }">{{ year + 543 }}</template>
+                <template #year-overlay-value="{ value }">{{
+                  parseInt(value + 543)
+                }}</template>
+                <template #trigger>
+                  <q-input
+                    :class="getClass(edit)"
+                    :outlined="edit"
+                    dense
+                    lazy-rules
+                    :readonly="!edit"
+                    :borderless="!edit"
+                    :model-value="
+                      militaryDate !== null ? date2Thai(militaryDate) : null
+                    "
+                    hide-bottom-space
+                    :label="`${'พ้นราชการทหารเมื่อ'}`"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        :style="
+                          edit
+                            ? 'color: var(--q-primary)'
+                            : 'color: var(--q-grey)'
+                        "
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+          </div>
           <div class="col-12">
             <q-input
               :class="getClass(edit)"
diff --git a/src/modules/05_placement/interface/response/OhterMain.ts b/src/modules/05_placement/interface/response/OhterMain.ts
index a50887d20..e02af1f13 100644
--- a/src/modules/05_placement/interface/response/OhterMain.ts
+++ b/src/modules/05_placement/interface/response/OhterMain.ts
@@ -96,6 +96,7 @@ interface resApiData {
       positionDate: Date;
       avatar: string;
       commandType: string;
+      militaryDate: Date
     };
   };
 }