From e74bf95d0eae446055d7e4d5d8ea65062af9c4ac Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 18 Aug 2023 17:34:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A5=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=8A=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Repatriate/RepatriatebyId.vue  |  6 +-
 .../helpgovernment/governmentDetail.vue       | 85 +++++++++++++++----
 2 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
index fe939736d..e53d85afa 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
@@ -63,11 +63,11 @@
   <q-card bordered class="row col-12 text-dark q-mt-sm">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-dark">
-        แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
+        แก้ไขข้อมูลเพื่อลงบัญชี
       </div>
       <q-space />
       <div class="q-gutter-sm" v-if="!edit">
-        <q-btn
+        <!-- <q-btn
           outline
           color="primary"
           dense
@@ -76,7 +76,7 @@
           label="แก้ไข"
           style="width: 80px"
           @click="edit = !edit"
-        />
+        /> -->
       </div>
       <div class="q-gutter-sm" v-else>
         <q-btn
diff --git a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
index 7b5a538ae..253f2f775 100644
--- a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
+++ b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
@@ -100,7 +100,7 @@
       </div>
     </div>
     <div class="col-12"><q-separator /></div>
-    <q-form ref="myForm">
+    <q-form ref="myForm " class="window-width">
       <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">
@@ -120,12 +120,12 @@
                 v-model="organizationPositionOld"
                 :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
                 hide-bottom-space
-                :label="`${'ตำแหน่ง/สังกัด'}`"
+                :label="`${'ตำแหน่ง'}`"
                 type="textarea"
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row items-center">
+          <!-- <div class="col-xs-6 col-sm-3 row items-center">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -189,9 +189,9 @@
                 type="number"
               />
             </div>
-          </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-4 row items-center">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -203,16 +203,16 @@
                 v-model="organization"
                 :rules="[(val) => !!val || `${'กรุณากรอกโอนไปสังกัด'}`]"
                 hide-bottom-space
-                :label="`${'โอนไปสังกัด'}`"
+                :label="`${'หน่วยงานที่ให้ช่วยราชการ'}`"
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-4 row items-center">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
                 :readonly="!edit"
-                v-model="date"
+                v-model="dateStart"
                 :locale="'th'"
                 autoApply
                 :enableTimePicker="false"
@@ -227,9 +227,10 @@
                     :class="getClass(edit)"
                     :outlined="edit"
                     dense
+                    :readonly="!edit"
                     lazy-rules
                     :borderless="!edit"
-                    :model-value="date !== null ? date2Thai(date) : null"
+                    :model-value="dateStart !== null ? date2Thai(dateStart) : null"
                     :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
                     hide-bottom-space
                     :label="`${'ตั้งแต่วัน'}`"
@@ -251,6 +252,51 @@
               </datepicker>
             </div>
           </div>
+          <div class="col-xs-6 col-sm-4 row items-center">
+            <div class="col-12">
+              <datepicker
+                menu-class-name="modalfix"
+                :readonly="!edit"
+                v-model="dateEnd"
+                :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
+                  :readonly="!edit"
+                    :class="getClass(edit)"
+                    :outlined="edit"
+                    dense
+                    lazy-rules
+                    :borderless="!edit"
+                    :model-value="dateEnd !== null ? date2Thai(dateEnd) : 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)"
@@ -319,7 +365,8 @@ const createdAt = ref<string>("");
 const organization = ref<string>("");
 const reason = ref<string>("");
 const status = ref<string>("");
-const date = ref<Date | null>(null);
+const dateStart = ref<Date | null>(null);
+const dateEnd = ref<Date | null>(null);
 const salary = ref<string>("");
 const positionTypeOld = ref<string>("");
 const positionLevelOld = ref<string>("");
@@ -389,7 +436,8 @@ const getData = async () => {
       organization.value = data.organization;
       reason.value = data.reason;
       status.value = data.status;
-      date.value = data.date;
+      dateStart.value = data.dateStart;
+      dateEnd.value = data.dateEnd;
       salary.value = data.salary;
       positionTypeOld.value = data.positionTypeOld;
       positionLevelOld.value = data.positionLevelOld;
@@ -412,9 +460,9 @@ const getClass = (val: boolean) => {
 };
 //
 const conditionSave = async () => {
-  if (myForm.value !== null) {
-    myForm.value.validate().then((success: any) => {
-      if (success) {
+  // if (myForm.value !== null) {
+  //   myForm.value.validate().then((success: any) => {
+  //     if (success) {
         dialogConfirm(
           $q,
           async () => await saveData(),
@@ -422,9 +470,9 @@ const conditionSave = async () => {
           "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย"
         );
       }
-    });
-  }
-};
+//     });
+//   }
+// };
 const cancelBtn = () => {
   edit.value = !edit;
   getData();
@@ -434,7 +482,8 @@ const saveData = async () => {
     organization: organization.value,
     reason: reason.value,
     organizationPositionOld: organizationPositionOld.value,
-    date: date.value,
+    dateStart: dateStart.value,
+    dateEnd: dateEnd.value,
     positionTypeOld: positionTypeOld.value,
     positionLevelOld: positionLevelOld.value,
     positionNumberOld: posNo.value,