From f15ce3dcdbe624e6510cb16733a3c8bf12026074 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 13 Sep 2023 14:18:33 +0700
Subject: [PATCH 01/10] =?UTF-8?q?auto=20text=20=E0=B9=83=E0=B8=AB=E0=B9=89?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B2=E0=B8=A1=E0=B9=80=E0=B8=AD=E0=B8=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=E0=B8=95=E0=B9=88=E0=B8=B2=E0=B8=87=E0=B9=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../10_order/components/step/step01.vue       | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index f6b15dc5b..9d3cdf5dd 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -53,7 +53,7 @@ const CommandOption = ref<DataOption1[]>([]);
 
 //Main
 const typeOrder = ref<any>([]);
-const nameOrder = ref<string>("");
+const nameOrder = ref<any>("");
 const command = ref<number | "">();
 const dateYear = ref<number>(new Date().getFullYear());
 const dateCommand = ref<Date>(new Date());
@@ -317,11 +317,63 @@ const fecthCommand = async () => {
       console.log(e);
     });
 };
+
+const nameOrderFilter = (selectOrder: any) => {
+  console.log(selectOrder);
+  switch (selectOrder) {
+    case "C-PM-01":
+      return "บรรจุและแต่งตั้งผู้สอบแข่งขันได้";
+    case "C-PM-02":
+      return "บรรจุและแต่งตั้งผู้ได้รับคัดเลือก";
+    case "C-PM-03":
+      return "แต่งตั้งข้าราชการ";
+    case "C-PM-04":
+      return "ย้ายข้าราชการ";
+    case "C-PM-05":
+      return "แต่งตั้งข้าราชการ";
+    case "C-PM-06":
+      return "แต่งตั้งข้าราชการ";
+    case "C-PM-07":
+      return "ย้ายข้าราชการ";
+    case "C-PM-08":
+      return "บรรจุและแต่งตั้งข้าราชการกรุงเทพมหานครสามัญกลับเข้ารับราชการ";
+    case "C-PM-09":
+      return "บรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ";
+    case "C-PM-10":
+      return "แต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ";
+    case "C-PM-11":
+      return "ให้ข้าราชการกรุงเทพมหานครสามัญซึ่งมีผลการทดลองปฏิบัติหน้าที่ราชการไม่ต่ำกว่ามาตรฐานที่กำหนดรับราชการต่อไป";
+    case "C-PM-12":
+      return "ให้ข้าราชการกรุงเทพมหานครสามัญออกจากราชการเพราะผลการทดลองปฏิบัติหน้าที่ราชการต่ำกว่ามาตรฐานที่กำหนด";
+    case "C-PM-13":
+      return "ให้โอนข้าราชการกรุงเทพมหานครสามัญ";
+    case "C-PM-14":
+      return "รับโอนข้าราชการกรุงเทพมหานครสามัญ";
+    case "C-PM-15":
+      return "ให้ข้าราชการช่วยราชการ";
+    case "C-PM-16":
+      return "ให้ข้าราชการกลับไปปฎิบัติงานทางต้นสังกัดเดิม";
+    case "C-PM-17":
+      return "อนุญาตให้ข้าราชการลาออกจากราชการ";
+    case "C-PM-18":
+      return "ลงโทษให้ออกจากราชการ";
+    case "C-PM-19":
+      return "ลงโทษปลดออกจากราชการ";
+    case "C-PM-20":
+      return "ลงโทษไล่ออกจากราชการ";
+    case "C-PM-21":
+      return "จ้างและแต่งตั้งลูกจ้างประจำ";
+
+    default:
+      return "error";
+  }
+};
 const selectCMP = (selectOrder: any) => {
   fecthExamRoundOption(selectOrder.commandCode);
   if (selectOrder.commandCode === "C-PM-10") {
     nodeTree();
   }
+  nameOrder.value = nameOrderFilter(selectOrder.commandCode);
   //01-04
   examRound.value = "";
   conclusionRegisterNo.value = "";
@@ -2354,7 +2406,7 @@ const getClass = (val: boolean) => {
                   !!val ||
                   `${'กรุณากรอก มติที่ประชุม(เรื่องการดำเนินการทางวินัย)'}`,
               ]"
-              :label="`${'มติที่ประชุม(เรื่องการดำเนินการทางวินัย)'}`"
+              :label="`${'มติที่ประชุม (เรื่องการดำเนินการทางวินัย)'}`"
               hide-bottom-space
             />
           </div>

From bc41809f86316eb585d4fa416013c2f38c1ef4a6 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 13 Sep 2023 14:57:30 +0700
Subject: [PATCH 02/10] =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=81=E0=B9=89=20in?=
 =?UTF-8?q?put=20=E0=B8=A5=E0=B8=AD=E0=B8=A2=20=E0=B8=95=E0=B8=AD=E0=B8=99?=
 =?UTF-8?q?=20validate=20=E0=B9=80=E0=B8=94=E0=B9=89=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AppointMent/Detail.vue         |   9 +-
 .../05_placement/components/Other/Detail.vue  |  15 +-
 .../components/Receive/information.vue        |   3 +-
 .../components/Receive/receiveDetail2.vue     |   2 +-
 .../components/Repatriate/RepatriatebyId.vue  |  13 +-
 .../components/Transfer/transferRegistry.vue  | 293 +++++-----
 .../helpgovernment/governmentDetail.vue       |   6 +-
 .../Discharged/dischargedRegistry.vue         |  13 +-
 .../components/DismissOrder/outRegistry.vue   |  12 +-
 .../Expulsion/expulsionRegistry.vue           |  13 +-
 .../components/resign/ResignByid.vue          |  16 +-
 .../08_registryEmployee/views/information.vue | 539 +++++++++---------
 12 files changed, 475 insertions(+), 459 deletions(-)

diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue
index 7bbb72107..73b1d3391 100644
--- a/src/modules/05_placement/components/AppointMent/Detail.vue
+++ b/src/modules/05_placement/components/AppointMent/Detail.vue
@@ -289,7 +289,7 @@ const getClass = (val: boolean) => {
             </div>
           </div>
 
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -305,7 +305,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -321,7 +321,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -337,7 +337,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <!-- <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
                 v-model="salary" :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" hide-bottom-space
@@ -391,6 +391,7 @@ const getClass = (val: boolean) => {
                     dense
                     lazy-rules
                     :borderless="!edit"
+                    :readonly="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
                     :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
                     hide-bottom-space
diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue
index e11ce90f1..552d837e7 100644
--- a/src/modules/05_placement/components/Other/Detail.vue
+++ b/src/modules/05_placement/components/Other/Detail.vue
@@ -201,7 +201,7 @@ const getClass = (val: boolean) => {
           <q-img :src="avatar" v-if="avatar !== ''" />
           <q-img src="@/assets/avatar_user.jpg" v-else />
         </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
+        <div class="col-xs-6 col-sm-3 row ">
           <div class="col-12 q-pl-md">
             <div class="col-12 text-top">ตำแหน่งในสายงาน</div>
             <div class="col-12 text-detail">
@@ -209,7 +209,7 @@ const getClass = (val: boolean) => {
             </div>
           </div>
         </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
+        <div class="col-xs-6 col-sm-3 row ">
           <div class="col-12">
             <div class="col-12 text-top">ระดับ</div>
             <div class="col-12 text-detail">
@@ -217,7 +217,7 @@ const getClass = (val: boolean) => {
             </div>
           </div>
         </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
+        <div class="col-xs-6 col-sm-3 row">
           <div class="col-12">
             <div class="col-12 text-top">สังกัด</div>
             <div class="col-12 text-detail">
@@ -300,7 +300,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -316,7 +316,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -332,7 +332,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -348,7 +348,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <!-- <q-input
                 :class="getClass(edit)"
@@ -409,6 +409,7 @@ const getClass = (val: boolean) => {
                     :outlined="edit"
                     dense
                     lazy-rules
+                    :readonly="!edit"
                     :borderless="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
                     :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
diff --git a/src/modules/05_placement/components/Receive/information.vue b/src/modules/05_placement/components/Receive/information.vue
index bd6e9cb28..31622d111 100644
--- a/src/modules/05_placement/components/Receive/information.vue
+++ b/src/modules/05_placement/components/Receive/information.vue
@@ -497,9 +497,8 @@ const getClass = (val: boolean) => {
       :addEmployee="statusAdd()"
     />
     <!-- :disable="statusEdit" -->
-    <q-separator />
     <q-form ref="myform" class="col-12">
-      <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
+      <div class="row col-12 q-col-gutter-x-sm q-col-gutter-y-sm">
         <div class="col-xs-6 col-sm-3 col-md-3">
           <q-input
             :class="getClass(edit)"
diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue
index db988c708..383a3d682 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail2.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue
@@ -585,7 +585,7 @@ const getClass = (val: boolean) => {
     <q-form ref="myForm">
       <div class="row col-12 q-pa-md">
         <div class="col-12 row bg-white">
-          <div class="col-xs-12 row items-center q-col-gutter-md">
+          <div class="col-xs-12 row q-col-gutter-md">
             <div class="col-xs-12">
               <div class="text-weight-bold text-grey">ข้อมูลส่วนตัว</div>
             </div>
diff --git a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
index 5b5e78dd7..cac535c14 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
@@ -276,7 +276,7 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -292,7 +292,7 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -308,7 +308,7 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -324,7 +324,7 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <!-- <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
                 v-model="salary" :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" hide-bottom-space
@@ -340,7 +340,7 @@ onMounted(async () => {
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-6 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -358,7 +358,7 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-6 row ">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -379,6 +379,7 @@ onMounted(async () => {
                     :outlined="edit"
                     dense
                     lazy-rules
+                    :readonly="!edit"
                     :borderless="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
                     :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue
index b74564665..3ca71c9c2 100644
--- a/src/modules/05_placement/components/Transfer/transferRegistry.vue
+++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue
@@ -247,81 +247,77 @@
     </div>
     <div class="col-12"><q-separator /></div>
     <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="col-xs-12 row items-center">
-            <div class="col-12">
-              <div class="text-weight-bold text-grey">
-                ตำแหน่งและหน่วยงานเดิม
+      <div class="row q-pa-md">
+        <div class="col-12">
+          <div class="row bg-white q-col-gutter-y-md">
+            <div class="col-xs-12 row items-center">
+              <div class="col-12">
+                <div class="text-weight-bold text-grey">
+                  ตำแหน่งและหน่วยงานเดิม
+                </div>
+              </div>
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="organizationPositionOld"
+                  :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
+                  hide-bottom-space
+                  :label="`${'ตำแหน่ง/สังกัด'}`"
+                  type="textarea"
+                />
               </div>
             </div>
             <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="organizationPositionOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
-                hide-bottom-space
-                :label="`${'ตำแหน่ง/สังกัด'}`"
-                type="textarea"
-              />
-            </div>
-          </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
-            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="positionTypeOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
-                hide-bottom-space
-                :label="`${'ตำแหน่งประเภท'}`"
-              />
-            </div>
-          </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
-            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="positionLevelOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
-                hide-bottom-space
-                :label="`${'ระดับ'}`"
-              />
-            </div>
-          </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
-            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="posNo"
-                :rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]"
-                hide-bottom-space
-                :label="`${'เลขที่'}`"
-              />
-            </div>
-          </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
-            <div class="col-12">
-              <!-- <q-input
+              <div class="row q-col-gutter-x-xs">
+                <div class="col-xs-6 col-sm-3">
+                  <q-input
+                    :class="getClass(edit)"
+                    :outlined="edit"
+                    dense
+                    lazy-rules
+                    :readonly="!edit"
+                    :borderless="!edit"
+                    v-model="positionTypeOld"
+                    :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                    hide-bottom-space
+                    :label="`${'ตำแหน่งประเภท'}`"
+                  />
+                </div>
+                <div class="col-xs-6 col-sm-3">
+                  <q-input
+                    :class="getClass(edit)"
+                    :outlined="edit"
+                    dense
+                    lazy-rules
+                    :readonly="!edit"
+                    :borderless="!edit"
+                    v-model="positionLevelOld"
+                    :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
+                    hide-bottom-space
+                    :label="`${'ระดับ'}`"
+                  />
+                </div>
+                <div class="col-xs-6 col-sm-3">
+                  <q-input
+                    :class="getClass(edit)"
+                    :outlined="edit"
+                    dense
+                    lazy-rules
+                    :readonly="!edit"
+                    :borderless="!edit"
+                    v-model="posNo"
+                    :rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]"
+                    hide-bottom-space
+                    :label="`${'เลขที่'}`"
+                  />
+                </div>
+                <div class="col-xs-6 col-sm-3">
+                  <!-- <q-input
                 :class="getClass(edit)"
                 :outlined="edit"
                 dense
@@ -334,18 +330,83 @@
                 :label="`${'เงินเดือน'}`"
                 type="number"
               /> -->
-              <CurrencyInput
-                v-model="salary"
-                :edit="edit"
-                :options="{
-                  currency: 'THB',
-                }"
-                :label="`${'เงินเดือน'}`"
-              />
+                  <CurrencyInput
+                    v-model="salary"
+                    :edit="edit"
+                    :options="{
+                      currency: 'THB',
+                    }"
+                    :label="`${'เงินเดือน'}`"
+                  />
+                </div>
+              </div>
             </div>
-          </div>
-          <div class="col-12"><q-separator /></div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+
+            <div class="col-12"><q-separator /></div>
+
+            <div class="col-12">
+              <div class="row q-col-gutter-x-xs">
+                <div class="col-xs-6 col-sm-6">
+                    <q-input
+                      :class="getClass(edit)"
+                      :outlined="edit"
+                      dense
+                      lazy-rules
+                      :readonly="!edit"
+                      :borderless="!edit"
+                      v-model="organization"
+                      :rules="[(val) => !!val || `${'กรุณากรอกโอนไปสังกัด'}`]"
+                      hide-bottom-space
+                      :label="`${'โอนไปสังกัด'}`"
+                    />
+                </div>
+                <div class="col-xs-6 col-sm-6">
+                    <datepicker
+                      menu-class-name="modalfix"
+                      :readonly="!edit"
+                      v-model="date"
+                      :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
+                          :borderless="!edit"
+                          :model-value="date !== null ? date2Thai(date) : null"
+                          :rules="[
+                            (val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`,
+                          ]"
+                          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>
+
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -354,72 +415,14 @@
                 lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
-                v-model="organization"
-                :rules="[(val) => !!val || `${'กรุณากรอกโอนไปสังกัด'}`]"
+                v-model="reason"
+                :rules="[(val) => !!val || `${'กรุณากรอกหมายเหตุ '}`]"
                 hide-bottom-space
-                :label="`${'โอนไปสังกัด'}`"
+                :label="`${'หมายเหตุ '}`"
+                type="textarea"
               />
             </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="date"
-                :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
-                    :borderless="!edit"
-                    :model-value="date !== null ? date2Thai(date) : null"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
-                    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)"
-              :outlined="edit"
-              dense
-              lazy-rules
-              :readonly="!edit"
-              :borderless="!edit"
-              v-model="reason"
-              :rules="[(val) => !!val || `${'กรุณากรอกหมายเหตุ '}`]"
-              hide-bottom-space
-              :label="`${'หมายเหตุ '}`"
-              type="textarea"
-            />
-          </div>
         </div>
       </div>
     </q-form>
diff --git a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
index 56c18d9b1..0ff19a1a9 100644
--- a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
+++ b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
@@ -349,7 +349,7 @@ onMounted(async () => {
             </div>
           </div> -->
           <div class="col-12"><q-separator /></div>
-          <div class="col-xs-6 col-sm-4 row items-center">
+          <div class="col-xs-6 col-sm-4 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -365,7 +365,7 @@ onMounted(async () => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-4 row items-center">
+          <div class="col-xs-6 col-sm-4 row ">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -412,7 +412,7 @@ onMounted(async () => {
               </datepicker>
             </div>
           </div>
-          <div class="col-xs-6 col-sm-4 row items-center">
+          <div class="col-xs-6 col-sm-4 row ">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
diff --git a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
index f17055842..2e9546b2f 100644
--- a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
+++ b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
@@ -133,7 +133,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -149,7 +149,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -165,7 +165,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -181,7 +181,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <!-- <q-input
                 :class="getClass(edit)"
@@ -207,7 +207,7 @@
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-6 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -223,7 +223,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-6 row ">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -244,6 +244,7 @@
                     :outlined="edit"
                     dense
                     lazy-rules
+                    :readonly="!edit"
                     :borderless="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
                     :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
diff --git a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
index 12fd2a5a0..e56470f40 100644
--- a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
+++ b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
@@ -137,7 +137,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -153,7 +153,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -169,7 +169,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -185,7 +185,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <!-- <q-input
                 :class="getClass(edit)"
@@ -212,7 +212,7 @@
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-6 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -228,7 +228,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-6 row ">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
diff --git a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
index b6dadebf2..fdb778936 100644
--- a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
+++ b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
@@ -137,7 +137,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -153,7 +153,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -169,7 +169,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -185,7 +185,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <!-- <q-input
                 :class="getClass(edit)"
@@ -212,7 +212,7 @@
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-6 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -228,7 +228,7 @@
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-6 row ">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -250,6 +250,7 @@
                     dense
                     lazy-rules
                     :borderless="!edit"
+                    :readonly="!edit"
                     :model-value="date !== null ? date2Thai(date) : null"
                     :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
                     hide-bottom-space
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index a6274309c..7a8691849 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -774,7 +774,7 @@ const statusOrder = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -790,7 +790,7 @@ const statusOrder = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -806,7 +806,7 @@ const statusOrder = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -822,7 +822,7 @@ const statusOrder = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <div class="col-xs-6 col-sm-3 row ">
             <div class="col-12">
               <!-- <q-input
                 :class="getClass(edit)"
@@ -849,7 +849,7 @@ const statusOrder = (val: boolean) => {
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
-          <div class="col-xs-4 row items-center">
+          <div class="col-xs-4 row ">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -867,7 +867,7 @@ const statusOrder = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-4 row items-center">
+          <div class="col-xs-4 row ">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -884,6 +884,7 @@ const statusOrder = (val: boolean) => {
                 }}</template>
                 <template #trigger>
                   <q-input
+                  :readonly="!edit"
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
@@ -914,7 +915,7 @@ const statusOrder = (val: boolean) => {
               </datepicker>
             </div>
           </div>
-          <div class="col-xs-4 row items-center">
+          <div class="col-xs-4 row ">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -931,6 +932,7 @@ const statusOrder = (val: boolean) => {
                 }}</template>
                 <template #trigger>
                   <q-input
+                  :readonly="!edit"
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
diff --git a/src/modules/08_registryEmployee/views/information.vue b/src/modules/08_registryEmployee/views/information.vue
index 964556bf1..5a38b0cb3 100644
--- a/src/modules/08_registryEmployee/views/information.vue
+++ b/src/modules/08_registryEmployee/views/information.vue
@@ -12,288 +12,295 @@
       :addEmployee="statusAdd()"
     />
     <q-form ref="myform" class="col-12 q-pt-md">
-      <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
-        <div class="col-xs-6 col-sm-3 col-md-3">
-          <q-input
-            :class="getClass(edit)"
-            hide-bottom-space
-            :outlined="edit"
-            v-model="informaData.cardid"
-            dense
-            @update:model-value="changeCardID"
-            lazy-rules
-            :rules="[
+      <div class="row">
+        <div class="row col-12 q-col-gutter-x-sm q-mb-xs">
+          <div class="col-xs-6 col-sm-3 col-md-3">
+            <q-input
+              :class="getClass(edit)"
+              hide-bottom-space
+              :outlined="edit"
+              v-model="informaData.cardid"
+              dense
+              @update:model-value="changeCardID"
+              lazy-rules
+              :rules="[
               (val:string) => !!val || `${'กรุณากรอก เลขบัตรประจำตัวประชาชน'}`,
               (val:string) =>
                 val.length >= 13 ||
                 `${'กรุณากรอกเลขบัตรประจำตัวประชาชนให้ครบ'}`,
             ]"
-            :readonly="!edit"
-            :borderless="!edit"
-            label="เลขบัตรประจำตัวประชาชน"
-            maxlength="13"
-            mask="#############"
-          />
-          <!-- :rules="[(val:any) =>val.length != 13 ||`${'กรุณากรอกเลขบัตรประจำตัวประชาชนให้ครบ'}`,]" -->
-        </div>
-        <div class="col-xs-6 col-sm-3 col-md-3">
-          <selector
-            :hide-dropdown-icon="!edit"
-            hide-bottom-space
-            :class="getClass(edit)"
-            :readonly="!edit"
-            :borderless="!edit"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก คำนำหน้าชื่อ'}`]"
-            :outlined="edit"
-            dense
-            lazy-rules
-            v-model="informaData.prefixId"
-            emit-value
-            map-options
-            option-label="name"
-            :options="Ops.prefixOps"
-            option-value="id"
-            :label="`${'คำนำหน้าชื่อ'}`"
-            use-input
-            input-debounce="0"
-            @filter="(inputValue:any,
+              :readonly="!edit"
+              :borderless="!edit"
+              label="เลขบัตรประจำตัวประชาชน"
+              maxlength="13"
+              mask="#############"
+            />
+            <!-- :rules="[(val:any) =>val.length != 13 ||`${'กรุณากรอกเลขบัตรประจำตัวประชาชนให้ครบ'}`,]" -->
+          </div>
+          <div class="col-xs-6 col-sm-3 col-md-3">
+            <selector
+              :hide-dropdown-icon="!edit"
+              hide-bottom-space
+              :class="getClass(edit)"
+              :readonly="!edit"
+              :borderless="!edit"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือก คำนำหน้าชื่อ'}`]"
+              :outlined="edit"
+              dense
+              lazy-rules
+              v-model="informaData.prefixId"
+              emit-value
+              map-options
+              option-label="name"
+              :options="Ops.prefixOps"
+              option-value="id"
+              :label="`${'คำนำหน้าชื่อ'}`"
+              use-input
+              input-debounce="0"
+              @filter="(inputValue:any,
                         doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
                         ) "
-          />
+            />
+          </div>
+          <div class="col-xs-6 col-sm-3 col-md-3">
+            <q-input
+              :class="getClass(edit)"
+              hide-bottom-space
+              :outlined="edit"
+              dense
+              lazy-rules
+              :readonly="!edit"
+              :borderless="!edit"
+              v-model="informaData.firstname"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
+              :label="`${'ชื่อ'}`"
+            />
+          </div>
+          <div class="col-xs-6 col-sm-3 col-md-3">
+            <q-input
+              :class="getClass(edit)"
+              hide-bottom-space
+              :outlined="edit"
+              dense
+              lazy-rules
+              :readonly="!edit"
+              :borderless="!edit"
+              v-model="informaData.lastname"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
+              :label="`${'นามสกุล'}`"
+            />
+          </div>
         </div>
-
-        <div class="col-xs-6 col-sm-3 col-md-3">
-          <q-input
-            :class="getClass(edit)"
-            hide-bottom-space
-            :outlined="edit"
-            dense
-            lazy-rules
-            :readonly="!edit"
-            :borderless="!edit"
-            v-model="informaData.firstname"
-            :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
-            :label="`${'ชื่อ'}`"
-          />
-        </div>
-        <div class="col-xs-6 col-sm-3 col-md-3">
-          <q-input
-            :class="getClass(edit)"
-            hide-bottom-space
-            :outlined="edit"
-            dense
-            lazy-rules
-            :readonly="!edit"
-            :borderless="!edit"
-            v-model="informaData.lastname"
-            :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
-            :label="`${'นามสกุล'}`"
-          />
-        </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
-          <datepicker
-            v-model="informaData.birthDate"
-            :locale="'th'"
-            autoApply
-            :enableTimePicker="false"
-            week-start="0"
-            :max-date="calculateMaxDate()"
-            :disabled="!edit"
-            @update:model-value="handleDate"
-          >
-            <template #year="{ year }">
-              {{ year + 543 }}
-            </template>
-            <template #year-overlay-value="{ value }">
-              {{ parseInt(value + 543) }}
-            </template>
-            <template #trigger>
-              <q-input
-                :class="getClass(edit)"
-                hide-bottom-space
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                :model-value="
-                  informaData.birthDate == null
-                    ? null
-                    : date2Thai(informaData.birthDate)
-                "
-                :rules="[(val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`]"
-                :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 class="col-xs-6 col-sm-2 col-md-2">
-          <q-input
-            :class="getClass(false)"
-            hide-bottom-space
-            dense
-            lazy-rules
-            readonly
-            borderless
-            :style="!edit ? '' : 'padding:0 12px;'"
-            :model-value="informaData.age"
-            :label="`${'อายุ'}`"
-          />
-        </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
-          <selector
-            :hide-dropdown-icon="!edit"
-            hide-bottom-space
-            :class="getClass(edit)"
-            :readonly="!edit"
-            :borderless="!edit"
-            :outlined="edit"
-            dense
-            lazy-rules
-            v-model="informaData.genderId"
-            emit-value
-            map-options
-            option-label="name"
-            :options="Ops.genderOps"
-            option-value="id"
-            :label="`${'เพศ'}`"
-            use-input
-            input-debounce="0"
-            @filter="(inputValue:any,
+        <div class="row col-12 q-col-gutter-x-sm q-mb-xs">
+          <div class="col-xs-6 col-sm-2 col-md-2">
+            <datepicker
+              v-model="informaData.birthDate"
+              :locale="'th'"
+              autoApply
+              :enableTimePicker="false"
+              week-start="0"
+              :max-date="calculateMaxDate()"
+              :disabled="!edit"
+              @update:model-value="handleDate"
+            >
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
+              <template #trigger>
+                <q-input
+                  :class="getClass(edit)"
+                  hide-bottom-space
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  :model-value="
+                    informaData.birthDate == null
+                      ? null
+                      : date2Thai(informaData.birthDate)
+                  "
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`]"
+                  :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 class="col-xs-6 col-sm-2 col-md-2">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              dense
+              lazy-rules
+              readonly
+              borderless
+              :style="!edit ? '' : 'padding:0 12px;'"
+              :model-value="informaData.age"
+              :label="`${'อายุ'}`"
+            />
+          </div>
+          <div class="col-xs-6 col-sm-2 col-md-2">
+            <selector
+              :hide-dropdown-icon="!edit"
+              hide-bottom-space
+              :class="getClass(edit)"
+              :readonly="!edit"
+              :borderless="!edit"
+              :outlined="edit"
+              dense
+              lazy-rules
+              v-model="informaData.genderId"
+              emit-value
+              map-options
+              option-label="name"
+              :options="Ops.genderOps"
+              option-value="id"
+              :label="`${'เพศ'}`"
+              use-input
+              input-debounce="0"
+              @filter="(inputValue:any,
                         doneFn:Function) => filterSelector(inputValue, doneFn,'genderOps'
                         ) "
-          />
-        </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
-          <selector
-            :hide-dropdown-icon="!edit"
-            hide-bottom-space
-            :class="getClass(edit)"
-            :readonly="!edit"
-            :borderless="!edit"
-            :outlined="edit"
-            dense
-            lazy-rules
-            v-model="informaData.statusId"
-            emit-value
-            map-options
-            option-label="name"
-            :options="Ops.statusOps"
-            option-value="id"
-            :label="`${'สถานภาพ'}`"
-            use-input
-            input-debounce="0"
-            @filter="(inputValue:any,
+            />
+          </div>
+          <div class="col-xs-6 col-sm-2 col-md-2">
+            <selector
+              :hide-dropdown-icon="!edit"
+              hide-bottom-space
+              :class="getClass(edit)"
+              :readonly="!edit"
+              :borderless="!edit"
+              :outlined="edit"
+              dense
+              lazy-rules
+              v-model="informaData.statusId"
+              emit-value
+              map-options
+              option-label="name"
+              :options="Ops.statusOps"
+              option-value="id"
+              :label="`${'สถานภาพ'}`"
+              use-input
+              input-debounce="0"
+              @filter="(inputValue:any,
                         doneFn:Function) => filterSelector(inputValue, doneFn,'statusOps'
                         ) "
-          />
+            />
+          </div>
+          <div class="col-xs-6 col-sm-2 col-md-2">
+            <q-input
+              :class="getClass(edit)"
+              hide-bottom-space
+              :outlined="edit"
+              dense
+              lazy-rules
+              :readonly="!edit"
+              :borderless="!edit"
+              v-model="informaData.nationality"
+              :label="`${'สัญชาติ'}`"
+            />
+          </div>
+          <div class="col-xs-6 col-sm-2 col-md-2">
+            <q-input
+              :class="getClass(edit)"
+              hide-bottom-space
+              :outlined="edit"
+              dense
+              lazy-rules
+              :readonly="!edit"
+              :borderless="!edit"
+              v-model="informaData.ethnicity"
+              :label="`${'เชื้อชาติ'}`"
+            />
+          </div>
         </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
-          <q-input
-            :class="getClass(edit)"
-            hide-bottom-space
-            :outlined="edit"
-            dense
-            lazy-rules
-            :readonly="!edit"
-            :borderless="!edit"
-            v-model="informaData.nationality"
-            :label="`${'สัญชาติ'}`"
-          />
-        </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
-          <q-input
-            :class="getClass(edit)"
-            hide-bottom-space
-            :outlined="edit"
-            dense
-            lazy-rules
-            :readonly="!edit"
-            :borderless="!edit"
-            v-model="informaData.ethnicity"
-            :label="`${'เชื้อชาติ'}`"
-          />
-        </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
-          <selector
-            :hide-dropdown-icon="!edit"
-            hide-bottom-space
-            :class="getClass(edit)"
-            :readonly="!edit"
-            :borderless="!edit"
-            :outlined="edit"
-            dense
-            lazy-rules
-            v-model="informaData.religionId"
-            emit-value
-            map-options
-            option-label="name"
-            :options="Ops.religionOps"
-            option-value="id"
-            :label="`${'ศาสนา'}`"
-            use-input
-            input-debounce="0"
-            @filter="(inputValue:any,
+        <div class="row col-12 q-col-gutter-x-sm q-mb-xs">
+          <div class="col-xs-6 col-sm-2 col-md-2">
+            <selector
+              :hide-dropdown-icon="!edit"
+              hide-bottom-space
+              :class="getClass(edit)"
+              :readonly="!edit"
+              :borderless="!edit"
+              :outlined="edit"
+              dense
+              lazy-rules
+              v-model="informaData.religionId"
+              emit-value
+              map-options
+              option-label="name"
+              :options="Ops.religionOps"
+              option-value="id"
+              :label="`${'ศาสนา'}`"
+              use-input
+              input-debounce="0"
+              @filter="(inputValue:any,
                         doneFn:Function) => filterSelector(inputValue, doneFn,'religionOps'
                         ) "
-          />
-        </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
-          <selector
-            :hide-dropdown-icon="!edit"
-            hide-bottom-space
-            :class="getClass(edit)"
-            :readonly="!edit"
-            :borderless="!edit"
-            :outlined="edit"
-            dense
-            lazy-rules
-            v-model="informaData.bloodId"
-            emit-value
-            map-options
-            option-label="name"
-            :options="Ops.bloodOps"
-            option-value="id"
-            :label="`${'หมู่เลือด'}`"
-            use-input
-            input-debounce="0"
-            @filter="(inputValue:any,
+            />
+          </div>
+          <div class="col-xs-6 col-sm-2 col-md-2">
+            <selector
+              :hide-dropdown-icon="!edit"
+              hide-bottom-space
+              :class="getClass(edit)"
+              :readonly="!edit"
+              :borderless="!edit"
+              :outlined="edit"
+              dense
+              lazy-rules
+              v-model="informaData.bloodId"
+              emit-value
+              map-options
+              option-label="name"
+              :options="Ops.bloodOps"
+              option-value="id"
+              :label="`${'หมู่เลือด'}`"
+              use-input
+              input-debounce="0"
+              @filter="(inputValue:any,
                         doneFn:Function) => filterSelector(inputValue, doneFn,'bloodOps'
                         ) "
-            clearable
-          />
-        </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
-          <q-input
-            hide-bottom-space
-            :outlined="edit"
-            dense
-            lazy-rules
-            type="tel"
-            :class="getClass(edit)"
-            :readonly="!edit"
-            :borderless="!edit"
-            v-model="informaData.tel"
-            :label="`${'เบอร์โทร'}`"
-            :rules="[
+              clearable
+            />
+          </div>
+          <div class="col-xs-6 col-sm-2 col-md-2">
+            <q-input
+              hide-bottom-space
+              :outlined="edit"
+              dense
+              lazy-rules
+              type="tel"
+              :class="getClass(edit)"
+              :readonly="!edit"
+              :borderless="!edit"
+              v-model="informaData.tel"
+              :label="`${'เบอร์โทร'}`"
+              :rules="[
               (val:string) => !!val || `${'กรุณากรอก เบอร์โทร'}`,
               (val:string) =>
                 val.length >= 10 ||
                 `${'กรุณากรอกเบอร์โทรให้ครบ'}`,
             ]"
-            mask="##########"
-          />
+              mask="##########"
+            />
+          </div>
         </div>
         <div
           class="col-xs-6 col-sm-3 col-md-3"
@@ -1021,13 +1028,13 @@ const fetchDataComponent = async (modelData: Date) => {
   await fetchData();
 };
 const calculateMaxDate = () => {
-      const today = new Date();
-     
-      today.setDate(today.getDate() - 1);
-      return today;
-    }
+  const today = new Date();
+
+  today.setDate(today.getDate() - 1);
+  return today;
+};
 const calRetire = async (birth: Date) => {
-  console.log(birth)
+  console.log(birth);
   const body = {
     birthDate: dateToISO(birth),
   };

From ff99f0c0db217bbc34e026eb89442d80aa2ab4f6 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 13 Sep 2023 15:13:02 +0700
Subject: [PATCH 03/10] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20flexbox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/10_order/components/step/step01.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 9d3cdf5dd..d6160ecd9 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -765,7 +765,7 @@ const getClass = (val: boolean) => {
             hide-bottom-space
           />
         </div>
-        <div class="row col-xs-7 col-md-3 q-col-gutter-x-xs">
+        <div class="row col-xs-7 col-md-3">
           <div class="col-6">
             <q-input
               :class="getClass(true)"

From c43d1cf84d8cc184b989c59b657990a793b9fa98 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 13 Sep 2023 15:51:37 +0700
Subject: [PATCH 04/10] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=20popup=20layout=20=E0=B8=88=E0=B8=B1=E0=B8=94?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/Information.vue        |  25 +-
 src/components/Dialogs/PopupReason.vue        |  58 +--
 .../07_insignia/components/2_Manage/Tab1.vue  | 418 ++++--------------
 3 files changed, 127 insertions(+), 374 deletions(-)

diff --git a/src/components/Dialogs/Information.vue b/src/components/Dialogs/Information.vue
index 05747f2de..28373e805 100644
--- a/src/components/Dialogs/Information.vue
+++ b/src/components/Dialogs/Information.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import DialogHeader from "@/components/DialogHeader.vue";
+
 const props = defineProps({
   modal: {
     type: Boolean,
@@ -20,19 +22,18 @@ const props = defineProps({
 
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="width: 500px; max-width: 500px">
-      <q-toolbar class="q-py-md">
-        <q-toolbar-title class="header-text">{{ props.title }}</q-toolbar-title>
-        <q-btn icon="close" unelevated round dense @click="clickClose" style="color: #ff8080; background-color: #ffdede" />
-      </q-toolbar>
+    <q-card style="width: 35vw; max-width: 35vw">
+      <q-form ref="myForm">
+        <DialogHeader :tittle="props.title" :close="clickClose" />
+        <q-separator />
+        <q-card-section class="q-pa-md bg-grey-1">
+          <div class="row col-12">
 
-      <q-separator />
-      <q-card-section class="q-p-sm">
-        <div class="row col-12">
-          {{ props.desc }}
-        </div>
-      </q-card-section>
-      <q-separator />
+            {{ props.desc }}
+
+          </div>
+        </q-card-section>
+      </q-form>
     </q-card>
   </q-dialog>
 </template>
\ No newline at end of file
diff --git a/src/components/Dialogs/PopupReason.vue b/src/components/Dialogs/PopupReason.vue
index 0878d5bb3..2b97f8e21 100644
--- a/src/components/Dialogs/PopupReason.vue
+++ b/src/components/Dialogs/PopupReason.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 const reason = ref<string>("");
 const props = defineProps({
@@ -17,11 +18,11 @@ const props = defineProps({
   },
   clickClose: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
   savaForm: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
 });
 watch(props, () => {
@@ -42,43 +43,30 @@ const submit = () => {
 
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="width: 500px; max-width: 500px">
-      <q-toolbar class="q-py-md">
-        <q-toolbar-title class="header-text">{{ props.title }}</q-toolbar-title>
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="clickClose"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
-
-      <q-separator />
+    <q-card style="width: 40vw; max-width: 40vw">
       <q-form ref="myForm">
-        <q-card-section class="q-p-sm">
-          <div class="row col-12">
-            <q-input
-              type="textarea"
-              class="full-width inputgreen cursor-pointer"
-              hide-bottom-space
-              outlined
-              dense
-              lazy-rules
-              :rules="[(val) => !!val || `กรุณากรอก${label}`]"
-              v-model="reason"
-              :label="`${label}`"
-            />
+        <DialogHeader :tittle="props.title" :close="clickClose" />
+        <q-separator />
+        <q-card-section class="q-pa-sm bg-grey-1">
+          <div class="row col-12 q-col-gutter-sm">
+            <div class="col-xs-12">
+              <div class="col-12 row q-py-sm items-center q-col-gutter-sm">
+
+                <q-input type="textarea" class="full-width inputgreen cursor-pointer" hide-bottom-space outlined dense
+                  lazy-rules :rules="[(val) => !!val || `กรุณากรอก${label}`]" v-model="reason" :label="`${label}`" />
+
+
+              </div>
+            </div>
           </div>
         </q-card-section>
-
         <q-separator />
-
-        <q-toolbar class="text-primary">
-          <q-space />
-          <q-btn label="บันทึก" color="secondary" @click="submit" />
-        </q-toolbar>
+        <q-card-actions align="right">
+          <q-btn dense unelevated label="บันทึก" color="public" @click="submit" class="q-px-md">
+            <!-- icon="mdi-content-save-outline" -->
+            <q-tooltip>บันทึก</q-tooltip>
+          </q-btn>
+        </q-card-actions>
       </q-form>
     </q-card>
   </q-dialog>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 115574033..ca40c434b 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -10,6 +10,7 @@ import config from "@/app.config";
 import { useRouter } from "vue-router";
 
 import DialogPopupReason from "@/components/Dialogs/PopupReason.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 const router = useRouter();
 const mixin = useCounterMixin();
@@ -566,87 +567,41 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
   if (paging2.value == true) return " " + start + "-" + end + " ใน " + total;
   else return start + "-" + end + " ใน " + total;
 };
+
+const closeModalEdit = () => {
+  modalEdit.value = false
+}
 </script>
 
 <template>
   <div class="col-12 row q-pa-md">
     <div class="row col-12">
       <div class="row col-12 q-col-gutter-sm">
-        <q-select
-          v-if="roleDataStore.adminRole"
-          v-model="organization"
-          label="หน่วยงาน"
-          dense
-          emit-value
-          map-options
-          :options="organizationOptions"
-          option-value="id"
-          option-label="name"
-          lazy-rules
-          hide-bottom-space
-          :readonly="false"
-          :borderless="false"
-          :outlined="true"
-          :hide-dropdown-icon="false"
-          style="min-width: 150px"
-          @update:model-value="changtypeOc"
-        />
-        <q-select
-          v-model="DataStore.typeinsignia"
-          label="ปรเภทเครื่องราชฯ"
-          dense
-          emit-value
-          map-options
-          :options="DataStore.typeinsigniaOptions"
-          option-value="id"
-          option-label="name"
-          lazy-rules
-          hide-bottom-space
-          :readonly="false"
-          :borderless="false"
-          :outlined="true"
-          :hide-dropdown-icon="false"
-          style="min-width: 150px"
+        <q-select v-if="roleDataStore.adminRole" v-model="organization" label="หน่วยงาน" dense emit-value map-options
+          :options="organizationOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
+          :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" style="min-width: 150px"
+          @update:model-value="changtypeOc" />
+        <q-select v-model="DataStore.typeinsignia" label="ปรเภทเครื่องราชฯ" dense emit-value map-options
+          :options="DataStore.typeinsigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
+          :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" style="min-width: 150px"
           @update:model-value="
             DataStore.searchDataTable(
               DataStore.typeinsignia,
               DataStore.employeeClass
             )
-          "
-        />
+            " />
         <div>
-          <q-select
-            v-model="DataStore.employeeClass"
-            dense
-            outlined
-            lazy-rules
-            hide-bottom-space
-            :label="`${'สถานภาพ'}`"
-            emit-value
-            map-options
-            option-label="name"
-            :options="DataStore.employeeClassOps"
-            option-value="id"
-            :readonly="false"
-            :borderless="false"
-            style="min-width: 150px"
-            @update:model-value="
+          <q-select v-model="DataStore.employeeClass" dense outlined lazy-rules hide-bottom-space :label="`${'สถานภาพ'}`"
+            emit-value map-options option-label="name" :options="DataStore.employeeClassOps" option-value="id"
+            :readonly="false" :borderless="false" style="min-width: 150px" @update:model-value="
               DataStore.searchDataTable(
                 DataStore.typeinsignia,
                 DataStore.employeeClass
               )
-            "
-          />
+              " />
         </div>
         <div>
-          <q-btn
-            size="md"
-            icon="mdi-download"
-            flat
-            round
-            color="primary"
-            @click="downloadFileexcel"
-          >
+          <q-btn size="md" icon="mdi-download" flat round color="primary" @click="downloadFileexcel">
             <!-- @click="downloadReport('pdf')" -->
             <q-tooltip>ดาวน์โหลด</q-tooltip>
             <!-- <q-menu>
@@ -672,99 +627,45 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
               </q-list>
             </q-menu> -->
           </q-btn>
-          <q-btn
-            size="12px"
-            flat
-            round
-            color="add"
-            icon="mdi-plus"
-            @click="clickmodalAdd"
-            v-if="
-              (DataStore.isLock == false &&
-                DataStore.requestStatus == 'st5' &&
-                roleDataStore.adminRole) ||
-              checkStatus == true
-            "
-          >
+          <q-btn size="12px" flat round color="add" icon="mdi-plus" @click="clickmodalAdd" v-if="(DataStore.isLock == false &&
+            DataStore.requestStatus == 'st5' &&
+            roleDataStore.adminRole) ||
+            checkStatus == true
+            ">
             <q-tooltip>เพิ่ม</q-tooltip>
           </q-btn>
         </div>
         <q-space />
 
-        <q-input
-          class="col-xs-12 col-sm-3 col-md-2"
-          standout
-          dense
-          v-model="filterKeyword"
-          ref="filterRef"
-          outlined
-          debounce="300"
-          placeholder="ค้นหา"
-        >
+        <q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
+          debounce="300" placeholder="ค้นหา">
           <template v-slot:append>
             <q-icon v-if="filterKeyword == ''" name="search" />
-            <q-icon
-              v-if="filterKeyword !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="resetFilter"
-            />
+            <q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
           </template>
         </q-input>
 
-        <q-select
-          v-model="visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="columns"
-          option-value="name"
-          options-cover
-          style="min-width: 150px"
-          class="col-xs-12 col-sm-3 col-md-2"
-        />
+        <q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
+          emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
+          class="col-xs-12 col-sm-3 col-md-2" />
       </div>
       <div class="col-12 q-pt-sm">
-        <q-table
-          ref="table"
-          :columns="columns"
-          :rows="DataStore.rows"
-          :filter="filterKeyword"
-          row-key="name"
-          flat
-          bordered
-          :paging="true"
-          dense
-          class="custom-header-table"
-          :visible-columns="visibleColumns"
-          :pagination-label="paginationLabel"
-          v-model:pagination="pagination"
-        >
+        <q-table ref="table" :columns="columns" :rows="DataStore.rows" :filter="filterKeyword" row-key="name" flat
+          bordered :paging="true" dense class="custom-header-table" :visible-columns="visibleColumns"
+          :pagination-label="paginationLabel" v-model:pagination="pagination">
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
-              <q-th
-                auto-width
-                v-if="
-                  (DataStore.isLock == false &&
-                    DataStore.requestStatus == 'st5') ||
-                  checkStatus == true
-                "
-              />
+              <q-th auto-width v-if="(DataStore.isLock == false &&
+                DataStore.requestStatus == 'st5') ||
+                checkStatus == true
+                " />
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr
-              :props="props"
-              class="cursor-pointer"
-              @click.stop="nextPage(props.row.profileId)"
-            >
+            <q-tr :props="props" class="cursor-pointer" @click.stop="nextPage(props.row.profileId)">
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
@@ -798,77 +699,33 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
               <q-td key="dateSend" :props="props">
                 {{ props.row.dateSend }}
               </q-td>
-              <q-td
-                auto-width
-                v-if="
-                  (DataStore.isLock == false &&
-                    DataStore.requestStatus == 'st5' &&
-                    roleDataStore.adminRole) ||
-                  checkStatus == true
-                "
-              >
-                <q-btn
-                  v-if="
-                    roleDataStore.adminRole ||
-                    (roleDataStore.insignia1Role &&
-                      (requestStatus == 'st1' || requestStatus == 'st4'))
-                  "
-                  icon="mdi-dots-vertical"
-                  size="12px"
-                  color="grey-7"
-                  flat
-                  round
-                  dense
-                  @click.stop
-                >
+              <q-td auto-width v-if="(DataStore.isLock == false &&
+                DataStore.requestStatus == 'st5' &&
+                roleDataStore.adminRole) ||
+                checkStatus == true
+                ">
+                <q-btn v-if="roleDataStore.adminRole ||
+                  (roleDataStore.insignia1Role &&
+                    (requestStatus == 'st1' || requestStatus == 'st4'))
+                  " icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense @click.stop>
                   <q-menu transition-show="jump-down" transition-hide="jump-up">
                     <q-list dense style="min-width: 250px">
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click.stop="clickmodalEdit(props.row)"
-                      >
-                        <q-item-section
-                          style="min-width: 0px"
-                          avatar
-                          class="q-py-sm"
-                        >
+                      <q-item clickable v-close-popup @click.stop="clickmodalEdit(props.row)">
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                           <q-tooltip>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-tooltip>
                           <q-icon color="primary" size="xs" name="mdi-pencil" />
                         </q-item-section>
-                        <q-item-section
-                          >แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section
-                        >
+                        <q-item-section>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section>
                       </q-item>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click.stop="clickReject(props.row.id)"
-                      >
-                        <q-item-section
-                          style="min-width: 0px"
-                          avatar
-                          class="q-py-sm"
-                        >
+                      <q-item clickable v-close-popup @click.stop="clickReject(props.row.id)">
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                           <q-tooltip>ไม่ยื่นขอ</q-tooltip>
-                          <q-icon
-                            color="blue"
-                            size="xs"
-                            name="mdi-alert-circle-outline"
-                          />
+                          <q-icon color="blue" size="xs" name="mdi-alert-circle-outline" />
                         </q-item-section>
                         <q-item-section>ไม่ยื่นขอ</q-item-section>
                       </q-item>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click.stop="clickDelete(props.row.id)"
-                      >
-                        <q-item-section
-                          style="min-width: 0px"
-                          avatar
-                          class="q-py-sm"
-                        >
+                      <q-item clickable v-close-popup @click.stop="clickDelete(props.row.id)">
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                           <q-tooltip>ลบออก</q-tooltip>
                           <q-icon color="red" size="xs" name="mdi-delete" />
                         </q-item-section>
@@ -881,16 +738,8 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination.page"
-              active-color="primary"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
+            <q-pagination v-model="pagination.page" active-color="primary" color="primary" :max="scope.pagesNumber"
+              :max-pages="5" size="sm" boundary-links direction-links></q-pagination>
           </template>
         </q-table>
       </div>
@@ -903,62 +752,25 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
       <q-toolbar class="q-py-md">
         <q-toolbar-title class="text-h6">เพิ่มรายชื่อ </q-toolbar-title>
 
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="modalAdd = false"
-          style="color: #ff8080; background-color: #ffdede"
-        />
+        <q-btn icon="close" unelevated round dense @click="modalAdd = false"
+          style="color: #ff8080; background-color: #ffdede" />
       </q-toolbar>
       <q-separator />
       <div class="q-pa-md">
         <q-toolbar style="padding: 0">
-          <q-select
-            v-model="insigniaType"
-            label="ปรเภทเครื่องราชฯ"
-            dense
-            emit-value
-            map-options
-            :options="insigniaOptions"
-            option-value="id"
-            option-label="name"
-            lazy-rules
-            hide-bottom-space
-            :readonly="false"
-            :borderless="false"
-            :outlined="true"
-            :hide-dropdown-icon="false"
-            style="min-width: 250px"
-          />
+          <q-select v-model="insigniaType" label="ปรเภทเครื่องราชฯ" dense emit-value map-options
+            :options="insigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
+            :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" style="min-width: 250px" />
           <q-space />
-          <q-input
-            borderless
-            outlined
-            dense
-            debounce="300"
-            placeholder="ค้นหา"
-            v-model="filterKeyword2"
-          >
+          <q-input borderless outlined dense debounce="300" placeholder="ค้นหา" v-model="filterKeyword2">
             <!-- style="width: 850px; max-width: auto"? -->
             <template v-slot:append>
               <q-icon name="search" />
             </template>
           </q-input>
         </q-toolbar>
-        <q-table
-          flat
-          bordered
-          dense
-          :rows="rows2"
-          :columns="columns2"
-          :filter="filterKeyword2"
-          row-key="name"
-          class="custom-header-table"
-          :pagination-label="paginationLabel2"
-          v-model:pagination="pagination2"
-        >
+        <q-table flat bordered dense :rows="rows2" :columns="columns2" :filter="filterKeyword2" row-key="name"
+          class="custom-header-table" :pagination-label="paginationLabel2" v-model:pagination="pagination2">
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -984,27 +796,14 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
                 {{ props.row.organizationOrganization }}
               </q-td>
               <q-td>
-                <q-btn
-                  outline
-                  :props="props"
-                  label="เพิ่ม"
-                  class="text-teal-5"
-                  @click="clickAdd(props.row.id)"
-                />
+                <q-btn outline :props="props" label="เพิ่ม" class="text-teal-5" @click="clickAdd(props.row.id)" />
                 <q-tooltip>เพิ่ม</q-tooltip>
               </q-td>
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination2.page"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
+            <q-pagination v-model="pagination2.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
+              boundary-links direction-links></q-pagination>
           </template>
         </q-table>
       </div>
@@ -1013,67 +812,32 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
 
   <!-- Edit -->
   <q-dialog v-model="modalEdit" persistent>
-    <q-card style="width: 450px; max-width: 80vw" class="q-pb-md">
-      <q-toolbar class="q-py-md">
-        <q-toolbar-title class="text-h6"
-          >แก้ไขเครื่องราชฯ ที่ยื่นขอ
-        </q-toolbar-title>
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="modalEdit = false"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
-      <q-separator />
-      <div class="q-pa-md">
-        <div class="row q-col-gutter-sm">
-          <div class="col">
-            <q-select
-              v-model="insignia"
-              label="ชื่อเครื่องราชฯ"
-              dense
-              emit-value
-              map-options
-              :options="insigniaOptions"
-              option-value="id"
-              option-label="name"
-              lazy-rules
-              hide-bottom-space
-              :readonly="false"
-              :borderless="false"
-              :outlined="true"
-              :hide-dropdown-icon="false"
-              style="min-width: 150px"
-            />
+    <q-card style="width: 450px; max-width: 80vw">
+      <q-form ref="myForm">
+        <DialogHeader tittle="แก้ไขเครื่องราชฯ ที่ยื่นขอ" :close="closeModalEdit" />
+        <q-separator />
+        <q-card-section class="q-pa-sm bg-grey-1">
+          <div class="row col-12 q-py-md">
+
+              <q-select v-model="insignia" label="ชื่อเครื่องราชฯ" dense emit-value map-options :options="insigniaOptions"
+                option-value="id" option-label="name" lazy-rules hide-bottom-space :readonly="false" :borderless="false"
+                :outlined="true" :hide-dropdown-icon="false" style="width: 100%" />
+
           </div>
-        </div>
-      </div>
-      <q-separator />
-      <div class="q-pa-md">
-        <div class="row justify-end">
-          <q-btn label="บันทึก" @click="clickSave" color="public"
-            ><q-tooltip>บันทึก</q-tooltip></q-btn
-          >
-        </div>
-      </div>
+        </q-card-section>
+        <q-separator />
+        <q-card-actions align="right">
+          <q-btn dense unelevated label="บันทึก" color="public" @click="clickSave" class="q-px-md">
+            <!-- icon="mdi-content-save-outline" -->
+            <q-tooltip>บันทึก</q-tooltip>
+          </q-btn>
+        </q-card-actions>
+      </q-form>
     </q-card>
   </q-dialog>
 
-  <DialogPopupReason
-    :modal="modelPopupReject"
-    title="เหตุผลไม่ยื่นขอ"
-    label="หมายเหตุ"
-    :click-close="closemodelPopupReject"
-    :savaForm="savaReasonReject"
-  />
-  <DialogPopupReason
-    :modal="modelPopupDelete"
-    title="เหตุผลที่ลบออก"
-    label="หมายเหตุ"
-    :click-close="closemodelPopupDelete"
-    :savaForm="savaReasonDelete"
-  />
+  <DialogPopupReason :modal="modelPopupReject" title="เหตุผลไม่ยื่นขอ" label="หมายเหตุ"
+    :click-close="closemodelPopupReject" :savaForm="savaReasonReject" />
+  <DialogPopupReason :modal="modelPopupDelete" title="เหตุผลที่ลบออก" label="หมายเหตุ"
+    :click-close="closemodelPopupDelete" :savaForm="savaReasonDelete" />
 </template>

From cec54961d2503a2e6eb6e2a4fdadbebd9ba620db Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 13 Sep 2023 15:52:32 +0700
Subject: [PATCH 05/10] =?UTF-8?q?fix=20bug=20=E0=B8=9A=E0=B8=A3=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=88=E0=B8=B8=E0=B9=80=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=20pagination=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=8B?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=88=E0=B8=B8=E0=B9=81=E0=B8=A5=E0=B9=89=E0=B8=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonalList/Table.vue         | 414 ++++--------------
 1 file changed, 94 insertions(+), 320 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 9f4dd9cbe..82e0b38b9 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -572,50 +572,31 @@ const paginationLabel = (start: number, end: number, total: number) => {
   if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
   else return start + "-" + end + " ใน " + total;
 };
+
+const pagination = ref({
+  page: 1,
+  rowsPerPage: 10,
+});
+
 </script>
 <template>
   <q-form ref="myForm">
-    <Table
-      :contain-status="containStatus"
-      :rows="rows"
-      :columns="columns"
-      :filter="filter"
-      :visible-columns="visibleColumns"
-      v-model:inputfilter="filter"
-      v-model:inputvisible="visibleColumns"
-      v-model:editvisible="editvisible"
-      v-model:containfilter="containStatus"
-      @update-modaladdlist="handleModalAddListUpdate"
-      :history="true"
-      :boss="true"
-      :saveNoDraft="true"
-      :role-admin="roleAdmin"
-      :displayAdd="displayAdd"
-      row-key="fullname"
-    >
+    <Table :contain-status="containStatus" :rows="rows" :columns="columns" :filter="filter"
+      :visible-columns="visibleColumns" v-model:inputfilter="filter" v-model:inputvisible="visibleColumns"
+      v-model:editvisible="editvisible" v-model:containfilter="containStatus"
+      @update-modaladdlist="handleModalAddListUpdate" :history="true" :boss="true" :saveNoDraft="true"
+      :role-admin="roleAdmin" :displayAdd="displayAdd" row-key="fullname">
       <template #columns="props">
         <q-tr :props="props">
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="selectData(props.row.personalId)"
-            class="cursor-pointer"
-          >
+          <q-td v-for="col in props.cols" :key="col.name" :props="props" @click="selectData(props.row.personalId)"
+            class="cursor-pointer">
             <template v-if="col.name === 'position'">
               {{ props.rowIndex + 1 }}
             </template>
-            <template
-              v-else-if="col.name === 'fullName'"
-              class="table_ellipsis"
-            >
+            <template v-else-if="col.name === 'fullName'" class="table_ellipsis">
               <q-item v-ripple>
                 <q-item-section avatar>
-                  <img
-                    v-if="props.row.avatar == ''"
-                    src="@/assets/avatar_user.jpg"
-                    class="col-4 img-info"
-                  />
+                  <img v-if="props.row.avatar == ''" src="@/assets/avatar_user.jpg" class="col-4 img-info" />
                   <img v-else :src="props.row.avatar" class="col-4 img-info" />
                 </q-item-section>
 
@@ -632,30 +613,27 @@ const paginationLabel = (start: number, end: number, total: number) => {
             </template>
 
             <template v-else-if="col.name === 'organizationName'">
-              <div
-                v-if="
-                  props.row.orgName !== null || props.row.positionPath !== null
-                "
-              >
+              <div v-if="props.row.orgName !== null || props.row.positionPath !== null
+                ">
                 <div class="col-4">
                   <div class="text-weight-medium">
                     {{ props.row.orgName !== null ? props.row.orgName : "-" }}
                     {{
                       props.row.organizationShortName !== null
-                        ? `(${props.row.organizationShortName})`
-                        : ""
+                      ? `(${props.row.organizationShortName})`
+                      : ""
                     }}
                   </div>
                   <div class="text-weight-light">
                     {{
                       props.row.positionPath !== null
-                        ? props.row.positionPath
-                        : "-"
+                      ? props.row.positionPath
+                      : "-"
                     }}
                     {{
                       props.row.positionNumber !== null
-                        ? `(${props.row.positionNumber})`
-                        : ""
+                      ? `(${props.row.positionNumber})`
+                      : ""
                     }}
                   </div>
                 </div>
@@ -667,19 +645,14 @@ const paginationLabel = (start: number, end: number, total: number) => {
               </div>
             </template>
             <template v-else-if="col.name === 'positionCandidate'">
-              <div
-                class="text-weight-medium"
-                v-if="props.row.positionCandidate == null"
-              >
+              <div class="text-weight-medium" v-if="props.row.positionCandidate == null">
                 -
               </div>
               <div class="text-weight-medium" v-else>
                 {{ props.row.positionCandidate }}
               </div>
             </template>
-            <template
-              v-else-if="col.name === 'reportingDate' && col.value !== '-'"
-            >
+            <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
               <div class="text-weight-medium">
                 {{ props.row.reportingDate }}
               </div>
@@ -701,121 +674,49 @@ const paginationLabel = (start: number, end: number, total: number) => {
             </template>
           </q-td>
           <q-td auto-width>
-            <q-btn
-              icon="mdi-dots-vertical"
-              size="12px"
-              color="grey-7"
-              flat
-              round
-              dense
-            >
+            <q-btn v-if="(roleAdmin && props.row.statusId !== 'CONTAIN')" icon="mdi-dots-vertical" size="12px"
+              color="grey-7" flat round dense>
               <q-menu transition-show="jump-down" transition-hide="jump-up">
                 <q-list dense style="min-width: 100px">
-                  <q-item
-                    v-if="
-                      (roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
-                      (props.row.draft === 'รอส่งตัว' &&
-                        props.row.statusId !== 'DISCLAIM')
-                    "
-                    clickable
-                    v-close-popup
-                    @click="openAppointModal(props.row.personalId)"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="primary"
-                        size="xs"
-                        name="mdi-bookmark-outline"
-                      />
+                  <q-item v-if="(roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
+                    (props.row.draft === 'รอส่งตัว' &&
+                      props.row.statusId !== 'DISCLAIM')
+                    " clickable v-close-popup @click="openAppointModal(props.row.personalId)">
+                    <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-icon color="primary" size="xs" name="mdi-bookmark-outline" />
                     </q-item-section>
                     <q-item-section>เลือกหน่วยงานที่รับบรรจุ</q-item-section>
                   </q-item>
 
                   <q-separator />
-                  <q-item
-                    v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'"
-                    clickable
-                    v-close-popup
-                    @click="editDetail(props.row, 'deferment')"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="blue"
-                        size="xs"
-                        name="mdi-account-alert-outline"
-                      />
+                  <q-item v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'" clickable v-close-popup
+                    @click="editDetail(props.row, 'deferment')">
+                    <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-icon color="blue" size="xs" name="mdi-account-alert-outline" />
                     </q-item-section>
                     <q-item-section>ขอผ่อนผัน</q-item-section>
                   </q-item>
-                  <q-item
-                    v-else-if="
-                      props.row.deferment === true &&
-                      props.row.statusId != 'DISCLAIM'
-                    "
-                    clickable
-                    v-close-popup
-                    @click="editDetail(props.row, 'defermentInfo')"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="blue"
-                        size="xs"
-                        name="mdi-account-details-outline"
-                      />
+                  <q-item v-else-if="props.row.deferment === true &&
+                    props.row.statusId != 'DISCLAIM'
+                    " clickable v-close-popup @click="editDetail(props.row, 'defermentInfo')">
+                    <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-icon color="blue" size="xs" name="mdi-account-details-outline" />
                     </q-item-section>
                     <q-item-section>ข้อมูลการผ่อนผัน</q-item-section>
                   </q-item>
                   <q-separator />
-                  <q-item
-                    v-if="
-                      props.row.statusId === 'UN-CONTAIN' ||
-                      props.row.statusId === 'PREPARE-CONTAIN'
-                    "
-                    clickable
-                    v-close-popup
-                    @click="editDetail(props.row, 'disclaim')"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="pink"
-                        size="xs"
-                        name="mdi-account-cancel-outline"
-                      />
+                  <q-item v-if="props.row.statusId === 'UN-CONTAIN' ||
+                    props.row.statusId === 'PREPARE-CONTAIN'
+                    " clickable v-close-popup @click="editDetail(props.row, 'disclaim')">
+                    <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-icon color="pink" size="xs" name="mdi-account-cancel-outline" />
                     </q-item-section>
                     <q-item-section>สละสิทธิ์</q-item-section>
                   </q-item>
-                  <q-item
-                    v-else-if="props.row.statusId === 'DISCLAIM'"
-                    clickable
-                    v-close-popup
-                    @click="editDetail(props.row, 'disclaimInfo')"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="pink"
-                        size="xs"
-                        name="mdi-account-cancel-outline"
-                      />
+                  <q-item v-else-if="props.row.statusId === 'DISCLAIM'" clickable v-close-popup
+                    @click="editDetail(props.row, 'disclaimInfo')">
+                    <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-icon color="pink" size="xs" name="mdi-account-cancel-outline" />
                     </q-item-section>
                     <q-item-section>ข้อมูลการสละสิทธิ์</q-item-section>
                   </q-item>
@@ -829,58 +730,26 @@ const paginationLabel = (start: number, end: number, total: number) => {
   </q-form>
 
   <!-- เลือกหน่วยงานที่บรรจุ -->
-  <DialogOrgTree
-    v-model:modal="appointModal"
-    :personalId="personalId"
-    :close="clickCloseModalTree"
-    :personal="personal"
-  />
+  <DialogOrgTree v-model:modal="appointModal" :personalId="personalId" :close="clickCloseModalTree"
+    :personal="personal" />
 
   <!-- popup ขอผ่อนผัน / สละสิทธิ์ -->
   <q-form ref="myForm">
-    <DialogCard
-      v-model:Modal="modal"
-      :personal-id="personalId"
-      :close="clickClose"
-      :validate="validateData"
-    />
+    <DialogCard v-model:Modal="modal" :personal-id="personalId" :close="clickClose" :validate="validateData" />
   </q-form>
   <q-dialog v-model="modalDefermentDisclaim" persistent>
     <q-card style="width: 800px">
       <q-form ref="myForm">
-        <DialogHeader
-          :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`"
-          :close="clickClose"
-        />
+        <DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
           <div class="col-xs-12 col-sm-12 col-md-12">
-            <q-input
-              :class="getClass(edit)"
-              hide-bottom-space
-              :outlined="edit"
-              dense
-              lazy-rules
-              :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
-              :readonly="!edit"
-              :borderless="!edit"
-              v-model="userNote"
-              :label="`${'กรอกเหตุผล'}`"
-              @update:model-value="clickEditRow"
-              type="textarea"
-            />
-            <q-file
-              v-if="getNumFile === 1"
-              v-model="files"
-              dense
-              :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`"
-              outlined
-              use-chips
-              :rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']"
-              multiple
-              @update:model-value="clickEditRow"
-              class="q-py-sm"
-            >
+            <q-input :class="getClass(edit)" hide-bottom-space :outlined="edit" dense lazy-rules
+              :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']" :readonly="!edit" :borderless="!edit" v-model="userNote"
+              :label="`${'กรอกเหตุผล'}`" @update:model-value="clickEditRow" type="textarea" />
+            <q-file v-if="getNumFile === 1" v-model="files" dense :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`" outlined
+              use-chips :rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']" multiple
+              @update:model-value="clickEditRow" class="q-py-sm">
               <template v-slot:prepend>
                 <q-icon name="attach_file" color="primary" />
               </template>
@@ -888,11 +757,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
           </div>
         </q-card-section>
         <q-separator />
-        <DialogFooter
-          :editvisible="true"
-          :validate="validateData"
-          :save="modalDisclaim ? saveDisclaim : saveDeferment"
-        />
+        <DialogFooter :editvisible="true" :validate="validateData" :save="modalDisclaim ? saveDisclaim : saveDeferment" />
       </q-form>
     </q-card>
   </q-dialog>
@@ -901,10 +766,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
   <q-dialog v-model="modalwaitInfo" persistent>
     <q-card style="width: 500px; max-width: 500px">
       <q-form ref="myForm">
-        <DialogHeader
-          :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`"
-          :close="clickClose"
-        />
+        <DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
           <div class="row">
@@ -914,17 +776,8 @@ const paginationLabel = (start: number, end: number, total: number) => {
           <div v-if="!modalDisclaim" class="row q-pt-md">
             <div class="col-3 text-grey-7 q-mt-sm">เอกสารหลักฐาน</div>
             <div class="col-2 q-mt-sm">
-              <q-btn
-                type="a"
-                :href="dataInfo.reliefDoc"
-                color="primary"
-                flat
-                dense
-                round
-                size="14px"
-                icon="mdi-download"
-                target="_blank"
-              />
+              <q-btn type="a" :href="dataInfo.reliefDoc" color="primary" flat dense round size="14px" icon="mdi-download"
+                target="_blank" />
             </div>
           </div>
         </q-card-section>
@@ -936,68 +789,30 @@ const paginationLabel = (start: number, end: number, total: number) => {
   <!-- dialog เพิ่มรายชื่อ -->
   <q-dialog v-model="modaladdlist">
     <q-card style="width: 900px; max-width: 80vw">
-      <DialogHeader
-        title="ส่งรายชื่อไปยังหน่วยงาน"
-        :close="clickCloseSendModal"
-      />
+      <DialogHeader title="ส่งรายชื่อไปยังหน่วยงาน" :close="clickCloseSendModal" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-end">
           <div class="col-5">
             <q-toolbar style="padding: 0">
-              <q-input
-                borderless
-                outlined
-                dense
-                debounce="300"
-                v-model="filterlistAdd"
-                placeholder="ค้นหา"
-                style="width: 850px; max-width: auto"
-              >
+              <q-input borderless outlined dense debounce="300" v-model="filterlistAdd" placeholder="ค้นหา"
+                style="width: 850px; max-width: auto">
                 <template v-slot:append>
                   <q-icon name="search" />
                 </template>
               </q-input>
-              <q-select
-                v-model="visibleColumnslist"
-                multiple
-                outlined
-                dense
-                options-dense
-                :display-value="$q.lang.table.columns"
-                emit-value
-                map-options
-                :options="columns"
-                option-value="name"
-                options-cover
-                style="min-width: 150px"
-                class="gt-xs q-ml-sm"
-              />
+              <q-select v-model="visibleColumnslist" multiple outlined dense options-dense
+                :display-value="$q.lang.table.columns" emit-value map-options :options="columns" option-value="name"
+                options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
             </q-toolbar>
           </div>
         </div>
 
-        <q-table
-          flat
-          bordered
-          dense
-          :rows="rowsFilter"
-          :columns="columns"
-          :filter="filterlistAdd"
-          row-key="name"
-          class="custom-header-table"
-          selection="multiple"
-          v-model:selected="selected"
-          :pagination-label="paginationLabel"
-          :visible-columns="visibleColumnslist"
-        >
+        <q-table flat bordered dense :rows="rowsFilter" :columns="columns" :filter="filterlistAdd" row-key="name"
+          class="custom-header-table" selection="multiple" v-model:selected="selected" :pagination-label="paginationLabel"
+          :visible-columns="visibleColumnslist">
           <template v-slot:header-selection="scope">
-            <q-checkbox
-              keep-color
-              color="primary"
-              dense
-              v-model="scope.selected"
-            />
+            <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
           </template>
           <!-- <template v-slot:body-selection="scope">
             <q-checkbox
@@ -1010,37 +825,16 @@ const paginationLabel = (start: number, end: number, total: number) => {
           <template v-slot:body="props">
             <q-tr :props="props">
               <q-td>
-                <q-checkbox
-                  keep-color
-                  color="primary"
-                  dense
-                  v-model="props.selected"
-                />
+                <q-checkbox keep-color color="primary" dense v-model="props.selected" />
               </q-td>
-              <q-td
-                v-for="col in props.cols"
-                :key="col.name"
-                :props="props"
-                class="cursor-pointer"
-              >
+              <q-td v-for="col in props.cols" :key="col.name" :props="props" class="cursor-pointer">
                 <template v-if="col.name === 'position'">
                   {{ props.rowIndex + 1 }}
                 </template>
-                <template
-                  v-else-if="col.name === 'fullName'"
-                  class="table_ellipsis"
-                >
+                <template v-else-if="col.name === 'fullName'" class="table_ellipsis">
                   <div class="row col-12 text-no-wrap items-center">
-                    <img
-                      v-if="props.row.avatar == null"
-                      src="@/assets/avatar_user.jpg"
-                      class="col-4 img-info"
-                    />
-                    <img
-                      v-else
-                      :src="props.row.avatar"
-                      class="col-4 img-info"
-                    />
+                    <img v-if="props.row.avatar == null" src="@/assets/avatar_user.jpg" class="col-4 img-info" />
+                    <img v-else :src="props.row.avatar" class="col-4 img-info" />
                     <div class="col-4">
                       <div class="text-weight-medium">{{ props.row.name }}</div>
                       <div class="text-weight-light">
@@ -1058,12 +852,9 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 </template>
 
                 <template v-else-if="col.name === 'organizationName'">
-                  <div
-                    v-if="
-                      props.row.orgName !== null ||
-                      props.row.positionPath !== null
-                    "
-                  >
+                  <div v-if="props.row.orgName !== null ||
+                    props.row.positionPath !== null
+                    ">
                     <div class="col-4">
                       <div class="text-weight-medium">
                         {{
@@ -1071,20 +862,20 @@ const paginationLabel = (start: number, end: number, total: number) => {
                         }}
                         {{
                           props.row.organizationShortName !== null
-                            ? `(${props.row.organizationShortName})`
-                            : ""
+                          ? `(${props.row.organizationShortName})`
+                          : ""
                         }}
                       </div>
                       <div class="text-weight-light">
                         {{
                           props.row.positionPath !== null
-                            ? props.row.positionPath
-                            : "-"
+                          ? props.row.positionPath
+                          : "-"
                         }}
                         {{
                           props.row.positionNumber !== null
-                            ? `(${props.row.positionNumber})`
-                            : ""
+                          ? `(${props.row.positionNumber})`
+                          : ""
                         }}
                       </div>
                     </div>
@@ -1096,19 +887,14 @@ const paginationLabel = (start: number, end: number, total: number) => {
                   </div>
                 </template>
                 <template v-else-if="col.name === 'positionCandidate'">
-                  <div
-                    class="text-weight-medium"
-                    v-if="props.row.positionCandidate == null"
-                  >
+                  <div class="text-weight-medium" v-if="props.row.positionCandidate == null">
                     -
                   </div>
                   <div class="text-weight-medium" v-else>
                     {{ props.row.positionCandidate }}
                   </div>
                 </template>
-                <template
-                  v-else-if="col.name === 'reportingDate' && col.value !== '-'"
-                >
+                <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
                   <div class="text-weight-medium">
                     {{ props.row.reportingDate }}
                   </div>
@@ -1134,26 +920,14 @@ const paginationLabel = (start: number, end: number, total: number) => {
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination.page"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
+            <q-pagination v-model="pagination.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
+              boundary-links direction-links></q-pagination>
           </template>
         </q-table>
       </q-card-section>
 
       <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn
-          label="ส่งรายชื่อ"
-          @click="savelist"
-          :disable="checkSelected"
-          color="public"
-        />
+        <q-btn label="ส่งรายชื่อ" @click="savelist" :disable="checkSelected" color="public" />
       </q-card-actions>
     </q-card>
   </q-dialog>

From 97208fff90f19b843358426e56f70302a5c893f8 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 13 Sep 2023 16:11:26 +0700
Subject: [PATCH 06/10] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20la?=
 =?UTF-8?q?yout=20popup=20=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=88=E0=B8=B8=E0=B9=81=E0=B8=82=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B8=82=E0=B8=B1=E0=B8=99/=E0=B8=84=E0=B8=B1=E0=B8=94?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/PersonalList/OrgTree.vue   |  4 ++--
 .../05_placement/components/PersonalList/Table.vue     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/OrgTree.vue b/src/modules/05_placement/components/PersonalList/OrgTree.vue
index 5b7769e4e..2c0971330 100644
--- a/src/modules/05_placement/components/PersonalList/OrgTree.vue
+++ b/src/modules/05_placement/components/PersonalList/OrgTree.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useQuasar, QForm } from "quasar";
 import { onMounted, reactive, ref, watch } from "vue";
-import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
 import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
@@ -498,7 +498,7 @@ const postClearPosition = async () => {
   <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 900px; max-width: 80vw">
       <q-form ref="myFormPosition">
-        <DialogHeader title="เลือกหน่วยงานที่รับบรรจุ" :close="closeModal" />
+        <DialogHeader tittle="เลือกหน่วยงานที่รับบรรจุ" :close="closeModal" />
         <q-separator />
         <q-card-section class="q-pa-sm bg-grey-1">
           <div class="row col-12 q-col-gutter-sm">
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 82e0b38b9..13aef5c53 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -6,7 +6,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import Table from "@/modules/05_placement/components/PersonalList/TableView.vue";
 import DialogCard from "@/modules/05_placement/components/PersonalList/TableDetail.vue";
 import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
-import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 import type { PartialTableName } from "@/modules/05_placement/interface/request/placement";
 import DialogOrgTree from "@/modules/05_placement/components/PersonalList/OrgTree.vue";
 import { useRoute } from "vue-router";
@@ -740,9 +740,9 @@ const pagination = ref({
   <q-dialog v-model="modalDefermentDisclaim" persistent>
     <q-card style="width: 800px">
       <q-form ref="myForm">
-        <DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`" :close="clickClose" />
+        <DialogHeader :tittle="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`" :close="clickClose" />
         <q-separator />
-        <q-card-section class="q-p-sm">
+        <q-card-section class="q-pa-md bg-grey-1">
           <div class="col-xs-12 col-sm-12 col-md-12">
             <q-input :class="getClass(edit)" hide-bottom-space :outlined="edit" dense lazy-rules
               :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']" :readonly="!edit" :borderless="!edit" v-model="userNote"
@@ -766,7 +766,7 @@ const pagination = ref({
   <q-dialog v-model="modalwaitInfo" persistent>
     <q-card style="width: 500px; max-width: 500px">
       <q-form ref="myForm">
-        <DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`" :close="clickClose" />
+        <DialogHeader :tittle="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
           <div class="row">
@@ -789,7 +789,7 @@ const pagination = ref({
   <!-- dialog เพิ่มรายชื่อ -->
   <q-dialog v-model="modaladdlist">
     <q-card style="width: 900px; max-width: 80vw">
-      <DialogHeader title="ส่งรายชื่อไปยังหน่วยงาน" :close="clickCloseSendModal" />
+      <DialogHeader tittle="ส่งรายชื่อไปยังหน่วยงาน" :close="clickCloseSendModal" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-end">

From da45e0301ec4028b126b0925b36c6d88888ce7c0 Mon Sep 17 00:00:00 2001
From: Tanyalak <tanyalak@frappet.com>
Date: Wed, 13 Sep 2023 16:16:01 +0700
Subject: [PATCH 07/10] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=81=E0=B8=93=E0=B8=91=E0=B9=8C=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=94=E0=B8=AB=E0=B8=A7=E0=B8=B1=E0=B8=87,?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9Acss=20=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Other/Criterion.vue            |  61 +++
 .../probation/FormEvaluation/FormEvaluate.vue |   5 +
 .../FormEvaluation/FormEvaluateAdd.vue        |   5 +
 .../FormEvaluation/FormEvaluateScore.vue      |   5 +
 .../FormEvaluation/FormEvaluateScoreAdd.vue   |   5 +
 .../FormEvaluation/FormSaveResult.vue         |   7 +
 .../FormEvaluation/FormSaveResultAdd.vue      |   6 +
 .../components/probation/SummarySurvey.vue    |   4 +-
 .../10_order/components/step/step01.vue       | 396 +++++++++---------
 .../10_order/components/step/step02.vue       |   2 +-
 .../10_order/components/step/step03.vue       |   2 +-
 11 files changed, 297 insertions(+), 201 deletions(-)
 create mode 100644 src/modules/05_placement/components/Other/Criterion.vue

diff --git a/src/modules/05_placement/components/Other/Criterion.vue b/src/modules/05_placement/components/Other/Criterion.vue
new file mode 100644
index 000000000..e21d339c4
--- /dev/null
+++ b/src/modules/05_placement/components/Other/Criterion.vue
@@ -0,0 +1,61 @@
+<template>
+    <div class="col-12 row q-pb-sm">
+        <div class="col-12 text-top0 items-center q-pa-md">
+        เกณฑ์การประเมินความคาดหวัง
+        </div>
+        <div class="q-gutter-sm row">
+            <div class="col-12 row">
+                <div class="col-2 row justify-center">
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3" aria-hidden="true" role="presentation">grade</i>
+                </div>
+                <div class="q-pl-md col-3">ต่ำกว่าความคาดหวังมาก</div>
+                <div class="q-pl-md">หมายถึง มีคะแนนเฉลี่ยที่ระดับ 1</div>
+            </div>
+            <div class="col-12 row">
+                <div class="col-2 row justify-center">
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6" aria-hidden="true" role="presentation">grade</i>
+                </div>
+                <div class="q-pl-md col-3">ต่ำกว่าความคาดหวังค่อนข้างมาก</div>
+                <div class="q-pl-md">หมายถึง มีคะแนนเฉลี่ยที่ระดับ 2</div>
+            </div>
+            <div class="col-12 row">
+                <div class="col-2 row justify-center">
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue" aria-hidden="true" role="presentation">grade</i>
+                </div>
+                <div class="q-pl-md col-3">เป็นไปตามความคาดหวัง</div>
+                <div class="q-pl-md">หมายถึง มีคะแนนเฉลี่ยที่ระดับ 3</div>
+            </div>
+            <div class="col-12 row">
+                <div class="col-2 row justify-center">
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-9" aria-hidden="true" role="presentation">grade</i>
+                </div>
+                <div class="q-pl-md col-3">สูงว่าความคาดหวังค่อนข้างมาก</div>
+                <div class="q-pl-md">หมายถึง มีคะแนนเฉลี่ยที่ระดับ 4</div>
+            </div>
+            <div class="col-12 row">
+                <div class="col-2 row justify-center">
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-9" aria-hidden="true" role="presentation">grade</i>
+                <i class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-10" aria-hidden="true" role="presentation">grade</i>
+                </div>
+                <div class="q-pl-md col-3">สูงกว่าความคาดหวังมาก</div>
+                <div class="q-pl-md">หมายถึง มีคะแนนเฉลี่ยที่ระดับ 5</div>
+            </div>
+        </div>
+    </div>
+</template>
+<style lang="scss" scoped>
+.text-top0 {
+  font-weight: 600;
+  padding-bottom: 8px;
+  color: rgb(70, 68, 68);
+}
+</style>
\ No newline at end of file
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
index 2def33515..66593ab74 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
@@ -7,6 +7,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
 
 const router = useRouter();
 const routeName = router.currentRoute.value.name;
@@ -386,6 +387,10 @@ const save = () => {
         <div class="col-12 q-pt-md">
           <q-separator size="3px" color="grey-2" />
         </div>
+        <criterion />
+        <div class="col-12 q-pt-md">
+          <q-separator size="3px" color="grey-2" />
+        </div>
       </div>
       <div class="col-12 row">
         <div class="col-12 text-top0 items-center">
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
index 06f6b51f3..fa973308a 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
@@ -6,6 +6,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useRoute, useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
 
 const $q = useQuasar();
 const probationStore = useProbationDataStore();
@@ -369,6 +370,10 @@ const getBordered = (i: boolean) => {
             <div class="col-12 q-pt-md">
               <q-separator size="3px" color="grey-2" />
             </div>
+            <criterion />
+            <div class="col-12 q-pt-md">
+              <q-separator size="3px" color="grey-2" />
+            </div>
           </div>
 
           <div class="col-12 row">
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index 60be9cac0..4b68f0f86 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -7,6 +7,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
 
 const router = useRouter();
 const routeName = router.currentRoute.value.name;
@@ -504,6 +505,10 @@ const putformData = () => {
         <div class="col-12 q-pt-md">
           <q-separator size="3px" color="grey-2" />
         </div>
+        <criterion />
+        <div class="col-12 q-pt-md">
+          <q-separator size="3px" color="grey-2" />
+        </div>
       </div>
 
       <div class="col-12 row">
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
index c7638c465..c64c971a1 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
@@ -6,6 +6,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useRoute, useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
 
 const $q = useQuasar();
 const probationStore = useProbationDataStore();
@@ -481,6 +482,10 @@ watch(lengthdiscipline_level, (newLength) => {
             <div class="col-12 q-pt-md">
               <q-separator size="3px" color="grey-2" />
             </div>
+            <criterion />
+            <div class="col-12 q-pt-md">
+              <q-separator size="3px" color="grey-2" />
+            </div>
           </div>
 
           <div class="col-12 row">
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
index aa56cbd39..f5bbffdf5 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@@ -9,6 +9,9 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
+
+import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
+
 const router = useRouter();
 const routeName = router.currentRoute.value.name;
 const $q = useQuasar();
@@ -478,6 +481,10 @@ const editData = async (data: any) => {
         <div class="col-12 q-pt-md">
           <q-separator size="3px" color="grey-2" />
         </div>
+        <criterion />
+        <div class="col-12 q-pt-md">
+          <q-separator size="3px" color="grey-2" />
+        </div>
       </div>
 
       <div class="col-12 row">
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
index 536222e90..72e35dd5a 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
@@ -9,6 +9,8 @@ import { useRoute, useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
+import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
+
 const $q = useQuasar();
 const route = useRoute();
 const router = useRouter();
@@ -468,6 +470,10 @@ const getBordered = (i: boolean) => {
             <div class="col-12 q-pt-md">
               <q-separator size="3px" color="grey-2" />
             </div>
+            <criterion />
+            <div class="col-12 q-pt-md">
+              <q-separator size="3px" color="grey-2" />
+            </div>
           </div>
 
           <div class="col-12 row">
diff --git a/src/modules/05_placement/components/probation/SummarySurvey.vue b/src/modules/05_placement/components/probation/SummarySurvey.vue
index ce89778e0..1b80a0ce5 100644
--- a/src/modules/05_placement/components/probation/SummarySurvey.vue
+++ b/src/modules/05_placement/components/probation/SummarySurvey.vue
@@ -6,6 +6,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useProbationDataStore } from "@/modules/05_placement/store";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
 const probationStore = useProbationDataStore();
 const { ratingColors } = probationStore;
 const $q = useQuasar();
@@ -175,9 +176,10 @@ watch(answer3, () => {
         </template>
       </q-rating>
     </div>
-    <div class="col-12 q-my-md">
+    <div class="col-12 q-mt-md">
       <q-separator size="3px" color="grey-2" />
     </div>
+    <criterion />
   </q-form>
   <!-- <Footer /> -->
   <div class="row col-12">
diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 9d3cdf5dd..68ff310c6 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -733,225 +733,226 @@ const getClass = (val: boolean) => {
   <div style="max-height: 68vh; overflow-y: scroll">
     <!-- Main -->
     <q-form ref="myForm" class="q-pa-md">
-      <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
-        <div class="col-xs-12 col-md-6">
-          <q-select
-            :class="getClass(true)"
-            outlined
-            dense
-            lazy-rules
-            v-model="typeOrder"
-            :rules="[(val: string) => !!val || `${'กรุณาเลือกประเภทคำสั่ง'}`]"
-            hide-bottom-space
-            :label="`${'ประเภทคำสั่ง'}`"
-            map-options
-            option-label="fullname"
-            :options="typeOrderOption"
-            option-value="id"
-            use-input
-            input-debounce="0"
-            @update:model-value="selectCMP(typeOrder)"
-          />
-        </div>
-        <div class="col-xs-12 col-md-6">
-          <q-input
-            :class="getClass(true)"
-            outlined
-            dense
-            lazy-rules
-            v-model="nameOrder"
-            :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งเรื่อง'}`]"
-            :label="`${'คำสั่งเรื่อง'}`"
-            hide-bottom-space
-          />
-        </div>
-        <div class="row col-xs-7 col-md-3 q-col-gutter-x-xs">
-          <div class="col-6">
+        <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
+          <div class="col-xs-12 col-md-6">
+            <q-select
+              :class="getClass(true)"
+              outlined
+              dense
+              lazy-rules
+              v-model="typeOrder"
+              :rules="[(val: string) => !!val || `${'กรุณาเลือกประเภทคำสั่ง'}`]"
+              hide-bottom-space
+              :label="`${'ประเภทคำสั่ง'}`"
+              map-options
+              option-label="fullname"
+              :options="typeOrderOption"
+              option-value="id"
+              use-input
+              input-debounce="0"
+              @update:model-value="selectCMP(typeOrder)"
+            />
+          </div>
+          <div class="col-xs-12 col-md-6">
             <q-input
               :class="getClass(true)"
               outlined
               dense
               lazy-rules
-              v-model="command"
+              v-model="nameOrder"
+              :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งเรื่อง'}`]"
+              :label="`${'คำสั่งเรื่อง'}`"
               hide-bottom-space
-              :label="`${'คำสั่งเลขที่'}`"
             />
           </div>
-          <label class="col-1 flex justify-center items-center text-bold"
-            >/</label
-          >
-          <div class="col-5">
+          <div class="row col-xs-7 col-md-3 q-col-gutter-x-xs">
+            <div class="col-6">
+              <q-input
+                :class="getClass(true)"
+                outlined
+                dense
+                lazy-rules
+                v-model="command"
+                hide-bottom-space
+                :label="`${'คำสั่งเลขที่'}`"
+              />
+            </div>
+            <label class="col-1 flex justify-center items-center text-bold"
+              >/</label
+            >
+            <div class="col-5">
+              <datepicker
+                v-model="dateYear"
+                :locale="'th'"
+                autoApply
+                year-picker
+                :enableTimePicker="false"
+              >
+                <template #year="{ year }">{{ year + 543 }}</template>
+                <template #year-overlay-value="{ value }">{{
+                  parseInt(value + 543)
+                }}</template>
+                <template #trigger>
+                  <q-input
+                    :model-value="dateYear + 543"
+                    :rules="[(val) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
+                    :label="`${'พ.ศ.'}`"
+                    dense
+                    outlined
+                  >
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+          </div>
+          <div class="col-xs-5 col-md-3">
             <datepicker
-              v-model="dateYear"
+              menu-class-name="modalfix"
+              v-model="dateCommand"
               :locale="'th'"
               autoApply
-              year-picker
+              borderless
               :enableTimePicker="false"
+              week-start="0"
             >
-              <template #year="{ year }">{{ year + 543 }}</template>
-              <template #year-overlay-value="{ value }">{{
-                parseInt(value + 543)
-              }}</template>
+              <template #year="{ year }">
+                {{ year + 543 }}
+              </template>
+              <template #year-overlay-value="{ value }">
+                {{ parseInt(value + 543) }}
+              </template>
               <template #trigger>
                 <q-input
-                  :model-value="dateYear + 543"
-                  :rules="[(val) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
-                  :label="`${'พ.ศ.'}`"
-                  dense
                   outlined
+                  dense
+                  class="full-width datepicker"
+                  :model-value="
+                    dateCommand != null ? date2Thai(dateCommand) : 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>
           </div>
-        </div>
-        <div class="col-xs-5 col-md-3">
-          <datepicker
-            menu-class-name="modalfix"
-            v-model="dateCommand"
-            :locale="'th'"
-            autoApply
-            borderless
-            :enableTimePicker="false"
-            week-start="0"
+          <div class="col-xs-12 col-md-6">
+            <selector
+              :class="getClass(true)"
+              outlined
+              dense
+              lazy-rules
+              v-model="byOrder"
+              :rules="[(val: string) => !!val || `${'กรุณาเลือกคำสั่งโดย'}`]"
+              emit-value
+              hide-bottom-space
+              :label="`${'คำสั่งโดย'}`"
+              map-options
+              option-label="name"
+              :options="byOrderOption"
+              option-value="id"
+              use-input
+              input-debounce="0"
+              @update:model-value="(nameCommand = ''), (positionCommand = '')"
+            />
+          </div>
+          <div
+            class="col-xs-12 col-md-6"
+            v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
           >
-            <template #year="{ year }">
-              {{ year + 543 }}
-            </template>
-            <template #year-overlay-value="{ value }">
-              {{ parseInt(value + 543) }}
-            </template>
-            <template #trigger>
-              <q-input
-                outlined
-                dense
-                class="full-width datepicker"
-                :model-value="
-                  dateCommand != null ? date2Thai(dateCommand) : 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>
-        </div>
-        <div class="col-xs-12 col-md-6">
-          <selector
-            :class="getClass(true)"
-            outlined
-            dense
-            lazy-rules
-            v-model="byOrder"
-            :rules="[(val: string) => !!val || `${'กรุณาเลือกคำสั่งโดย'}`]"
-            emit-value
-            hide-bottom-space
-            :label="`${'คำสั่งโดย'}`"
-            map-options
-            option-label="name"
-            :options="byOrderOption"
-            option-value="id"
-            use-input
-            input-debounce="0"
-            @update:model-value="(nameCommand = ''), (positionCommand = '')"
-          />
-        </div>
-        <div
-          class="col-xs-12 col-md-6"
-          v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
-        >
-          <selector
-            :class="getClass(true)"
-            outlined
-            dense
-            lazy-rules
-            v-model="nameCommand"
-            :rules="[(val: string) => !!val || `${'กรุณาเลือกผู้มีอำนาจลงนาม'}`]"
-            hide-bottom-space
-            :label="`${'ผู้มีอำนาจลงนาม'}`"
-            map-options
-            option-label="name"
-            :options="CommandOption"
-            option-value="id"
-            use-input
-            input-debounce="0"
-          >
-            <template v-if="CommandOption.length === 0" v-slot:no-option>
-              <q-item>
-                <q-item-section class="text-primary">
-                  กรุณาเลือกคำสั่งโดยก่อน
-                </q-item-section>
-              </q-item>
-            </template>
-          </selector>
+            <selector
+              :class="getClass(true)"
+              outlined
+              dense
+              lazy-rules
+              v-model="nameCommand"
+              :rules="[(val: string) => !!val || `${'กรุณาเลือกผู้มีอำนาจลงนาม'}`]"
+              hide-bottom-space
+              :label="`${'ผู้มีอำนาจลงนาม'}`"
+              map-options
+              option-label="name"
+              :options="CommandOption"
+              option-value="id"
+              use-input
+              input-debounce="0"
+            >
+              <template v-if="CommandOption.length === 0" v-slot:no-option>
+                <q-item>
+                  <q-item-section class="text-primary">
+                    กรุณาเลือกคำสั่งโดยก่อน
+                  </q-item-section>
+                </q-item>
+              </template>
+            </selector>
 
-          <!-- <q-input
-            :class="getClass(true)"
-            outlined
-            dense
-            lazy-rules
-            v-model="nameCommand"
-            :rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
-            :label="`${'ผู้มีอำนาจลงนาม'}`"
-            hide-bottom-space
-          /> -->
-        </div>
-        <div
-          class="col-xs-12 col-md-6"
-          v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
-        >
-          <q-input
-            :class="getClass(true)"
-            outlined
-            dense
-            lazy-rules
-            v-model="positionCommand"
-            :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
-            :label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
-            hide-bottom-space
-            disable
-          />
-        </div>
-        <div
-          class="col-xs-12 col-md-6"
-          v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
-        >
-          <q-input
-            :class="getClass(true)"
-            outlined
-            dense
-            lazy-rules
-            v-model="nameCommand"
-            :rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
-            :label="`${'ผู้มีอำนาจลงนาม'}`"
-            hide-bottom-space
-          />
-        </div>
-        <div
-          class="col-xs-12 col-md-6"
-          v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
-        >
-          <q-input
-            :class="getClass(true)"
-            outlined
-            dense
-            lazy-rules
-            v-model="positionCommand"
-            :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
-            :label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
-            hide-bottom-space
-          />
-        </div>
-        <div class="col-12">
-          <q-separator v-if="typeOrder.commandCode" />
+            <!-- <q-input
+              :class="getClass(true)"
+              outlined
+              dense
+              lazy-rules
+              v-model="nameCommand"
+              :rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
+              :label="`${'ผู้มีอำนาจลงนาม'}`"
+              hide-bottom-space
+            /> -->
+          </div>
+          <div
+            class="col-xs-12 col-md-6"
+            v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
+          >
+            <q-input
+              :class="getClass(true)"
+              outlined
+              dense
+              lazy-rules
+              v-model="positionCommand"
+              :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
+              :label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
+              hide-bottom-space
+              disable
+            />
+          </div>
+          <div
+            class="col-xs-12 col-md-6"
+            v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
+          >
+            <q-input
+              :class="getClass(true)"
+              outlined
+              dense
+              lazy-rules
+              v-model="nameCommand"
+              :rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
+              :label="`${'ผู้มีอำนาจลงนาม'}`"
+              hide-bottom-space
+            />
+          </div>
+          <div
+            class="col-xs-12 col-md-6"
+            v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
+          >
+            <q-input
+              :class="getClass(true)"
+              outlined
+              dense
+              lazy-rules
+              v-model="positionCommand"
+              :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
+              :label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
+              hide-bottom-space
+            />
+          </div>
+          <div class="col-12 q-mb-md" v-if="typeOrder.commandCode">
+            <q-separator color="grey-3" />
+          </div>
         </div>
 
         <!-- C-PM-01-04 -->
@@ -2317,7 +2318,7 @@ const getClass = (val: boolean) => {
               :rules="[
                 (val) => !!val || `${'กรุณากรอกรายละเอียดการกระทำความผิด'}`,
               ]"
-              :label="`${'ละเอียดการกระทำความผิด'}`"
+              :label="`${'รายละเอียดการกระทำความผิด'}`"
               hide-bottom-space
             />
           </div>
@@ -2411,7 +2412,6 @@ const getClass = (val: boolean) => {
             />
           </div>
         </div>
-      </div>
     </q-form>
   </div>
 
diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue
index 496544e2c..51b0e1e85 100644
--- a/src/modules/10_order/components/step/step02.vue
+++ b/src/modules/10_order/components/step/step02.vue
@@ -443,7 +443,7 @@ const getClass = (val: boolean) => {
 
 <template>
   <div>
-    <div class="q-py-md q-pl-md" style="height: 68vh; overflow-y: scroll">
+    <div class="q-py-md q-pl-md" style="max-height: 68vh; overflow-y: scroll">
       <div class="col-12 row q-pb-sm items-center">
         <q-btn flat round color="primary" @click="refresh" icon="mdi-plus">
           <q-tooltip>เพิ่มข้อมูล</q-tooltip>
diff --git a/src/modules/10_order/components/step/step03.vue b/src/modules/10_order/components/step/step03.vue
index 1e82f8402..2206141e8 100644
--- a/src/modules/10_order/components/step/step03.vue
+++ b/src/modules/10_order/components/step/step03.vue
@@ -387,7 +387,7 @@ const updateData = (row: DataCopyOrder) => {
 
 <template>
   <div>
-    <div class="q-py-md q-pl-md" style="height: 68vh; overflow-y: scroll">
+    <div class="q-py-md q-pl-md" style="max-height: 68vh; overflow-y: scroll">
       <div class="col-12 row q-py-sm items-center">
         <q-btn flat round color="primary" @click="clickAdd" icon="mdi-plus">
           <q-tooltip>เพิ่มข้อมูล</q-tooltip>

From b8118186e0fc927c4565eb5afd89587b90ba8624 Mon Sep 17 00:00:00 2001
From: Tanyalak <tanyalak@frappet.com>
Date: Wed, 13 Sep 2023 16:26:28 +0700
Subject: [PATCH 08/10] no message

---
 .../10_order/components/step/step01.vue       | 3271 ++++++++---------
 1 file changed, 1635 insertions(+), 1636 deletions(-)

diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 025d8214c..d1f11eff7 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -733,1684 +733,1683 @@ const getClass = (val: boolean) => {
   <div style="max-height: 68vh; overflow-y: scroll">
     <!-- Main -->
     <q-form ref="myForm" class="q-pa-md">
-        <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
-          <div class="col-xs-12 col-md-6">
-            <q-select
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="typeOrder"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกประเภทคำสั่ง'}`]"
-              hide-bottom-space
-              :label="`${'ประเภทคำสั่ง'}`"
-              map-options
-              option-label="fullname"
-              :options="typeOrderOption"
-              option-value="id"
-              use-input
-              input-debounce="0"
-              @update:model-value="selectCMP(typeOrder)"
-            />
-          </div>
-          <div class="col-xs-12 col-md-6">
+      <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
+        <div class="col-xs-12 col-md-6">
+          <q-select
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="typeOrder"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกประเภทคำสั่ง'}`]"
+            hide-bottom-space
+            :label="`${'ประเภทคำสั่ง'}`"
+            map-options
+            option-label="fullname"
+            :options="typeOrderOption"
+            option-value="id"
+            use-input
+            input-debounce="0"
+            @update:model-value="selectCMP(typeOrder)"
+          />
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="nameOrder"
+            :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งเรื่อง'}`]"
+            :label="`${'คำสั่งเรื่อง'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="row col-xs-7 col-md-3">
+          <div class="col-6">
             <q-input
               :class="getClass(true)"
               outlined
               dense
               lazy-rules
-              v-model="nameOrder"
-              :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งเรื่อง'}`]"
-              :label="`${'คำสั่งเรื่อง'}`"
+              v-model="command"
               hide-bottom-space
+              :label="`${'คำสั่งเลขที่'}`"
             />
           </div>
-          <div class="row col-xs-7 col-md-3 q-col-gutter-x-xs">
-            <div class="col-6">
+          <label class="col-1 flex justify-center items-center text-bold"
+            >/</label
+          >
+          <div class="col-5">
+            <datepicker
+              v-model="dateYear"
+              :locale="'th'"
+              autoApply
+              year-picker
+              :enableTimePicker="false"
+            >
+              <template #year="{ year }">{{ year + 543 }}</template>
+              <template #year-overlay-value="{ value }">{{
+                parseInt(value + 543)
+              }}</template>
+              <template #trigger>
+                <q-input
+                  :model-value="dateYear + 543"
+                  :rules="[(val) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
+                  :label="`${'พ.ศ.'}`"
+                  dense
+                  outlined
+                >
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
+        </div>
+        <div class="col-xs-5 col-md-3">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="dateCommand"
+            :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
-                :class="getClass(true)"
                 outlined
                 dense
-                lazy-rules
-                v-model="command"
-                hide-bottom-space
-                :label="`${'คำสั่งเลขที่'}`"
-              />
-            </div>
-            <label class="col-1 flex justify-center items-center text-bold"
-              >/</label
-            >
-            <div class="col-5">
-              <datepicker
-                v-model="dateYear"
-                :locale="'th'"
-                autoApply
-                year-picker
-                :enableTimePicker="false"
+                class="full-width datepicker"
+                :model-value="
+                  dateCommand != null ? date2Thai(dateCommand) : null
+                "
+                :label="`${'วันที่คำสั่งมีผล'}`"
+                :rules="[(val) => !!val || `${'กรุณาเลือกวันที่คำสั่งมีผล'}`]"
               >
-                <template #year="{ year }">{{ year + 543 }}</template>
-                <template #year-overlay-value="{ value }">{{
-                  parseInt(value + 543)
-                }}</template>
-                <template #trigger>
-                  <q-input
-                    :model-value="dateYear + 543"
-                    :rules="[(val) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
-                    :label="`${'พ.ศ.'}`"
-                    dense
-                    outlined
+                <template v-slot:prepend>
+                  <q-icon
+                    name="event"
+                    class="cursor-pointer"
+                    style="color: var(--q-primary)"
                   >
-                  </q-input>
+                  </q-icon>
                 </template>
-              </datepicker>
-            </div>
-          </div>
-          <div class="col-xs-5 col-md-3">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="dateCommand"
-              :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="full-width datepicker"
-                  :model-value="
-                    dateCommand != null ? date2Thai(dateCommand) : 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>
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="byOrder"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกคำสั่งโดย'}`]"
-              emit-value
-              hide-bottom-space
-              :label="`${'คำสั่งโดย'}`"
-              map-options
-              option-label="name"
-              :options="byOrderOption"
-              option-value="id"
-              use-input
-              input-debounce="0"
-              @update:model-value="(nameCommand = ''), (positionCommand = '')"
-            />
-          </div>
-          <div
-            class="col-xs-12 col-md-6"
-            v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
-          >
-            <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="nameCommand"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกผู้มีอำนาจลงนาม'}`]"
-              hide-bottom-space
-              :label="`${'ผู้มีอำนาจลงนาม'}`"
-              map-options
-              option-label="name"
-              :options="CommandOption"
-              option-value="id"
-              use-input
-              input-debounce="0"
-            >
-              <template v-if="CommandOption.length === 0" v-slot:no-option>
-                <q-item>
-                  <q-item-section class="text-primary">
-                    กรุณาเลือกคำสั่งโดยก่อน
-                  </q-item-section>
-                </q-item>
-              </template>
-            </selector>
-
-            <!-- <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="nameCommand"
-              :rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
-              :label="`${'ผู้มีอำนาจลงนาม'}`"
-              hide-bottom-space
-            /> -->
-          </div>
-          <div
-            class="col-xs-12 col-md-6"
-            v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
-          >
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="positionCommand"
-              :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
-              :label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
-              hide-bottom-space
-              disable
-            />
-          </div>
-          <div
-            class="col-xs-12 col-md-6"
-            v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
-          >
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="nameCommand"
-              :rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
-              :label="`${'ผู้มีอำนาจลงนาม'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div
-            class="col-xs-12 col-md-6"
-            v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
-          >
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="positionCommand"
-              :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
-              :label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-12">
-            <q-separator v-if="typeOrder.commandCode" />
-          </div>
-        
-
-        <!-- C-PM-01-04 -->
+              </q-input>
+            </template>
+          </datepicker>
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="byOrder"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกคำสั่งโดย'}`]"
+            emit-value
+            hide-bottom-space
+            :label="`${'คำสั่งโดย'}`"
+            map-options
+            option-label="name"
+            :options="byOrderOption"
+            option-value="id"
+            use-input
+            input-debounce="0"
+            @update:model-value="(nameCommand = ''), (positionCommand = '')"
+          />
+        </div>
         <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="
-            typeOrder.commandCode === 'C-PM-01' ||
-            typeOrder.commandCode === 'C-PM-02' ||
-            typeOrder.commandCode === 'C-PM-03' ||
-            typeOrder.commandCode === 'C-PM-04'
-          "
+          class="col-xs-12 col-md-6"
+          v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
         >
-          <div class="col-xs-12 col-md-12">
-            <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="examRound"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกรอบการสอบ'}`]"
-              hide-bottom-space
-              :label="`${'รอบการสอบ'}`"
-              emit-value
-              map-options
-              option-label="examRoundName"
-              :options="examRoundOption"
-              option-value="examRoundValue"
-              use-input
-              input-debounce="0"
-            />
-          </div>
+          <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="nameCommand"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกผู้มีอำนาจลงนาม'}`]"
+            hide-bottom-space
+            :label="`${'ผู้มีอำนาจลงนาม'}`"
+            map-options
+            option-label="name"
+            :options="CommandOption"
+            option-value="id"
+            use-input
+            input-debounce="0"
+          >
+            <template v-if="CommandOption.length === 0" v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-primary">
+                  กรุณาเลือกคำสั่งโดยก่อน
+                </q-item-section>
+              </q-item>
+            </template>
+          </selector>
 
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionRegisterNo"
-              :rules="[
-                (val) =>
-                  !!val ||
-                  `${'กรุณากรอกมติ กก. ครั้งที่ (เรื่อง รับสมัครสอบฯ)'}`,
-              ]"
-              :label="`${'มติ กก. ครั้งที่ (เรื่อง รับสมัครสอบฯ)'}`"
-              hide-bottom-space
-            />
+          <!-- <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="nameCommand"
+            :rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
+            :label="`${'ผู้มีอำนาจลงนาม'}`"
+            hide-bottom-space
+          /> -->
+        </div>
+        <div
+          class="col-xs-12 col-md-6"
+          v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
+        >
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="positionCommand"
+            :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
+            :label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
+            hide-bottom-space
+            disable
+          />
+        </div>
+        <div
+          class="col-xs-12 col-md-6"
+          v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
+        >
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="nameCommand"
+            :rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
+            :label="`${'ผู้มีอำนาจลงนาม'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div
+          class="col-xs-12 col-md-6"
+          v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
+        >
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="positionCommand"
+            :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
+            :label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-12 q-mb-md" v-if="typeOrder.commandCode">
+          <q-separator />
+        </div>
+      </div>
 
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionRegisterNo"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกมติ กก. ครั้งที่ (เรื่อง รับสมัครสอบฯ)'}`]"
-              hide-bottom-space :label="`${'มติ กก. ครั้งที่ (เรื่อง รับสมัครสอบฯ)'}`" emit-value map-options
-              option-label="name" :options="registerOption" option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionRegisterDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionRegisterDate != null
-                      ? date2Thai(conclusionRegisterDate)
-                      : 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>
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionResultNo"
-              :rules="[
-                (val) =>
-                  !!val || `${'กรุณากรอกมติ กก. ครั้งที่ (เรื่อง ผลการสอบฯ)'}`,
-              ]"
-              :label="`${'มติ กก. ครั้งที่ (เรื่อง ผลการสอบฯ)'}`"
-              hide-bottom-space
-            />
-
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionResultNo"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกมติ กก. ครั้งที่ (เรื่อง ผลการสอบแข่งขัน)'}`]"
-              hide-bottom-space :label="`${'มติ กก. ครั้งที่ (เรื่อง ผลการสอบแข่งขัน)'}`" emit-value map-options
-              option-label="name" :options="announceOption" option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionResultDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionResultDate != null
-                      ? date2Thai(conclusionResultDate)
-                      : 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>
-          </div>
+      <!-- C-PM-01-04 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="
+          typeOrder.commandCode === 'C-PM-01' ||
+          typeOrder.commandCode === 'C-PM-02' ||
+          typeOrder.commandCode === 'C-PM-03' ||
+          typeOrder.commandCode === 'C-PM-04'
+        "
+      >
+        <div class="col-xs-12 col-md-12">
+          <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="examRound"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกรอบการสอบ'}`]"
+            hide-bottom-space
+            :label="`${'รอบการสอบ'}`"
+            emit-value
+            map-options
+            option-label="examRoundName"
+            :options="examRoundOption"
+            option-value="examRoundValue"
+            use-input
+            input-debounce="0"
+          />
         </div>
 
-        <!-- C-PM-05-06 -->
-        <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="
-            typeOrder.commandCode === 'C-PM-05' ||
-            typeOrder.commandCode === 'C-PM-06'
-          "
-        >
-          <!-- <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusion1"
-              :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
-              :label="`${'มติ กก. ครั้งที่'}`"
-              hide-bottom-space
-            /> -->
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionRegisterNo"
+            :rules="[
+              (val) =>
+                !!val ||
+                `${'กรุณากรอกมติ กก. ครั้งที่ (เรื่อง รับสมัครสอบฯ)'}`,
+            ]"
+            :label="`${'มติ กก. ครั้งที่ (เรื่อง รับสมัครสอบฯ)'}`"
+            hide-bottom-space
+          />
 
