From 7a4926c66d993dcf8a5fa29c17bebc76e28d4a71 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 5 Mar 2026 13:37:54 +0700
Subject: [PATCH] fix(development): edit form scholarship

---
 .../components/scholarship/DetailView.vue     | 211 +++++++++---------
 1 file changed, 106 insertions(+), 105 deletions(-)

diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index c2c8a6866..00dbb28a1 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -1006,7 +1006,7 @@ onMounted(async () => {
                   ]"
                 />
               </div>
-              <div class="col-3" v-if="formBody.budgetSource == 'OTHER'">
+              <div class="col-2" v-if="formBody.budgetSource == 'OTHER'">
                 <q-input
                   :readonly="checkRouteDetail"
                   dense
@@ -1015,14 +1015,15 @@ onMounted(async () => {
                   :class="classInput(!checkRouteDetail)"
                   v-model="formBody.budgetSourceOther"
                   label="เงินอื่นๆ โปรดระบุ"
-                  hide-botom-space
                   :rules="[
                   (val: string) =>
                     !!val || `${'กรุณากรอกเงินอื่นๆ โปรดระบุ'}`,
                 ]"
                 />
               </div>
-              <div class="col-3">
+              <div
+                :class="formBody.budgetSource !== 'OTHER' ? 'col-3' : 'col-2'"
+              >
                 <q-input
                   :readonly="checkRouteDetail"
                   dense
@@ -1044,6 +1045,15 @@ onMounted(async () => {
                   ]"
                 />
               </div>
+              <div class="col-2">
+                <q-checkbox
+                  :disable="checkRouteDetail"
+                  keep-color
+                  color="primary"
+                  v-model="formBody.isNoUseBudget"
+                  label="ไม่ใช้งบประมาณ"
+                />
+              </div>
             </div>
           </div>
 
@@ -1170,15 +1180,6 @@ onMounted(async () => {
                 >
                 </q-select>
               </div>
-              <div class="col-2">
-                <q-checkbox
-                  :disable="checkRouteDetail"
-                  keep-color
-                  color="primary"
-                  v-model="formBody.isNoUseBudget"
-                  label="ไม่ใช้งบประมาณ"
-                />
-              </div>
             </div>
           </div>
 
@@ -1243,99 +1244,6 @@ onMounted(async () => {
                 </datepicker>
               </div>
 
-              <div class="col-12">
-                <div class="row q-col-gutter-md">
-                  <div class="col-3">
-                    <q-input
-                      dense
-                      :readonly="checkRouteDetail"
-                      outlined
-                      hide-bottom-space
-                      lazy-rules
-                      :class="classInput(!checkRouteDetail)"
-                      v-model="formBody.reportBackNo"
-                      label="เลขที่หนังสือรายงานตัวกลับ"
-                    />
-                  </div>
-                  <div class="col-3">
-                    <datepicker
-                      v-model="formBody.reportBackNoDate"
-                      :locale="'th'"
-                      autoApply
-                      :enableTimePicker="false"
-                      :readonly="checkRouteDetail"
-                    >
-                      <template #year="{ year }">{{ year + 543 }}</template>
-                      <template #year-overlay-value="{ value }">{{
-                        parseInt(value + 543)
-                      }}</template>
-                      <template #trigger>
-                        <q-input
-                          :readonly="checkRouteDetail"
-                          dense
-                          outlined
-                          :class="classInput(!checkRouteDetail)"
-                          :model-value="
-                            formBody.reportBackNoDate
-                              ? date2Thai(formBody.reportBackNoDate)
-                              : null
-                          "
-                          :label="`${'ลงวันที่'}`"
-                          hide-bottom-space
-                        >
-                          <template v-slot:prepend>
-                            <q-icon
-                              name="event"
-                              class="cursor-pointer"
-                              style="color: var(--q-primary)"
-                            >
-                            </q-icon>
-                          </template>
-                        </q-input>
-                      </template>
-                    </datepicker>
-                  </div>
-                  <div class="col-3">
-                    <datepicker
-                      v-model="formBody.reportBackDate"
-                      :locale="'th'"
-                      autoApply
-                      :enableTimePicker="false"
-                      :readonly="checkRouteDetail"
-                    >
-                      <template #year="{ year }">{{ year + 543 }}</template>
-                      <template #year-overlay-value="{ value }">{{
-                        parseInt(value + 543)
-                      }}</template>
-                      <template #trigger>
-                        <q-input
-                          :readonly="checkRouteDetail"
-                          dense
-                          outlined
-                          :class="classInput(!checkRouteDetail)"
-                          :model-value="
-                            formBody.reportBackDate
-                              ? date2Thai(formBody.reportBackDate)
-                              : null
-                          "
-                          :label="`${'รายงานตัวกลับเมื่่อวันที่'}`"
-                          hide-bottom-space
-                        >
-                          <template v-slot:prepend>
-                            <q-icon
-                              name="event"
-                              class="cursor-pointer"
-                              style="color: var(--q-primary)"
-                            >
-                            </q-icon>
-                          </template>
-                        </q-input>
-                      </template>
-                    </datepicker>
-                  </div>
-                </div>
-              </div>
-
               <!-- เลือกทุน 1 -->
               <div
                 class="col-12"
@@ -3190,6 +3098,99 @@ onMounted(async () => {
             />
           </div>
 
+          <div class="col-12">
+            <div class="row q-col-gutter-md">
+              <div class="col-3">
+                <q-input
+                  dense
+                  :readonly="checkRouteDetail"
+                  outlined
+                  hide-bottom-space
+                  lazy-rules
+                  :class="classInput(!checkRouteDetail)"
+                  v-model="formBody.reportBackNo"
+                  label="เลขที่หนังสือรายงานตัวกลับ"
+                />
+              </div>
+              <div class="col-3">
+                <datepicker
+                  v-model="formBody.reportBackNoDate"
+                  :locale="'th'"
+                  autoApply
+                  :enableTimePicker="false"
+                  :readonly="checkRouteDetail"
+                >
+                  <template #year="{ year }">{{ year + 543 }}</template>
+                  <template #year-overlay-value="{ value }">{{
+                    parseInt(value + 543)
+                  }}</template>
+                  <template #trigger>
+                    <q-input
+                      :readonly="checkRouteDetail"
+                      dense
+                      outlined
+                      :class="classInput(!checkRouteDetail)"
+                      :model-value="
+                        formBody.reportBackNoDate
+                          ? date2Thai(formBody.reportBackNoDate)
+                          : null
+                      "
+                      :label="`${'ลงวันที่'}`"
+                      hide-bottom-space
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          style="color: var(--q-primary)"
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+              </div>
+              <div class="col-3">
+                <datepicker
+                  v-model="formBody.reportBackDate"
+                  :locale="'th'"
+                  autoApply
+                  :enableTimePicker="false"
+                  :readonly="checkRouteDetail"
+                >
+                  <template #year="{ year }">{{ year + 543 }}</template>
+                  <template #year-overlay-value="{ value }">{{
+                    parseInt(value + 543)
+                  }}</template>
+                  <template #trigger>
+                    <q-input
+                      :readonly="checkRouteDetail"
+                      dense
+                      outlined
+                      :class="classInput(!checkRouteDetail)"
+                      :model-value="
+                        formBody.reportBackDate
+                          ? date2Thai(formBody.reportBackDate)
+                          : null
+                      "
+                      :label="`${'รายงานตัวกลับเมื่่อวันที่'}`"
+                      hide-bottom-space
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          style="color: var(--q-primary)"
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+              </div>
+            </div>
+          </div>
+
           <!-- ผู้ค้ำประกัน -->
           <div class="col-12" v-if="formBody.scholarshipType !== 'EXECUTIVE'">
             <q-card bordered tyle="border: 1px solid #d6dee1">