fix === > แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย ทุกระบบ

src/modules/06_retirement/components/resign/ResignReject.vue

@@ -1,24 +1,17 @@
 <script setup lang="ts">
 import { ref, onMounted, computed } from "vue";
-import axios from "axios";
+
 import { useRouter, useRoute } from "vue-router";
 import { useQuasar, QForm } from "quasar";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
-import genReport from "@/plugins/genreport";
+
 import { useCounterMixin } from "@/stores/mixin";
 import DialogHeader from "@/components/DialogHeader.vue";
 
-import type {
-  TypeFile,
-  rowFile,
-  FileList,
-} from "@/modules/06_retirement/interface/response/Main";
-import type { QTableProps } from "quasar";
 import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
 
-import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
 import CardProfile from "@/components/CardProfile.vue";
 import WorkFlow from "@/components/Workflow/Main.vue";
 
@@ -34,9 +27,7 @@ const {
   showLoader,
   hideLoader,
   success,
-
   dialogConfirm,
-  dialogRemove,
 } = mixin;
 
 /** ตัวแปร */
@@ -196,8 +187,24 @@ function onSubmit() {
  * กดยกเลิก
  */
 async function clickCancel() {
-  await fetchData(id.value);
   edit.value = false;
+  const data = dataDetail.value;
+  if (data) {
+    organizationPositionOld.value = data.organizationPositionOld ?? "";
+    positionTypeOld.value = data.positionTypeOld ?? "";
+    positionLevelOld.value = data.positionLevelOld ?? "";
+    posNo.value = data.positionNumberOld ?? "";
+    salary.value = data.salary ? data.salary : 0;
+    date.value = data.sendDate ? new Date(data.sendDate) : null;
+    dateLeave.value = data.activeDate ? new Date(data.activeDate) : null;
+    reason.value = data.reason ?? "";
+    location.value = data.location ?? "";
+    status.value = data.status ?? "";
+    remarkHorizontal.value = data.remarkHorizontal ?? "-";
+    isNoDebt.value = data.isNoDebt;
+    isNoBurden.value = data.isNoBurden;
+    isDiscipline.value = data.isDiscipline;
+  }
   myForm.value?.resetValidation();
 }
 
@@ -275,8 +282,8 @@ onMounted(async () => {
         class="q-mr-sm"
         @click="router.push('/retirement/resign')"
       />
-      รายละเอียดการยกเลิกลาออกของ{{
-        dataDetail.firstName + "  " + dataDetail.lastName
+      รายละเอียดการยกเลิกลาออก {{
+        dataDetail.prefix+dataDetail.firstName + "  " + dataDetail.lastName
       }}
     </div>
 
@@ -519,6 +526,7 @@ onMounted(async () => {
     <!-- แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย -->
     <q-card bordered class="row col-12 text-dark q-mt-sm">
       <q-form
+        class="col-12"
         ref="myForm"
         greedy
         @submit.prevent
@@ -529,6 +537,7 @@ onMounted(async () => {
             แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
           </div>
           <q-space />
+
           <div v-if="!checkRoutePermisson && workflowRef?.permission.isUpdate">
             <div class="q-gutter-sm" v-if="!edit">
               <q-btn
@@ -693,10 +702,10 @@ onMounted(async () => {
                       dense
                       :borderless="!edit"
                       :model-value="date !== null ? date2Thai(date) : null"
-                      :rules="[
+                      :rules="edit ? [
                       (val:string) =>
                         !!val || `${'กรุณาเลือก วันที่ยื่นขอลาออกจากราชการ'}`,
-                    ]"
+                    ] : []"
                       hide-bottom-space
                       :label="`${' วันที่ยื่นขอลาออกจากราชการ'}`"
                     >