-          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusion1"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกมติ กก. ครั้งที่ '}`]" hide-bottom-space
-              :label="`${'มติ กก. ครั้งที่'}`" emit-value map-options option-label="name" :options="conclusion1Option"
-              option-value="id" use-input input-debounce="0" /> -->
-          <!-- </div> -->
-          <!-- <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionDate1"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionDate1 != null ? date2Thai(conclusionDate1) : 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>
-          </div> -->
-          <!-- <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusion2"
-              :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
-              :label="`${'มติ กก. ครั้งที่'}`"
-              hide-bottom-space
-            /> -->
-
-          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusion2" :rules="[(val: string) => !!val || `${'กรุณาเลือกมติ กก. ครั้งที่ '}`]" hide-bottom-space :label="`${'มติ กก. ครั้งที่ '}`" emit-value map-options option-label="name" :options="conclusion2Option" option-value="id" use-input input-debounce="0" /> -->
-          <!-- </div> -->
-          <!-- <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionDate2"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionDate2 != null ? date2Thai(conclusionDate2) : 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>
-          </div> -->
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="meeting"
-              :rules="[(val) => !!val || `${'กรุณากรอกการประชุม ครั้งที่'}`]"
-              :label="`${'การประชุม ครั้งที่'}`"
-              hide-bottom-space
-            />
-
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="meeting"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกการประชุม ครั้งที่ '}`]" hide-bottom-space
-              :label="`${'การประชุมครั้งที่ '}`" emit-value map-options option-label="name" :options="meetingOption"
-              option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="dateMeeting"
-              :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="full-width datepicker"
-                  :model-value="
-                    dateMeeting != null ? date2Thai(dateMeeting) : 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>
-          </div>
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionRegisterNo"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกมติ กก. ครั้งที่ (เรื่อง รับสมัครสอบฯ)'}`]"
+            hide-bottom-space :label="`${'มติ กก. ครั้งที่ (เรื่อง รับสมัครสอบฯ)'}`" emit-value map-options
+            option-label="name" :options="registerOption" option-value="id" use-input input-debounce="0" /> -->
         </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionRegisterDate"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionRegisterDate != null
