From 32d18eec3d28a3177b7b22f405cc69dc524481c2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 9 Aug 2023 12:04:57 +0700
Subject: [PATCH] =?UTF-8?q?API=20=E0=B8=97=E0=B8=B3=E0=B9=80=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=87=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/leave/api.leave.ts              |   3 +
 src/modules/03_leave/views/AddLeave.vue | 341 ++++++++++++++++--------
 src/modules/03_leave/views/Main.vue     |  54 ++--
 3 files changed, 265 insertions(+), 133 deletions(-)

diff --git a/src/api/leave/api.leave.ts b/src/api/leave/api.leave.ts
index ad050cf..5bd9331 100644
--- a/src/api/leave/api.leave.ts
+++ b/src/api/leave/api.leave.ts
@@ -5,6 +5,9 @@ const retirementResign = `${env.API_URI}/retirement`
 
 export default {
     listUser: () => `${retirementResign}/resign/user`,
+    listResign: () => `${retirementResign}/resign`,
+    resingByid: (id: string) => `${retirementResign}/resign/${id}`,
+
 }
 
 
diff --git a/src/modules/03_leave/views/AddLeave.vue b/src/modules/03_leave/views/AddLeave.vue
index d3a421e..8dcc1d5 100644
--- a/src/modules/03_leave/views/AddLeave.vue
+++ b/src/modules/03_leave/views/AddLeave.vue
@@ -1,115 +1,240 @@
 <template>
-	<div class="col-12 row justify-center">
-		<div class="col-xs-12 col-sm-12 col-md-11">
-			<div class="toptitle text-white col-12 row items-center">
-				<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="router.go(-1)" />
-				<div v-if="routeName == 'AddLeave'">เพิ่มเรื่องลาออก</div>
-				<div v-else>รายละเอียดเรื่องลาออก</div>
-			</div>
-			<div class="col-12">
-				<q-card bordered>
-					<div class="col-12 row q-col-gutter-md q-pa-md">
-						<div class="col-xs-12 col-sm-12">
-							<q-card bordered flat>
-								<div class="q-pa-xs bg-grey-2 row items-center q-py-sm q-px-md justify-center text-bold">ลาออก</div>
-								<q-separator />
-								<div class="col-12 row q-pa-sm q-col-gutter-sm">
-									<q-input class="col-8" dense outlined v-model="tranferOrg" label="สถานที่ยื่นขอลาออกจากราชการ" :readonly="routeName != 'AddLeave'" />
-									<datepicker class="col-2" menu-class-name="modalfix" v-model="dateCommand" :locale="'th'" autoApply readonly 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
-												readonly
-												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>
-									<datepicker
-										class="col-2"
-										menu-class-name="modalfix"
-										v-model="dateLeave"
-										:locale="'th'"
-										autoApply
-										borderless
-										:enableTimePicker="false"
-										week-start="0"
-										:readonly="routeName != 'AddLeave'"
-									>
-										<template #year="{ year }">
-											{{ year + 543 }}
-										</template>
-										<template #year-overlay-value="{ value }">
-											{{ parseInt(value + 543) }}
-										</template>
-										<template #trigger>
-											<q-input
-												outlined
-												dense
-												:readonly="routeName != 'AddLeave'"
-												class="full-width datepicker"
-												:model-value="dateLeave != null ? date2Thai(dateLeave) : 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>
-									<q-input class="col-12" dense outlined v-model="noteReason" label="เหตุผลที่ลาออกจากราชการ" type="textarea" :readonly="routeName != 'AddLeave'" />
+  <div class="col-12 row justify-center">
+    <div class="col-xs-12 col-sm-12 col-md-11">
+      <div class="toptitle text-white col-12 row items-center">
+        <q-btn
+          icon="mdi-arrow-left"
+          unelevated
+          round
+          dense
+          flat
+          color="primary"
+          class="q-mr-sm"
+          @click="router.go(-1)"
+        />
+        <div v-if="routeName == 'AddLeave'">เพิ่มเรื่องลาออก</div>
+        <div v-else>รายละเอียดเรื่องลาออก</div>
+      </div>
+      <div class="col-12">
+        <q-card bordered>
+          <div class="col-12 row q-col-gutter-md q-pa-md">
+            <div class="col-xs-12 col-sm-12">
+              <q-card bordered flat>
+                <div
+                  class="q-pa-xs bg-grey-2 row items-center q-py-sm q-px-md justify-center text-bold"
+                >
+                  ลาออก
+                </div>
+                <q-separator />
+                <div class="col-12 row q-pa-sm q-col-gutter-sm">
+                  <q-input
+                    class="col-8"
+                    dense
+                    outlined
+                    v-model="tranferOrg"
+                    label="สถานที่ยื่นขอลาออกจากราชการ"
+                    :readonly="routeName != 'AddLeave'"
+                  />
+                  <datepicker
+                    class="col-2"
+                    menu-class-name="modalfix"
+                    v-model="dateCommand"
+                    :locale="'th'"
+                    autoApply
+                    readonly
+                    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
+                        readonly
+                        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>
+                  <datepicker
+                    class="col-2"
+                    menu-class-name="modalfix"
+                    v-model="dateLeave"
+                    :locale="'th'"
+                    autoApply
+                    borderless
+                    :enableTimePicker="false"
+                    week-start="0"
+                    :readonly="routeName != 'AddLeave'"
+                  >
+                    <template #year="{ year }">
+                      {{ year + 543 }}
+                    </template>
+                    <template #year-overlay-value="{ value }">
+                      {{ parseInt(value + 543) }}
+                    </template>
+                    <template #trigger>
+                      <q-input
+                        outlined
+                        dense
+                        :readonly="routeName != 'AddLeave'"
+                        class="full-width datepicker"
+                        :model-value="
+                          dateLeave != null ? date2Thai(dateLeave) : 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>
+                  <q-input
+                    class="col-12"
+                    dense
+                    outlined
+                    v-model="noteReason"
+                    label="เหตุผลที่ลาออกจากราชการ"
+                    type="textarea"
+                    :readonly="routeName != 'AddLeave'"
+                  />
 
