From 40bedc8e60dfa60b9b63a0a75f35dfb2dda248f2 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Fri, 18 Jul 2025 14:31:27 +0700
Subject: [PATCH] =?UTF-8?q?fix:=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D?=
 =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1/?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B9=E0=B8=87=E0=B8=B2=E0=B8=99=20=E0=B8=82?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=81/=20=E0=B8=A5=E0=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../15_development/components/FormHistory.vue | 49 +++++++++++++++++
 .../components/history/AddPage.vue            | 53 +-----------------
 .../components/historyEmployee/AddPage.vue    | 55 +------------------
 3 files changed, 54 insertions(+), 103 deletions(-)

diff --git a/src/modules/15_development/components/FormHistory.vue b/src/modules/15_development/components/FormHistory.vue
index d871308ab..a1ae652ee 100644
--- a/src/modules/15_development/components/FormHistory.vue
+++ b/src/modules/15_development/components/FormHistory.vue
@@ -8,6 +8,8 @@ const dateHisStart = defineModel<Date | null>("dateHisStart", {
 });
 const dateHisEnd = defineModel<Date | null>("dateHisEnd", { required: true });
 const trainingDays = defineModel<string>("trainingDays", { required: true });
+const order = defineModel<string>("order", { required: true });
+const dateOrder = defineModel<Date | null>("dateOrder", { required: true });
 </script>
 <template>
   <q-card flat bordered class="q-mt-md bg-grey-1">
@@ -59,6 +61,53 @@ const trainingDays = defineModel<string>("trainingDays", { required: true });
           label="จำนวนวันที่อบรม"
         ></q-input>
       </div>
+      <div class="col-4">
+        <q-input
+          readonly
+          label="เลขที่คำสั่ง/เลขที่หนังสืออนุมัติ"
+          v-model="order"
+          dense
+          outlined
+          bg-color="white"
+        />
+      </div>
+      <div class="col-4">
+        <datepicker
+          readonly
+          v-model="dateOrder"
+          :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
+              readonly
+              bg-color="white"
+              outlined
+              dense
+              :model-value="dateOrder != null ? date2Thai(dateOrder) : null"
+              label="คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"
+            >
+              <template v-slot:prepend>
+                <q-icon
+                  name="event"
+                  class="cursor-pointer"
+                  style="color: var(--q-primary)"
+                >
+                </q-icon>
+              </template>
+            </q-input>
+          </template>
+        </datepicker>
+      </div>
     </q-card-section>
   </q-card>
 </template>
diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue
index 391288ef3..a7876af7d 100644
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@@ -413,58 +413,9 @@ onMounted(async () => {
         :date-his-start="dateHisStart"
         :date-his-end="dateHisEnd"
         :training-days="trainingDays"
+        :order="order"
+        :date-order="dateOrder"
       />
-      <div class="row q-col-gutter-sm q-mt-sm">
-        <div class="col-3">
-          <q-input
-            readonly
-            label="เลขที่คำสั่ง/เลขที่หนังสืออนุมัติ"
-            v-model="order"
-            dense
-            outlined
-            hide-bottom-space
-          />
-          <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่คำสั่ง/เลขที่หนังสืออนุมัติ'}`,]" -->
-        </div>
-        <div class="col-3">
-          <datepicker
-            readonly
-            v-model="dateOrder"
-            :locale="'th'"
-            autoApply
-            borderless
-            :enableTimePicker="false"
-            week-start="0"
-          >
-            <template #year="{ year }">
-              {{ year + 543 }}
-            </template>
-            <template #year-overlay-value="{ value }">
-              {{ parseInt(value + 543) }}
-            </template>
-            <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]" -->
-            <template #trigger>
-              <q-input
-                readonly
-                outlined
-                dense
-                hide-bottom-space
-                :model-value="dateOrder != null ? date2Thai(dateOrder) : null"
-                label="คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"
-              >
-                <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>
     </q-card-section>
   </q-card>
 </template>
diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue
index be35eed17..7392364f1 100644
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@@ -32,7 +32,7 @@ const order = ref<string>("");
 
 const dateHisStart = ref<Date | null>(null);
 const dateHisEnd = ref<Date | null>(null);
-const trainingDays = ref<string>('');
+const trainingDays = ref<string>("");
 
 /** ตัวแปรข้อมูลข้าราชการ */
 const formMain = reactive<FormAddHistoryEmployee>({
@@ -415,58 +415,9 @@ onMounted(() => {
         :date-his-start="dateHisStart"
         :date-his-end="dateHisEnd"
         :training-days="trainingDays"
+        :order="order"
+        :date-order="dateOrder"
       />
-      <div class="row q-col-gutter-sm q-mt-sm">
-        <div class="col-3">
-          <q-input
-            readonly
-            label="เลขที่คำสั่ง/เลขที่หนังสืออนุมัติ"
-            v-model="order"
-            dense
-            outlined
-            hide-bottom-space
-            :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่คำสั่ง/เลขที่หนังสืออนุมัติ'}`,]"
-          />
-        </div>
-        <div class="col-3">
-          <datepicker
-            readonly
-            v-model="dateOrder"
-            :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
-                readonly
-                outlined
-                dense
-                hide-bottom-space
-                :model-value="dateOrder != null ? date2Thai(dateOrder) : null"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]"
-                label="คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"
-              >
-                <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>
     </q-card-section>
   </q-card>
 </template>