+                    ? date2Thai(conclusionRegisterDate)
+                    : 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>
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionResultNo"
+            :rules="[
+              (val) =>
+                !!val || `${'กรุณากรอกมติ กก. ครั้งที่ (เรื่อง ผลการสอบฯ)'}`,
+            ]"
+            :label="`${'มติ กก. ครั้งที่ (เรื่อง ผลการสอบฯ)'}`"
+            hide-bottom-space
+          />
 
-        <!-- C-PM-07 -->
-        <!-- <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="typeOrder.commandCode === 'C-PM-07'"
-        >
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionRelocation1"
-              :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
-              :label="`${'มติ กก. ครั้งที่'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionRelocationDate1"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionRelocationDate1 != null
-                      ? date2Thai(conclusionRelocationDate1)
-                      : 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>
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionRelocation2"
-              :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
-              :label="`${'มติ กก. ครั้งที่'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionRelocationDate2"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionRelocationDate2 != null
-                      ? date2Thai(conclusionRelocationDate2)
-                      : 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>
-          </div>
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionResultNo"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกมติ กก. ครั้งที่ (เรื่อง ผลการสอบแข่งขัน)'}`]"
+            hide-bottom-space :label="`${'มติ กก. ครั้งที่ (เรื่อง ผลการสอบแข่งขัน)'}`" emit-value map-options
+            option-label="name" :options="announceOption" option-value="id" use-input input-debounce="0" /> -->
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionResultDate"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionResultDate != null
+                    ? date2Thai(conclusionResultDate)
+                    : 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>
+        </div>
+      </div>
+
+      <!-- C-PM-05-06 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="
+          typeOrder.commandCode === 'C-PM-05' ||
+          typeOrder.commandCode === 'C-PM-06'
+        "
+      >
+        <!-- <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusion1"
+            :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
+            :label="`${'มติ กก. ครั้งที่'}`"
+            hide-bottom-space
+          /> -->
+
+        <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusion1"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกมติ กก. ครั้งที่ '}`]" hide-bottom-space
+            :label="`${'มติ กก. ครั้งที่'}`" emit-value map-options option-label="name" :options="conclusion1Option"
+            option-value="id" use-input input-debounce="0" /> -->
+        <!-- </div> -->
+        <!-- <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionDate1"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionDate1 != null ? date2Thai(conclusionDate1) : 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>
         </div> -->