-									<q-separator />
-								</div>
-							</q-card>
-						</div>
-					</div>
-					<div class="row col-12 q-pa-sm" v-if="routeName == 'AddLeave'">
-						<q-space />
-						<q-btn unelevated dense class="q-px-md items-center" color="primary" label="ยื่นเรื่องขอลาออก" @click="router.go(-1)" />
-					</div>
-				</q-card>
-			</div>
-		</div>
-	</div>
+                  <q-separator />
+                </div>
+              </q-card>
+            </div>
+          </div>
+          <div class="row col-12 q-pa-sm" v-if="routeName == 'AddLeave'">
+            <q-space />
+            <q-btn
+              unelevated
+              dense
+              class="q-px-md items-center"
+              color="primary"
+              label="ยื่นเรื่องขอลาออก"
+              @click="saveResing"
+              :disable="tranferOrg == '' && noteReason == ''"
+            />
+          </div>
+        </q-card>
+      </div>
+    </div>
+  </div>
 </template>
 <script setup lang="ts">
-import type { QTableProps } from "quasar"
-import { ref } from "vue"
-import { useQuasar } from "quasar"
-import { useRouter } from "vue-router"
-import { useCounterMixin } from "@/stores/mixin"
+import type { QTableProps } from "quasar";
+import { ref, onMounted } from "vue";
+import { useQuasar } from "quasar";
+import { useRouter, useRoute } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
+import http from "@/plugins/http";
+import config from "@/app.config";
 
-const mixin = useCounterMixin()
-const { date2Thai } = mixin
-const router = useRouter()
-const $q = useQuasar()
-const dateCommand = ref<Date>(new Date())
-const dateLeave = ref<Date>(new Date())
-const file = ref(null)
-const tranferOrg = ref("")
-const noteReason = ref("")
-const noPos = ref("")
-const level = ref("")
-const salary = ref("")
-const positionNew = ref("")
-const salaryNew = ref("")
-const transfer = ref("")
-const note = ref("")
+const mixin = useCounterMixin();
+const { date2Thai, dateToISO, success, messageError, showLoader, hideLoader } =
+  mixin;
+const router = useRouter();
+const route = useRoute();
+const $q = useQuasar();
+const routeName = router.currentRoute.value.name;
+const id = ref<string>("");
 
