ปรับฟอร์มลา

src/modules/05_leave/views/AddPage.vue

@@ -61,8 +61,10 @@ function onSubmit(postData: FormData) {
   dialogConfirm($q, async () => {
     showLoader();
     await http
-      .put(config.API.leaveUser(), postData)
+      .post(config.API.leaveUser(), postData)
       .then(() => {
+        // router.push(`/leave/edit/${id}`);
+        router.push("/leave");
         success($q, "บันทึกสำเร็จ");
       })
       .catch((e: any) => {
@@ -200,14 +202,14 @@ onMounted(async () => {
                 :on-submit="onSubmit"
               />
               <StudyForm
-                v-if="model === 'LV-008' && modelSpecific === 's0'"
+                v-if="model === 'LV-008' && modelSpecific === 's1'"
                 style="width: 100%"
                 :on-submit="onSubmit"
               />
               <TrainForm
                 v-if="
                   model === 'LV-008' &&
-                  modelSpecific != 's0' &&
+                  modelSpecific != 's1' &&
                   modelSpecific != ''
                 "
                 :on-submit="onSubmit"

src/modules/05_leave/views/EditPage.vue

@@ -115,6 +115,8 @@ async function fetchDataDetail(id: string) {
     .then(async (res) => {
       const data = await res.data.result;
 
+      dataStore.typeId = data.leaveTypeId;
+
       titleName.value = data.fullName ?? "-";
       formData.id = data.id ?? "-";
       formData.leaveTypeName = data.leaveTypeName ?? "-";
@@ -150,7 +152,7 @@ async function fetchDataDetail(id: string) {
         data.wifeDayDateBorn && date2Thai(data.wifeDayDateBorn);
       formData.restDayOldTotal = data.restDayOldTotal ?? "-";
       formData.restDayCurrentTotal = data.restDayCurrentTotal ?? "-";
-      formData.ordainDayStatus = data.ordainDayStatus ? "เคย" : "ไม่เคยบวช";
+      formData.ordainDayStatus = data.ordainDayStatus;
       formData.ordainDayLocationName = data.ordainDayLocationName ?? "-";
       formData.ordainDayLocationAddress = data.ordainDayLocationAddress ?? "-";
       formData.ordainDayLocationNumber = data.ordainDayLocationNumber ?? "-";
@@ -160,9 +162,7 @@ async function fetchDataDetail(id: string) {
         data.ordainDayBuddhistLentName ?? "-";
       formData.ordainDayBuddhistLentAddress =
         data.ordainDayBuddhistLentAddress ?? "-";
-      formData.hajjDayStatus = data.hajjDayStatus
-        ? "เคย"
-        : "ไม่เคยไปประกอบพิธีฮัจญ์";
+      formData.hajjDayStatus = data.hajjDayStatus;
       formData.absentDaySummon = data.absentDaySummon ?? "-";
       formData.absentDayLocation = data.absentDayLocation ?? "-";
       formData.absentDayRegistorDate =
@@ -195,7 +195,6 @@ async function fetchDataDetail(id: string) {
       // checkLeaveType(formData.leaveTypeId, formData.leaveTypeName)
 
       dataStore.fetchProfileOld(data);
-      dataStore.typeId = formData.leaveTypeId;
     })
     .catch((err) => {
       messageError($q, err);
@@ -216,18 +215,14 @@ const modelSpecific = computed(() => {
     (x) => x.id == formData.leaveTypeId
   )?.code;
 
-  if (code == "LV-006" && formData.leaveTypeName == 'ลาอุปสมบท') {
-    return "b0";
-  } else if (code == "LV-006" && formData.leaveTypeName == 'ลาประกอบพิธีฮัจญ์') {
+  if (code == "LV-006" && formData.ordainDayLocationName != "") {
     return "b1";
-  } else if (code == "LV-008" && formData.leaveTypeName == 'ลาไปศึกษาต่อ') {
-    return "s0";
-  } else if (code == "LV-008" && formData.leaveTypeName == 'ลาฝึกอบรม') {
+  } else if (code == "LV-006" && formData.ordainDayLocationName == "") {
+    return "b2";
+  } else if (code == "LV-008" && formData.studyDayTrainingSubject == "") {
     return "s1";
-  } else if (code == "LV-008" && formData.leaveTypeName == 'ลาปฎิบัติการวิจัย') {
+  } else if (code == "LV-008" && formData.studyDayTrainingSubject != "") {
     return "s2";
-  } else if (code == "LV-008" && formData.leaveTypeName == 'ลาดูงาน') {
-    return "s3";
   } else {
     return "";
   }
@@ -237,7 +232,8 @@ function onSubmit(postData: FormData) {
   dialogConfirm($q, async () => {
     showLoader();
     await http
-      .put(config.API.leaveUser() + "/" + formData.id, postData)
+      .post(config.API.leaveUser(), postData)
+      // .put(config.API.leaveUser() + "/" + formData.id, postData)
       .then(() => {
         success($q, "บันทึกสำเร็จ");
       })
@@ -250,6 +246,28 @@ function onSubmit(postData: FormData) {
   });
 }
 
+function onConfirm(id: string) {
+  dialogConfirm(
+    $q,
+    async () => {
+      //     showLoader();
+      //     await http
+      //       .post(config.API.leaveUser() + "/" + id)
+      //       .then(() => {
+      //         success($q, "บันทึกสำเร็จ");
+      //       })
+      //       .catch((e: any) => {
+      //         messageError($q, e);
+      //       })
+      //       .finally(() => {
+      //         hideLoader();
+      //       });
+    },
+    "ยืนยันการยื่นใบลา",
+    "หากยืนยันแล้วจะไม่สามารถกลับมาแก้ไขได้ ต้องการยืนยันการยื่นใบลานี้ใช่หรือไม่"
+  );
+}
+
 /**เมื่อเริ่มโหลดหน้า
  * เรียกใช้งาน fetchData เพื่อดึงข้อมูล
  */
@@ -272,7 +290,10 @@ onMounted(() => {
           color="primary"
           class="q-mr-sm"
         />
-        <div>แก้ไขข้อมูลการ{{ formData.leaveTypeName }} {{ leaveId }}</div>
+        <div>
+          แก้ไขใบลา
+          <!-- {{ formData.leaveTypeName }} {{ leaveId }} -->
+        </div>
       </div>
       <q-form ref="myform" class="col-12">
         <q-card bordered>
@@ -291,8 +312,9 @@ onMounted(() => {
               <div class="q-py-sm q-px-lg">
                 <div class="row">
                   <q-select
+                    readonly
                     dense
-                    class="col-12 col-sm-6 col-md-4 inputgreen"
+                    class="col-12 col-sm-6 col-md-4"
                     outlined
                     v-model="formData.leaveTypeName"
                     option-value="code"
@@ -308,6 +330,7 @@ onMounted(() => {
                     v-if="model === 'LV-006' || model === 'LV-008'"
                   >
                     <q-select
+                      readonly
                       dense
                       outlined
                       v-model="modelSpecific"
@@ -352,67 +375,79 @@ onMounted(() => {
                 v-if="model === 'LV-001' || model === 'LV-002'"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <FormBirth
                 v-if="model === 'LV-003'"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <HelpWifeBirthForm
                 v-if="model === 'LV-004'"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <VacationForm
                 v-if="model === 'LV-005'"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <OrdinationForm
-                v-if="model === 'LV-006' && modelSpecific === 'b0'"
-                :data="formData"
-                :on-submit="onSubmit"
-              />
-              <HajjForm
                 v-if="model === 'LV-006' && modelSpecific === 'b1'"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
+              />
+              <HajjForm
+                v-if="model === 'LV-006' && modelSpecific === 'b2'"
+                :data="formData"
+                :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <MilitaryForm
                 v-if="model === 'LV-007'"
                 style="width: 100%"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <StudyForm
-                v-if="model === 'LV-008' && modelSpecific === 's0'"
+                v-if="model === 'LV-008' && modelSpecific === 's1'"
                 style="width: 100%"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <TrainForm
                 v-if="
                   model === 'LV-008' &&
-                  modelSpecific != 's0' &&
+                  modelSpecific != 's1' &&
                   modelSpecific != ''
                 "
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <WorkInternationalForm
                 v-if="model === 'LV-009'"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <FollowSpouseForm
                 v-if="model === 'LV-010'"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
               <RehabilitationForm
                 v-if="model === 'LV-011'"
                 :data="formData"
                 :on-submit="onSubmit"
+                :on-confirm="onConfirm"
               />
             </div>
           </div>