+        <!-- <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusion2"
+            :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
+            :label="`${'มติ กก. ครั้งที่'}`"
+            hide-bottom-space
+          /> -->
 
-        <!-- C-PM-08 -->
-        <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="typeOrder.commandCode === 'C-PM-08'"
-        >
-          <!-- <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusion"
-              :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
-              :label="`${'มติ กก. ครั้งที่'}`"
-              hide-bottom-space
-            />
-          </div> -->
-          <!-- <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionDate != null ? date2Thai(conclusionDate) : 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>
-          </div> -->
-          <!-- <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionLeave"
-              :rules="[
-                (val) =>
-                  !!val ||
-                  `${'กรุณากรอกมติ กก. ครั้งที่ (เรื่อง ออกจากราชการ)'}`,
-              ]"
-              :label="`${'มติ กก. ครั้งที่ (เรื่อง ออกจากราชการ)'}`"
-              hide-bottom-space
-            />
-          </div> -->
-          <!-- <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionLeaveDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionLeaveDate != null
-                      ? date2Thai(conclusionLeaveDate)
-                      : 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>
-          </div> -->
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionReturnNo"
-              :rules="[
-                (val) =>
-                  !!val ||
-                  `${'กรุณากรอกมติ กก. ครั้งที่ (เรื่อง กลับเข้าราชการ)'}`,
-              ]"
-              :label="`${'มติ กก. ครั้งที่ (เรื่อง กลับเข้าราชการ)'}`"
-              hide-bottom-space
-            />
+        <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusion2" :rules="[(val: string) => !!val || `${'กรุณาเลือกมติ กก. ครั้งที่ '}`]" hide-bottom-space :label="`${'มติ กก. ครั้งที่ '}`" emit-value map-options option-label="name" :options="conclusion2Option" option-value="id" use-input input-debounce="0" /> -->
+        <!-- </div> -->
+        <!-- <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionDate2"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionDate2 != null ? date2Thai(conclusionDate2) : 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>
+        </div> -->
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="meeting"
+            :rules="[(val) => !!val || `${'กรุณากรอกการประชุม ครั้งที่'}`]"
+            :label="`${'การประชุม ครั้งที่'}`"
+            hide-bottom-space
+          />
 
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionReceive"
-              :rules="[(val: string) => !!val || `${'มติ กก. ครั้งที่ (กลับเข้าราชการ)'}`]" hide-bottom-space
-              :label="`${'มติ กก. ครั้งที่ (กลับเข้าราชการ)'}`" emit-value map-options option-label="name"
-              :options="ReceiveOption" option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionReturnDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionReturnDate != null
-                      ? date2Thai(conclusionReturnDate)
-                      : 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>
-          </div>
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="meeting"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกการประชุม ครั้งที่ '}`]" hide-bottom-space
+            :label="`${'การประชุมครั้งที่ '}`" emit-value map-options option-label="name" :options="meetingOption"
+            option-value="id" use-input input-debounce="0" /> -->
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="dateMeeting"
+            :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="full-width datepicker"
+                :model-value="
+                  dateMeeting != null ? date2Thai(dateMeeting) : 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>
+        </div>
+      </div>
+
+      <!-- C-PM-07 -->
+      <!-- <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="typeOrder.commandCode === 'C-PM-07'"
+      >
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionRelocation1"
+            :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
+            :label="`${'มติ กก. ครั้งที่'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionRelocationDate1"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionRelocationDate1 != null
+                    ? date2Thai(conclusionRelocationDate1)
+                    : 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>
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionRelocation2"
+            :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
+            :label="`${'มติ กก. ครั้งที่'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionRelocationDate2"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionRelocationDate2 != null
+                    ? date2Thai(conclusionRelocationDate2)
+                    : 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>
+        </div>
+      </div> -->
+
+      <!-- C-PM-08 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="typeOrder.commandCode === 'C-PM-08'"
+      >
+        <!-- <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusion"
+            :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
+            :label="`${'มติ กก. ครั้งที่'}`"
+            hide-bottom-space
+          />
+        </div> -->
+        <!-- <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionDate"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionDate != null ? date2Thai(conclusionDate) : 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>
+        </div> -->
+        <!-- <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionLeave"
+            :rules="[
+              (val) =>
+                !!val ||
+                `${'กรุณากรอกมติ กก. ครั้งที่ (เรื่อง ออกจากราชการ)'}`,
+            ]"
+            :label="`${'มติ กก. ครั้งที่ (เรื่อง ออกจากราชการ)'}`"
+            hide-bottom-space
+          />
+        </div> -->
+        <!-- <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionLeaveDate"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionLeaveDate != null
+                    ? date2Thai(conclusionLeaveDate)
+                    : 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>
+        </div> -->
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionReturnNo"
+            :rules="[
+              (val) =>
+                !!val ||
+                `${'กรุณากรอกมติ กก. ครั้งที่ (เรื่อง กลับเข้าราชการ)'}`,
+            ]"
+            :label="`${'มติ กก. ครั้งที่ (เรื่อง กลับเข้าราชการ)'}`"
+            hide-bottom-space
+          />
+
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionReceive"
+            :rules="[(val: string) => !!val || `${'มติ กก. ครั้งที่ (กลับเข้าราชการ)'}`]" hide-bottom-space
+            :label="`${'มติ กก. ครั้งที่ (กลับเข้าราชการ)'}`" emit-value map-options option-label="name"
+            :options="ReceiveOption" option-value="id" use-input input-debounce="0" /> -->
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionReturnDate"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionReturnDate != null
+                    ? date2Thai(conclusionReturnDate)
+                    : 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>
+        </div>
+      </div>
+
+      <!-- C-PM-09 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="typeOrder.commandCode === 'C-PM-09'"
+      >
+        <div class="col-xs-12 col-md-12">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="organizations"
+            :rules="[(val) => !!val || `${'กรุณากกรอกหน่วยงาน'}`]"
+            :label="`${'หน่วยงาน'}`"
+            hide-bottom-space
+          />
+          <!-- <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="organizations"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกหน่วยงาน'}`]"
+            hide-bottom-space
+            :label="`${'ชื่อหน่วยงาน'}`"
+            emit-value
+            map-options
+            option-label="name"
+            :options="organizationsOption"
+            option-value="id"
+            use-input
+            input-debounce="0"
+          /> -->
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="order"
+            :rules="[(val) => !!val || `${'กรุณาเลือกคำสั่งที่'}`]"
+            :label="`${'คำสั่งที่'}`"
+            hide-bottom-space
+          />
+
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="order"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกคำสั่งที่'}`]" hide-bottom-space :label="`${'คำสั่งที่'}`"
+            emit-value map-options option-label="name" :options="orderOption" option-value="id" use-input
+            input-debounce="0" /> -->
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="orderDate"
+            :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="full-width datepicker"
+                :model-value="orderDate != null ? date2Thai(orderDate) : 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>
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <!-- <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="book"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือก หนังสือสำนักงาน ก.พ. ที่ นร'}`]"
+            hide-bottom-space
+            :label="`${'หนังสือสำนักงาน ก.พ. ที่ นร'}`"
+            emit-value
+            map-options
+            option-label="name"
+            :options="bookOption"
+            option-value="id"
+            use-input
+            input-debounce="0"
+          /> -->
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="book"
+            :rules="[
+              (val) => !!val || `${'กรุณากกรอกหนังสือสำนักงาน ก.พ. ที่ นร'}`,
+            ]"
+            :label="`${'หนังสือสำนักงาน ก.พ. ที่ นร'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="bookDate"
+            :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="full-width datepicker"
+                :model-value="bookDate != null ? date2Thai(bookDate) : 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>
+        </div>
+      </div>
+
+      <!-- C-PM-10 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="typeOrder.commandCode === 'C-PM-10'"
+      >
+        <div class="col-xs-12 col-md-4">
+          <!-- <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="organizationsOld"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกหน่วยงาน (ต้นทาง)'}`]"
+            hide-bottom-space
+            :label="`${'ชื่อหน่วยงาน (ต้นทาง)'}`"
+            emit-value
+            map-options
+            option-label="name"
+            :options="organizationsOldOption"
+            option-value="id"
+            use-input
+            input-debounce="0"
+          /> -->
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="organizationsOld"
+            :rules="[(val) => !!val || `${'กรุณากรอกหน่วยงาน  (ต้นทาง)'}`]"
+            :label="`${'ชื่อหน่วยงาน (ต้นทาง)'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="orderOld"
+            :rules="[(val) => !!val || `${'กรุณาเลือกคำสั่งที่ (ต้นทาง)'}`]"
+            :label="`${'คำสั่งที่ (ต้นทาง)'}`"
+            hide-bottom-space
+          />
+
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="orderOld"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกคำสั่งที่ (ต้นทาง)'}`]" hide-bottom-space
+            :label="`${'คำสั่งที่ (ต้นทาง)'}`" emit-value map-options option-label="name" :options="orderOldOption"
+            option-value="id" use-input input-debounce="0" /> -->
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="orderOldDate"
+            :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="full-width datepicker"
+                :model-value="
+                  orderOldDate != null ? date2Thai(orderOldDate) : 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>
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="locationname"
+            :rules="[(val) => !!val || `${'กรุณากรอกให้ดำรงตำแหน่ง ณ'}`]"
+            :label="`${'ให้ดำรงตำแหน่ง ณ'}`"
+            hide-bottom-space
+          />
         </div>
 