-const routeName = router.currentRoute.value.name
+const tranferOrg = ref("");
+const dateCommand = ref<Date>(new Date());
+const dateLeave = ref<Date>(new Date());
+const noteReason = ref("");
+
+onMounted(() => {
+  if (route.params.id !== undefined) {
+    id.value = route.params.id.toString();
+    fectDataresign(id.value);
+  }
+});
+const saveResing = () => {
+  $q.dialog({
+    title: "ยืนยันการยื่นข้อมูลลาออก",
+    message: "ต้องการยื่นข้อมูลลาออกนี้ใช่หรือไม่?",
+    cancel: {
+      flat: true,
+      color: "negative",
+    },
+    persistent: true,
+  })
+    .onOk(async () => {
+      createFormresign();
+    })
+    .onCancel(() => {})
+    .onDismiss(() => {});
+};
+const createFormresign = async () => {
+  const formData = new FormData();
+  formData.append("Location", tranferOrg.value);
+  formData.append("SendDate", dateToISO(dateCommand.value));
+  formData.append("ActiveDate", dateToISO(dateLeave.value));
+  formData.append("Reason", noteReason.value);
+  await http
+    .post(config.API.listResign(), formData)
+    .then((res: any) => {
+      // console.log(res);
+      success($q, "บันทึกข้อมูลสำเร็จ");
+      router.push(`/leave`);
+    })
+    .catch((e: any) => {
+      messageError($q, e);
+      console.log(e);
+    });
+};
+const fectDataresign = async (id: string) => {
+  showLoader();
+  await http
+    .get(config.API.resingByid(id))
+    .then((res: any) => {
+      let data = res.data.result;
+      // console.log(data);
+      (tranferOrg.value = data.location),
+        (dateCommand.value = data.sendDate),
+        (dateLeave.value = data.activeDate),
+        (noteReason.value = data.reason);
+    })
+    .catch((e: any) => {
+      console.log(e);
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+};
 </script>
diff --git a/src/modules/03_leave/views/Main.vue b/src/modules/03_leave/views/Main.vue
index d4272f3..7e193fe 100644
--- a/src/modules/03_leave/views/Main.vue
+++ b/src/modules/03_leave/views/Main.vue
@@ -3,6 +3,7 @@ import type { QTableProps } from "quasar";
 import { ref, onMounted } from "vue";
 import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -10,6 +11,9 @@ import Table from "@/components/Table.vue";
 
 const router = useRouter();
 const $q = useQuasar();
+const mixin = useCounterMixin();
+const { date2Thai, dateToISO, success, messageError, showLoader, hideLoader } =
+  mixin;
 
 const filter = ref<string>("");
 const visibleColumns = ref<String[]>([
@@ -66,26 +70,7 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px; width:10%;",
   },
 ]);
-const rows = ref<any>([
-  {
-    placeLeave: "สํานักงานกรุงเทพมหานคร ",
-    dateStartLeave: "02/02/2566",
-    dateLeave: "10/03/2565",
-    status: "รอดำเนินการ",
-  },
-  {
-    placeLeave: "สํานักงานกรุงเทพมหานคร ",
-    dateStartLeave: "02/02/2566",
-    dateLeave: "10/03/2565",
-    status: "เสร็จสิ้น",
-  },
-  {
-    placeLeave: "สํานักงานกรุงเทพมหานคร ",
-    dateStartLeave: "02/02/2566",
-    dateLeave: "10/03/2565",
-    status: "เสร็จสิ้น",
-  },
-]);
+const rows = ref<any>([]);
 const initialPagination = ref({
   rowsPerPage: 0,
 });
@@ -95,9 +80,28 @@ onMounted(() => {
 });
 
 const fectListleave = async () => {
-  // console.log(config.API.listUser());
-
-  await http.get(config.API.listUser()).then((res:any)=>{}).catch((e:any)=>{});
+  showLoader();
+  await http
+    .get(config.API.listUser())
+    .then((res: any) => {
+      // console.log(res);
+      let data = res.data.result;
+      console.log(data);
+      rows.value = data.map((e: any) => ({
+        id: e.id,
+        placeLeave: e.location,
+        dateStartLeave: date2Thai(e.sendDate),
+        dateLeave: date2Thai(e.activeDate),
+        status: e.status,
+      }));
+    })
+    .catch((e: any) => {
+      console.log(e);
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
 };
 
 const clickAdd = async () => {
@@ -139,7 +143,7 @@ const clickAdd = async () => {
               <q-tr
                 :props="props"
                 class="cursor-pointer"
-                @click="router.push(`/leave/1`)"
+                @click="router.push(`/leave/` + props.row.id)"
               >
                 <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <div v-if="col.name == 'no'">
@@ -148,7 +152,7 @@ const clickAdd = async () => {
                   <div v-else-if="col.name == 'status'">
                     <q-icon
                       size="20px"
-                      v-if="props.row.status == 'รอดำเนินการ'"
+                      v-if="props.row.status == 'PENDING'"
                       name="mdi-timer-sand"
                       color="deep-orange"
                     >