fix: แก้ไขวันที่ประกาศแยกกับอัปโหลดเอกสารประกาศ

src/modules/06_retirement/components/01_retirement/RetirementDetail.vue

@@ -37,6 +37,7 @@ const {
 const myForm = ref<QForm | null>(null);
 
 /** ตัวแปร  */
+const isUploadFile = ref<boolean>(false);
 const linkFile = ref<string>("");
 const modal = ref<boolean>(false);
 const retireld_params = route.params.retirementId;
@@ -48,7 +49,7 @@ const note = ref<string>("");
 const retireProfileId = ref<string>("");
 const profileId = ref<string>("");
 const filter = ref<string>("");
-const statusUpload = ref<boolean>();
+const statusUpload = ref<boolean>(false);
 const modalEdit = ref<boolean>(false);
 const textReport = ref<string>("");
 const employeeType = ref<string>("OFFICER");
@@ -168,6 +169,7 @@ async function fetchlistprofile(id: string) {
       textReport.value = data.detail;
       employeeType.value = data.type;
       linkFile.value = data.file;
+      isSignDate.value = data.signDate ? true : false;
 
       // รายชื่อผู้เกษียณอายุราชการ
 
@@ -222,12 +224,13 @@ async function fetchlistprofile(id: string) {
 async function fecthCheck(id: string) {
   await http
     .get(config.API.checkfileupload(id))
-    .then((res) => {
+    .then(async (res) => {
       statusUpload.value = res.data.result;
     })
-    .catch((err) => {
+    .catch((e) => {
-      messageError($q, err);
+      messageError($q, e);
-    });
+    })
+    .finally(() => {});
 }
 
 // DelProfile
@@ -308,7 +311,8 @@ const visibleNote = computed(() => {
 // อัปโหลดไฟล์
 const modalUpload = ref<boolean>(false);
 const signDate = ref<Date | null>(null);
-async function uploadFile(event: any, signDate: any) {
+const isSignDate = ref<boolean>(false);
+async function uploadFile(event: any, date: any) {
   if (myForm.value !== null) {
     myForm.value.validate().then((successmyForm) => {
       if (successmyForm) {
@@ -318,9 +322,12 @@ async function uploadFile(event: any, signDate: any) {
             showLoader();
             const selectedFile = event;
             const formdata = new FormData();
-            formdata.append("file", selectedFile);
+            if (isUploadFile.value) {
-            if (signDate != null)
+              formdata.append("file", selectedFile);
-              formdata.append("signDate", dateToISO(signDate));
+            }
+            if (isUploadFile.value !== true && signDate != null) {
+              formdata.append("signDate", dateToISO(date));
+            }
             await http
               .put(
                 config.API.fileRetirement(retireld.value.toString()),
@@ -469,10 +476,13 @@ onMounted(async () => {
         <div class="row">
           <q-btn
             v-if="
-              !checkRoutePermisson &&
+              (!checkRoutePermisson &&
-              !statusReport &&
+                !statusReport &&
-              (typeReport == 'ADD' || typeReport == '' || typeReport == null) &&
+                (typeReport == 'ADD' ||
-              !statusUpload
+                  typeReport == '' ||
+                  typeReport == null) &&
+                !statusUpload) ||
+              !isSignDate
             "
             flat
             round
@@ -483,7 +493,7 @@ onMounted(async () => {
             <q-tooltip>เพิ่มรายชื่อ</q-tooltip></q-btn
           >
           <q-btn
-            v-if="statusUpload"
+            v-if="statusUpload && isSignDate"
             outline
             color="primary"
             @click="downloadFile(linkFile)"
@@ -494,7 +504,7 @@ onMounted(async () => {
             flat
             round
             icon="mdi-dots-vertical"
-            v-if="!statusUpload"
+            v-if="!statusUpload || !isSignDate"
           >
             <q-menu>
               <q-list style="min-width: 100px">
@@ -503,7 +513,28 @@ onMounted(async () => {
                   v-close-popup
                   type="a"
                   @click="
-                    (modalUpload = true), (signDate = null), (fileUpload = null)
+                    (modalUpload = true),
+                      (signDate = null),
+                      (fileUpload = null),
+                      (isUploadFile = false)
+                  "
+                  target="_blank"
+                  v-if="!isSignDate && !checkRoutePermisson"
+                >
+                  <q-item-section avatar
+                    ><q-icon color="primary" name="event"
+                  /></q-item-section>
+                  <q-item-section>แก้ไขวันที่ประกาศ </q-item-section>
+                </q-item>
+                <q-item
+                  clickable
+                  v-close-popup
+                  type="a"
+                  @click="
+                    (modalUpload = true),
+                      (signDate = null),
+                      (fileUpload = null),
+                      (isUploadFile = true)
                   "
                   target="_blank"
                   v-if="!statusUpload && !checkRoutePermisson"
@@ -796,12 +827,15 @@ onMounted(async () => {
   <!-- อัปโหลดไฟล์ -->
   <q-dialog v-model="modalUpload" persistent>
     <q-card style="width: 50vw">
-      <DialogHeader tittle="อัปโหลดเอกสาร" :close="closeDialog" />
+      <DialogHeader
+        :tittle="isUploadFile ? 'อัปโหลดเอกสาร' : 'แก้ไขวันที่ประกาศ'"
+        :close="closeDialog"
+      />
       <q-separator />
       <q-card-section>
         <q-form ref="myForm">
           <div class="row q-gutter-md">
-            <div class="col-12 q-pr-md">
+            <div v-if="isUploadFile" class="col-12 q-pr-md">
               <q-file
                 hide-bottom-space
                 bg-color="white"
@@ -820,7 +854,7 @@ onMounted(async () => {
                 </template>
               </q-file>
             </div>
-            <div class="col-12 q-pr-md">
+            <div v-else class="col-12 q-pr-md">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="signDate"