-        <!-- C-PM-09 -->
-        <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="typeOrder.commandCode === 'C-PM-09'"
-        >
-          <div class="col-xs-12 col-md-12">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="organizations"
-              :rules="[(val) => !!val || `${'กรุณากกรอกหน่วยงาน'}`]"
-              :label="`${'หน่วยงาน'}`"
-              hide-bottom-space
-            />
-            <!-- <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="organizations"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกหน่วยงาน'}`]"
-              hide-bottom-space
-              :label="`${'ชื่อหน่วยงาน'}`"
-              emit-value
-              map-options
-              option-label="name"
-              :options="organizationsOption"
-              option-value="id"
-              use-input
-              input-debounce="0"
-            /> -->
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="order"
-              :rules="[(val) => !!val || `${'กรุณาเลือกคำสั่งที่'}`]"
-              :label="`${'คำสั่งที่'}`"
-              hide-bottom-space
-            />
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="experimentOc"
+            :rules="[
+              (val) =>
+                !!val ||
+                `${'กรุณากรอกหน่วยงานที่ให้ทดลองปฏิบัติหน้าที่ราชการ'}`,
+            ]"
+            :label="`${'หน่วยงานที่ให้ทดลองปฏิบัติหน้าที่ราชการ'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-md-4"></div>
 
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="order"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกคำสั่งที่'}`]" hide-bottom-space :label="`${'คำสั่งที่'}`"
-              emit-value map-options option-label="name" :options="orderOption" option-value="id" use-input
-              input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="orderDate"
-              :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="full-width datepicker"
-                  :model-value="orderDate != null ? date2Thai(orderDate) : 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>
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <!-- <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="book"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือก หนังสือสำนักงาน ก.พ. ที่ นร'}`]"
-              hide-bottom-space
-              :label="`${'หนังสือสำนักงาน ก.พ. ที่ นร'}`"
-              emit-value
-              map-options
-              option-label="name"
-              :options="bookOption"
-              option-value="id"
-              use-input
-              input-debounce="0"
-            /> -->
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="book"
-              :rules="[
-                (val) => !!val || `${'กรุณากกรอกหนังสือสำนักงาน ก.พ. ที่ นร'}`,
-              ]"
-              :label="`${'หนังสือสำนักงาน ก.พ. ที่ นร'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="bookDate"
-              :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="full-width datepicker"
-                  :model-value="bookDate != null ? date2Thai(bookDate) : 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>
-          </div>
+        <div class="col-xs-12 col-md-4">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="experimentformDate"
+            :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="full-width datepicker"
+                :model-value="
+                  experimentformDate != null
+                    ? date2Thai(experimentformDate)
+                    : 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>
         </div>
 
-        <!-- C-PM-10 -->
-        <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="typeOrder.commandCode === 'C-PM-10'"
-        >
-          <div class="col-xs-12 col-md-4">
-            <!-- <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="organizationsOld"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกหน่วยงาน (ต้นทาง)'}`]"
-              hide-bottom-space
-              :label="`${'ชื่อหน่วยงาน (ต้นทาง)'}`"
-              emit-value
-              map-options
-              option-label="name"
-              :options="organizationsOldOption"
-              option-value="id"
-              use-input
-              input-debounce="0"
-            /> -->
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="organizationsOld"
-              :rules="[(val) => !!val || `${'กรุณากรอกหน่วยงาน  (ต้นทาง)'}`]"
-              :label="`${'ชื่อหน่วยงาน (ต้นทาง)'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="orderOld"
-              :rules="[(val) => !!val || `${'กรุณาเลือกคำสั่งที่ (ต้นทาง)'}`]"
-              :label="`${'คำสั่งที่ (ต้นทาง)'}`"
-              hide-bottom-space
-            />
-
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="orderOld"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกคำสั่งที่ (ต้นทาง)'}`]" hide-bottom-space
-              :label="`${'คำสั่งที่ (ต้นทาง)'}`" emit-value map-options option-label="name" :options="orderOldOption"
-              option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="orderOldDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    orderOldDate != null ? date2Thai(orderOldDate) : 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>
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="locationname"
-              :rules="[(val) => !!val || `${'กรุณากรอกให้ดำรงตำแหน่ง ณ'}`]"
-              :label="`${'ให้ดำรงตำแหน่ง ณ'}`"
-              hide-bottom-space
-            />
-          </div>
-
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="experimentOc"
-              :rules="[
-                (val) =>
-                  !!val ||
-                  `${'กรุณากรอกหน่วยงานที่ให้ทดลองปฏิบัติหน้าที่ราชการ'}`,
-              ]"
-              :label="`${'หน่วยงานที่ให้ทดลองปฏิบัติหน้าที่ราชการ'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-md-4"></div>
-
-          <div class="col-xs-12 col-md-4">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="experimentformDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    experimentformDate != null
-                      ? date2Thai(experimentformDate)
-                      : 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>
-          </div>
-
-          <div class="col-xs-12 col-md-4">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="experimenttoDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    experimenttoDate != null
-                      ? date2Thai(experimenttoDate)
-                      : 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>
-          </div>
-          <div class="col-md-4"></div>
-
-          <div class="col-xs-12 col-md-4">
-            <!-- <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="chairman"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกประธาน'}`]"
-              hide-bottom-space
-              :label="`${'ประธาน'}`"
-              emit-value
-              map-options
-              option-label="name"
-              :options="chairmanOption"
-              option-value="id"
-              use-input
-              input-debounce="0"
-            /> -->
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="chairman"
-              :rules="[(val) => !!val || `${'กรุณากรอกชื่อประธาน'}`]"
-              :label="`${'ประธาน'}`"
-              hide-bottom-space
-              @click="openDialog('chairman')"
-            />
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <!-- <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="director"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกกรรมการ'}`]"
-              hide-bottom-space
-              :label="`${'กรรมการ'}`"
-              emit-value
-              map-options
-              option-label="name"
-              :options="directorOption"
-              option-value="id"
-              use-input
-              input-debounce="0"
-            /> -->
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="director"
-              :rules="[(val) => !!val || `${'กรุณากรอกชื่อกรรมการ'}`]"
-              :label="`${'กรรมการ'}`"
-              hide-bottom-space
-              @click="openDialog('director')"
-            />
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <!-- <selector
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="director2"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกกรรมการ'}`]"
-              hide-bottom-space
-              :label="`${'กรรมการ'}`"
-              emit-value
-              map-options
-              option-label="name"
-              :options="director2Option"
-              option-value="id"
-              use-input
-              input-debounce="0"
-            /> -->
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="director2"
-              :rules="[(val) => !!val || `${'กรุณากรอกชื่อกรรมการ'}`]"
-              :label="`${'กรรมการ'}`"
-              hide-bottom-space
-              @click="openDialog('director2')"
-            />
-          </div>
+        <div class="col-xs-12 col-md-4">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="experimenttoDate"
+            :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="full-width datepicker"
+                :model-value="
+                  experimenttoDate != null
+                    ? date2Thai(experimenttoDate)
+                    : 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>
         </div>
+        <div class="col-md-4"></div>
 
-        <!-- C-PM-11 - 12 -->
-        <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="
-            typeOrder.commandCode === 'C-PM-11' ||
-            typeOrder.commandCode === 'C-PM-12'
-          "
-        >
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="committeeOc"
-              :rules="[
-                (val) => !!val || `${'กรุณาเลือกชื่อหน่วยงาน (อนุสนธิคำสั่ง)'}`,
-              ]"
-              :label="`${'ชื่อหน่วยงาน (อนุสนธิคำสั่ง)'}`"
-              hide-bottom-space
-            />
-
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="committeeOc"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกหน่วยงาน (อนุสนธิคำสั่ง)'}`]" hide-bottom-space
-              :label="`${'ชื่อหน่วยงาน (อนุสนธิคำสั่ง)'}`" emit-value map-options option-label="name"
-              :options="committeeOcOption" option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="committeeOrder"
-              :rules="[(val) => !!val || `${'กรุณากรอกอนุสนธิคำสั่งที่'}`]"
-              :label="`${'อนุสนธิคำสั่งที่'}`"
-              hide-bottom-space
-            />
-
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="committeeOrder"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกอนุสนธิคำสั่งที่'}`]" hide-bottom-space
-              :label="`${'อนุสนธิคำสั่งที่'}`" emit-value map-options option-label="name" :options="committeeOrderOption"
-              option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="committeeDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    committeeDate != null ? date2Thai(committeeDate) : 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>
-          </div>
+        <div class="col-xs-12 col-md-4">
+          <!-- <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="chairman"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกประธาน'}`]"
+            hide-bottom-space
+            :label="`${'ประธาน'}`"
+            emit-value
+            map-options
+            option-label="name"
+            :options="chairmanOption"
+            option-value="id"
+            use-input
+            input-debounce="0"
+          /> -->
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="chairman"
+            :rules="[(val) => !!val || `${'กรุณากรอกชื่อประธาน'}`]"
+            :label="`${'ประธาน'}`"
+            hide-bottom-space
+            @click="openDialog('chairman')"
+          />
         </div>
-
-        <!-- C-PM-13 -->
-        <div
-          class="row col-6 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="typeOrder.commandCode === 'C-PM-13'"
-        >
-          <div class="col-xs-12 col-md-12">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="receiveOc"
-              :rules="[(val) => !!val || `${'กรุณากรอกหน่วยงาน'}`]"
-              :label="`${'ชื่อหน่วยงาน'}`"
-              hide-bottom-space
-            />
-
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="receiveOc"
-              :rules="[(val: string) => !!val || `${'กรุณาเลือกหน่วยงาน'}`]" hide-bottom-space
-              :label="`${'ชื่อหน่วยงาน'}`" emit-value map-options option-label="name" :options="receiveOcOption"
-              option-value="id" use-input input-debounce="0" /> -->
-          </div>
+        <div class="col-xs-12 col-md-4">
+          <!-- <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="director"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกกรรมการ'}`]"
+            hide-bottom-space
+            :label="`${'กรรมการ'}`"
+            emit-value
+            map-options
+            option-label="name"
+            :options="directorOption"
+            option-value="id"
+            use-input
+            input-debounce="0"
+          /> -->
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="director"
+            :rules="[(val) => !!val || `${'กรุณากรอกชื่อกรรมการ'}`]"
+            :label="`${'กรรมการ'}`"
+            hide-bottom-space
+            @click="openDialog('director')"
+          />
         </div>
+        <div class="col-xs-12 col-md-4">
+          <!-- <selector
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="director2"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกกรรมการ'}`]"
+            hide-bottom-space
+            :label="`${'กรรมการ'}`"
+            emit-value
+            map-options
+            option-label="name"
+            :options="director2Option"
+            option-value="id"
+            use-input
+            input-debounce="0"
+          /> -->
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="director2"
+            :rules="[(val) => !!val || `${'กรุณากรอกชื่อกรรมการ'}`]"
+            :label="`${'กรรมการ'}`"
+            hide-bottom-space
+            @click="openDialog('director2')"
+          />
+        </div>
+      </div>
 
-        <!-- C-PM-14 -->
-        <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="typeOrder.commandCode === 'C-PM-14'"
-        >
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="transferOrganizationName"
-              :rules="[(val) => !!val || `${'กรุณากรอกส่วนราชการที่ให้โอน'}`]"
-              :label="`${'ส่วนราชการที่ให้โอน'}`"
-              hide-bottom-space
-            />
+      <!-- C-PM-11 - 12 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="
+          typeOrder.commandCode === 'C-PM-11' ||
+          typeOrder.commandCode === 'C-PM-12'
+        "
+      >
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="committeeOc"
+            :rules="[
+              (val) => !!val || `${'กรุณาเลือกชื่อหน่วยงาน (อนุสนธิคำสั่ง)'}`,
+            ]"
+            :label="`${'ชื่อหน่วยงาน (อนุสนธิคำสั่ง)'}`"
+            hide-bottom-space
+          />
 
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionReceive"
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="committeeOc"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกหน่วยงาน (อนุสนธิคำสั่ง)'}`]" hide-bottom-space
+            :label="`${'ชื่อหน่วยงาน (อนุสนธิคำสั่ง)'}`" emit-value map-options option-label="name"
+            :options="committeeOcOption" option-value="id" use-input input-debounce="0" /> -->
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="committeeOrder"
+            :rules="[(val) => !!val || `${'กรุณากรอกอนุสนธิคำสั่งที่'}`]"
+            :label="`${'อนุสนธิคำสั่งที่'}`"
+            hide-bottom-space
+          />
+
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="committeeOrder"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกอนุสนธิคำสั่งที่'}`]" hide-bottom-space
+            :label="`${'อนุสนธิคำสั่งที่'}`" emit-value map-options option-label="name" :options="committeeOrderOption"
+            option-value="id" use-input input-debounce="0" /> -->
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="committeeDate"
+            :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="full-width datepicker"
+                :model-value="
+                  committeeDate != null ? date2Thai(committeeDate) : 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>
+        </div>
+      </div>
+
+      <!-- C-PM-13 -->
+      <div
+        class="row col-6 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="typeOrder.commandCode === 'C-PM-13'"
+      >
+        <div class="col-xs-12 col-md-12">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="receiveOc"
+            :rules="[(val) => !!val || `${'กรุณากรอกหน่วยงาน'}`]"
+            :label="`${'ชื่อหน่วยงาน'}`"
+            hide-bottom-space
+          />
+
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="receiveOc"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือกหน่วยงาน'}`]" hide-bottom-space
+            :label="`${'ชื่อหน่วยงาน'}`" emit-value map-options option-label="name" :options="receiveOcOption"
+            option-value="id" use-input input-debounce="0" /> -->
+        </div>
+      </div>
+
+      <!-- C-PM-14 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="typeOrder.commandCode === 'C-PM-14'"
+      >
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="transferOrganizationName"
+            :rules="[(val) => !!val || `${'กรุณากรอกส่วนราชการที่ให้โอน'}`]"
+            :label="`${'ส่วนราชการที่ให้โอน'}`"
+            hide-bottom-space
+          />
+
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionReceive"
+          :rules="[(val: string) => !!val || `${'มติ กก. ครั้งที่ '}`]" hide-bottom-space
+          :label="`${'มติ กก. ครั้งที่ '}`" emit-value map-options option-label="name" :options="ReceiveOption"
+          option-value="id" use-input input-debounce="0" /> -->
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionReceive"
+            :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
+            :label="`${'มติ กก. ครั้งที่'}`"
+            hide-bottom-space
+          />
+
+          <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionReceive"
             :rules="[(val: string) => !!val || `${'มติ กก. ครั้งที่ '}`]" hide-bottom-space
             :label="`${'มติ กก. ครั้งที่ '}`" emit-value map-options option-label="name" :options="ReceiveOption"
             option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionReceive"
-              :rules="[(val) => !!val || `${'กรุณากรอกมติ กก. ครั้งที่'}`]"
-              :label="`${'มติ กก. ครั้งที่'}`"
-              hide-bottom-space
-            />
-
-            <!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="conclusionReceive"
-              :rules="[(val: string) => !!val || `${'มติ กก. ครั้งที่ '}`]" hide-bottom-space
-              :label="`${'มติ กก. ครั้งที่ '}`" emit-value map-options option-label="name" :options="ReceiveOption"
-              option-value="id" use-input input-debounce="0" /> -->
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionReceiveDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionReceiveDate != null
-                      ? date2Thai(conclusionReceiveDate)
-                      : 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>
-          </div>
         </div>
-
-        <!-- C-PM-16 -->
-        <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="typeOrder.commandCode === 'C-PM-16'"
-        >
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="orderNumber"
-              :rules="[
-                (val) => !!val || `${'กรุณากรอกคำสั่งให้ช่วยราชการเลขที่'}`,
-              ]"
-              :label="`${'คำสั่งให้ช่วยราชการเลขที่'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="orderNumberDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    orderNumberDate != null ? date2Thai(orderNumberDate) : 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>
-          </div>
+        <div class="col-xs-12 col-md-4">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionReceiveDate"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionReceiveDate != null
+                    ? date2Thai(conclusionReceiveDate)
+                    : 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>
         </div>
+      </div>
 
-        <!-- C-PM-18-20 -->
-        <div
-          class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-          v-if="
-            typeOrder.commandCode === 'C-PM-18' ||
-            typeOrder.commandCode === 'C-PM-19' ||
-            typeOrder.commandCode === 'C-PM-20'
-          "
-        >
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="fault"
-              :rules="[
-                (val) => !!val || `${'กรุณากรอกรายละเอียดการกระทำความผิด'}`,
-              ]"
-              :label="`${'ละเอียดการกระทำความผิด'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-xs-12 col-md-6">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="guiltyBasis"
-              :rules="[(val) => !!val || `${'กรุณากรอกฐานความผิด'}`]"
-              :label="`${'ฐานความผิด'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionFireNo"
-              :rules="[
-                (val) =>
-                  !!val ||
-                  `${'กรุณากรอกครั้งที่ (เรื่องการดำเนินการทางวินัย)'}`,
-              ]"
-              :label="`${'ครั้งที่ (เรื่องการดำเนินการทางวินัย)'}`"
-              hide-bottom-space
-            />
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="conclusionFireDate"
-              :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="full-width datepicker"
-                  :model-value="
-                    conclusionFireDate != null
-                      ? date2Thai(conclusionFireDate)
-                      : 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>
-          </div>
-          <div class="col-xs-12 col-md-4">
-            <q-input
-              :class="getClass(true)"
-              outlined
-              dense
-              lazy-rules
-              v-model="conclusionFireResolution"
-              :rules="[
-                (val) =>
-                  !!val ||
-                  `${'กรุณากรอก มติที่ประชุม(เรื่องการดำเนินการทางวินัย)'}`,
-              ]"
-              :label="`${'มติที่ประชุม (เรื่องการดำเนินการทางวินัย)'}`"
-              hide-bottom-space
-            />
-          </div>
+      <!-- C-PM-16 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="typeOrder.commandCode === 'C-PM-16'"
+      >
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="orderNumber"
+            :rules="[
+              (val) => !!val || `${'กรุณากรอกคำสั่งให้ช่วยราชการเลขที่'}`,
+            ]"
+            :label="`${'คำสั่งให้ช่วยราชการเลขที่'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="orderNumberDate"
+            :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="full-width datepicker"
+                :model-value="
+                  orderNumberDate != null ? date2Thai(orderNumberDate) : 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>
+        </div>
+      </div>
+
+      <!-- C-PM-18-20 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="
+          typeOrder.commandCode === 'C-PM-18' ||
+          typeOrder.commandCode === 'C-PM-19' ||
+          typeOrder.commandCode === 'C-PM-20'
+        "
+      >
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="fault"
+            :rules="[
+              (val) => !!val || `${'กรุณากรอกรายละเอียดการกระทำความผิด'}`,
+            ]"
+            :label="`${'รายละเอียดการกระทำความผิด'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-xs-12 col-md-6">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="guiltyBasis"
+            :rules="[(val) => !!val || `${'กรุณากรอกฐานความผิด'}`]"
+            :label="`${'ฐานความผิด'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionFireNo"
+            :rules="[
+              (val) =>
+                !!val ||
+                `${'กรุณากรอกครั้งที่ (เรื่องการดำเนินการทางวินัย)'}`,
+            ]"
+            :label="`${'ครั้งที่ (เรื่องการดำเนินการทางวินัย)'}`"
+            hide-bottom-space
+          />
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionFireDate"
+            :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="full-width datepicker"
+                :model-value="
+                  conclusionFireDate != null
+                    ? date2Thai(conclusionFireDate)
+                    : 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>
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionFireResolution"
+            :rules="[
+              (val) =>
+                !!val ||
+                `${'กรุณากรอก มติที่ประชุม(เรื่องการดำเนินการทางวินัย)'}`,
+            ]"
+            :label="`${'มติที่ประชุม (เรื่องการดำเนินการทางวินัย)'}`"
+            hide-bottom-space
+          />
         </div>
       </div>
     </q-form>
@@ -2579,4 +2578,4 @@ const getClass = (val: boolean) => {
     top: 0;
   }
 }
-</style>
+</style>
\ No newline at end of file

From 477b8e999cee9937f2d0263dc7fb96caeb20e118 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 13 Sep 2023 17:03:17 +0700
Subject: [PATCH 09/10] =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=81=E0=B9=89=20va?=
 =?UTF-8?q?lidate=20=E0=B9=80=E0=B9=80=E0=B8=A5=E0=B9=89=E0=B8=A7=20input?=
 =?UTF-8?q?=20=E0=B8=A5=E0=B8=AD=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Proposals/addProposals.vue   | 24 +++++++++++--------
 .../components/3_result/DialogForm.vue        |  2 +-
 .../components/4_Allocate/DialogForm.vue      | 23 ++++++++++++++----
 .../08_registryEmployee/views/Assessment.vue  |  2 +-
 .../08_registryEmployee/views/Discipline.vue  |  2 +-
 .../08_registryEmployee/views/Education.vue   |  2 +-
 .../views/Information/Address.vue             |  2 +-
 .../views/Information/Certicate.vue           |  2 +-
 .../views/Information/Family.vue              |  2 +-
 .../views/Information/Information.vue         |  2 +-
 .../views/Information/Tempinformation.vue     |  2 +-
 .../08_registryEmployee/views/Leave.vue       |  2 +-
 .../08_registryEmployee/views/Other.vue       |  2 +-
 .../08_registryEmployee/views/Talent.vue      |  2 +-
 .../08_registryEmployee/views/Train.vue       |  2 +-
 .../08_registryEmployee/views/Work.vue        |  2 +-
 .../10_order/components/step/step02.vue       |  2 +-
 17 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/modules/07_insignia/components/1_Proposals/addProposals.vue b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
index 0375d325a..23ebbdd74 100644
--- a/src/modules/07_insignia/components/1_Proposals/addProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
@@ -15,6 +15,7 @@ const {
   hideLoader,
   dialogConfirm,
   success,
+  dialogMessageNotify
 } = mixin;
 const router = useRouter();
 const route = useRoute();
@@ -106,22 +107,25 @@ const editData = async (id: string) => {
   console.log(formData);
 };
 const checkSave = () => {
-  dialogConfirm($q, () => SaveData());
-};
-const SaveData = async () => {
   if (myForm.value !== null) {
     myForm.value.validate().then(async (success) => {
       if (success) {
-        if (edit.value) {
-          await editData(id.value);
-        } else {
-          await addData();
-          clickBack();
-        }
+        dialogConfirm($q, () => SaveData());
+      }else {
+        dialogMessageNotify($q,"กรุณาเลือกรอบการเสนอขอพระราชทานเครื่องราชฯ")
       }
-    });
+    })
   }
 };
+const SaveData = async () => {
+  if (edit.value) {
+    await editData(id.value);
+  } else {
+    await addData();
+    clickBack();
+  }
+};
+
 const updateDateRange = () => {
   if (roundInsig.value.value == 1) {
     dateStart.value = new Date(new Date().getFullYear(), 9, 1);
diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue
index e5b50659c..2b847d30c 100644
--- a/src/modules/07_insignia/components/3_result/DialogForm.vue
+++ b/src/modules/07_insignia/components/3_result/DialogForm.vue
@@ -278,7 +278,7 @@ const searchcardid = () => {
       <q-form ref="myForm">
         <div class="q-pa-md">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-4">
               <q-select
diff --git a/src/modules/07_insignia/components/4_Allocate/DialogForm.vue b/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
index f5a54922e..a222c1fec 100644
--- a/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
+++ b/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
@@ -5,9 +5,9 @@ import { useCounterMixin } from "@/stores/mixin";
 
 import { useRouter } from "vue-router";
 const $q = useQuasar();
-const myForm = ref<QForm>();
+const myForm = ref<QForm | null>(null); //form data input
 const mixin = useCounterMixin();
-const { dialogConfirm } = mixin;
+const { dialogConfirm,dialogMessageNotify } = mixin;
 const router = useRouter();
 const routeName = router.currentRoute.value.name;
 const amount = ref<number | null>();
@@ -42,8 +42,18 @@ watch(props, () => {
 });
 
 const clickSave = () => {
-  dialogConfirm($q, () => props.save(grandCross.value, amount.value));
+  if (myForm.value !== null) {
+    myForm.value.validate().then(async (success) => {
+      if (success) {
+        dialogConfirm($q, () => props.save(grandCross.value, amount.value));
+      }else {
+        dialogMessageNotify($q,"กรุณาข้อมูลให้ครบ")
+      }
+    })
+  }
 };
+
+
 </script>
 
 <template>
@@ -65,7 +75,7 @@ const clickSave = () => {
       <q-form ref="myForm">
         <div class="q-pa-md">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-6">
               <q-select
@@ -79,6 +89,7 @@ const clickSave = () => {
                 map-options
                 outlined
                 options-cover
+                :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`,]"
                 v-model="grandCross"
                 :label="
                   routeName == 'insigniaAllocate'
@@ -86,6 +97,7 @@ const clickSave = () => {
                     : `เลือกหน่วยงาน`
                 "
               />
+
             </div>
             <div class="col-xs-12 col-sm-6">
               <q-input
@@ -97,6 +109,7 @@ const clickSave = () => {
                 lazy-rules
                 type="number"
                 label="จำนวน"
+                :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`,]"
               />
               <!-- :rules="[(val:any) =>val.length != 13 ||`${'กรุณากรอกเลขบัตรประจำตัวประชาชนให้ครบ'}`,]" -->
             </div>
@@ -107,7 +120,7 @@ const clickSave = () => {
       <q-separator />
       <div class="row justify-end q-py-sm">
         <div class="q-px-md">
-          <q-btn label="บันทึก" @click="clickSave" color="public" />
+          <q-btn label="บันทึก" @click="clickSave" color="public" :disable="grandCross == '' || amount == null || amount == 0" />
         </div>
       </div>
     </q-card>
diff --git a/src/modules/08_registryEmployee/views/Assessment.vue b/src/modules/08_registryEmployee/views/Assessment.vue
index 2ff696e02..2138234a4 100644
--- a/src/modules/08_registryEmployee/views/Assessment.vue
+++ b/src/modules/08_registryEmployee/views/Assessment.vue
@@ -61,7 +61,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-12 col-sm-12 col-md-12">
               <datepicker
diff --git a/src/modules/08_registryEmployee/views/Discipline.vue b/src/modules/08_registryEmployee/views/Discipline.vue
index d7a66f07a..8a3b73abc 100644
--- a/src/modules/08_registryEmployee/views/Discipline.vue
+++ b/src/modules/08_registryEmployee/views/Discipline.vue
@@ -57,7 +57,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
diff --git a/src/modules/08_registryEmployee/views/Education.vue b/src/modules/08_registryEmployee/views/Education.vue
index 794af7613..422e5b65a 100644
--- a/src/modules/08_registryEmployee/views/Education.vue
+++ b/src/modules/08_registryEmployee/views/Education.vue
@@ -71,7 +71,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <selector
diff --git a/src/modules/08_registryEmployee/views/Information/Address.vue b/src/modules/08_registryEmployee/views/Information/Address.vue
index fe29239b4..849102d3e 100644
--- a/src/modules/08_registryEmployee/views/Information/Address.vue
+++ b/src/modules/08_registryEmployee/views/Information/Address.vue
@@ -13,7 +13,7 @@
       :addEmployee="statusAdd()"
     />
     <q-form ref="myform">
-      <div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
+      <div class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs">
         <div class="col-xs-12">
           <q-input
             :class="getClass(edit)"
diff --git a/src/modules/08_registryEmployee/views/Information/Certicate.vue b/src/modules/08_registryEmployee/views/Information/Certicate.vue
index 857977ac8..aad106778 100644
--- a/src/modules/08_registryEmployee/views/Information/Certicate.vue
+++ b/src/modules/08_registryEmployee/views/Information/Certicate.vue
@@ -68,7 +68,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
diff --git a/src/modules/08_registryEmployee/views/Information/Family.vue b/src/modules/08_registryEmployee/views/Information/Family.vue
index edda7a750..1713778ab 100644
--- a/src/modules/08_registryEmployee/views/Information/Family.vue
+++ b/src/modules/08_registryEmployee/views/Information/Family.vue
@@ -13,7 +13,7 @@
       :addEmployee="statusAdd()"
     />
     <q-form ref="myform" class="col-12">
-      <div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
+      <div class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs">
         <div class="col-12 row q-pb-sm q-pt-md">
           <div class="col-xs-2 col-sm-1 text-weight-bold">• บิดา</div>
           <div class="q-gutter-sm">
diff --git a/src/modules/08_registryEmployee/views/Information/Information.vue b/src/modules/08_registryEmployee/views/Information/Information.vue
index 795814635..42718f1e8 100644
--- a/src/modules/08_registryEmployee/views/Information/Information.vue
+++ b/src/modules/08_registryEmployee/views/Information/Information.vue
@@ -13,7 +13,7 @@
       :addEmployee="statusAdd()"
     />
     <q-form ref="myform" class="col-12">
-      <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
+      <div class="row col-12  q-col-gutter-x-sm q-col-gutter-y-sm">
         <div class="col-xs-6 col-sm-3 col-md-3">
           <q-input
             :class="getClass(edit)"
diff --git a/src/modules/08_registryEmployee/views/Information/Tempinformation.vue b/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
index e060d1ec4..0f1287a68 100644
--- a/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
+++ b/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
@@ -12,7 +12,7 @@
       :history="!statusAdd()"
     />
     <q-form ref="myform">
-      <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
+      <div class="row col-12  q-col-gutter-x-sm q-col-gutter-y-sm">
         <div class="col-xs-6 col-sm-3 col-md-3">
           <selector
             :class="getClass(edit)"
diff --git a/src/modules/08_registryEmployee/views/Leave.vue b/src/modules/08_registryEmployee/views/Leave.vue
index 6608958f3..b26655003 100644
--- a/src/modules/08_registryEmployee/views/Leave.vue
+++ b/src/modules/08_registryEmployee/views/Leave.vue
@@ -81,7 +81,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <selector
diff --git a/src/modules/08_registryEmployee/views/Other.vue b/src/modules/08_registryEmployee/views/Other.vue
index 977265bec..1384c0696 100644
--- a/src/modules/08_registryEmployee/views/Other.vue
+++ b/src/modules/08_registryEmployee/views/Other.vue
@@ -54,7 +54,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
diff --git a/src/modules/08_registryEmployee/views/Talent.vue b/src/modules/08_registryEmployee/views/Talent.vue
index a3d4d6b4a..b1842ab4b 100644
--- a/src/modules/08_registryEmployee/views/Talent.vue
+++ b/src/modules/08_registryEmployee/views/Talent.vue
@@ -51,7 +51,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-6">
               <q-input
diff --git a/src/modules/08_registryEmployee/views/Train.vue b/src/modules/08_registryEmployee/views/Train.vue
index d06149fde..3c90eb592 100644
--- a/src/modules/08_registryEmployee/views/Train.vue
+++ b/src/modules/08_registryEmployee/views/Train.vue
@@ -64,7 +64,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
diff --git a/src/modules/08_registryEmployee/views/Work.vue b/src/modules/08_registryEmployee/views/Work.vue
index 91e579e91..99317723d 100644
--- a/src/modules/08_registryEmployee/views/Work.vue
+++ b/src/modules/08_registryEmployee/views/Work.vue
@@ -61,7 +61,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue
index 496544e2c..09c0ea800 100644
--- a/src/modules/10_order/components/step/step02.vue
+++ b/src/modules/10_order/components/step/step02.vue
@@ -617,7 +617,7 @@ const getClass = (val: boolean) => {
         <q-card-section class="q-pa-sm bg-grey-1">
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-12">
-              <div class="col-12 row q-py-sm items-center q-col-gutter-sm">
+              <div class="col-12 row q-py-sm q-col-gutter-sm">
                 <div class="col-xs-6 col-sm-6 col-md-6">
                   <CurruncyInput
                     :edit="true"

From e51736838affa4f3080d0badebb976131957e978 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 13 Sep 2023 17:18:45 +0700
Subject: [PATCH 10/10] =?UTF-8?q?input=20=E0=B8=A5=E0=B8=AD=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registry/components/Information/OldName.vue   | 2 +-
 src/modules/08_registryEmployee/views/Information/Family.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/04_registry/components/Information/OldName.vue b/src/modules/04_registry/components/Information/OldName.vue
index deb13353a..d34e79d24 100644
--- a/src/modules/04_registry/components/Information/OldName.vue
+++ b/src/modules/04_registry/components/Information/OldName.vue
@@ -69,7 +69,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <selector
diff --git a/src/modules/08_registryEmployee/views/Information/Family.vue b/src/modules/08_registryEmployee/views/Information/Family.vue
index 1713778ab..56f90b37a 100644
--- a/src/modules/08_registryEmployee/views/Information/Family.vue
+++ b/src/modules/08_registryEmployee/views/Information/Family.vue
@@ -409,7 +409,7 @@
         </div>
 
         <div
-          class="row col-12 items-center q-col-gutter-xs"
+          class="row col-12  q-col-gutter-xs"
           v-for="(items, index) in familyData.childrens"
           :key="index"
         >