From 2b67d24b4d8486862150a150268fba093bf67eec Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Mon, 21 Aug 2023 15:05:05 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=20=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C=20=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=89=E0=B8=B2=20tranfer/=E0=B9=80=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=20=20=E0=B9=80=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B8=AD=E0=B8=B1=E0=B8=9E=E0=B9=82=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=94=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C=20?=
 =?UTF-8?q?=E0=B9=83=E0=B8=99=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=20leave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/02_transfer/views/AddTransfer.vue |   9 +-
 src/modules/03_leave/router.ts                |  72 ++--
 src/modules/03_leave/views/AddLeave.vue       | 404 ++++++++----------
 3 files changed, 223 insertions(+), 262 deletions(-)

diff --git a/src/modules/02_transfer/views/AddTransfer.vue b/src/modules/02_transfer/views/AddTransfer.vue
index da7bf8c..ad50df6 100644
--- a/src/modules/02_transfer/views/AddTransfer.vue
+++ b/src/modules/02_transfer/views/AddTransfer.vue
@@ -22,7 +22,7 @@
 										accept=".jpg,.png,.pdf,.csv,.doc"
 										url="http://localhost:4444/upload"
 										label="เอกสารเพิ่มเติม"
-										multiple
+										type="file"
 										@added="fileUploadDoc"
 										style="max-width: px"
 									/>
@@ -336,6 +336,8 @@ const createTransfer = async () => {
 	formData.append("Organization", tranferOrg.value)
 	formData.append("Reason", noteReason.value)
 	formData.append("file", files.value)
+	console.log(files.value)
+
 	console.log(formData)
 	await http
 		.post(config.API.listtransfer(), formData)
@@ -369,7 +371,8 @@ const fecthDataTransfer = async (id: string) => {
 		})
 }
 
-const fileUploadDoc = async (files: any) => {
-	fileDocDataUpload.value.push(files)
+const fileUploadDoc = async (file: any) => {
+	fileDocDataUpload.value.push(file)
+	files.value = file
 }
 </script>
diff --git a/src/modules/03_leave/router.ts b/src/modules/03_leave/router.ts
index 7540b1f..5fc2b1a 100644
--- a/src/modules/03_leave/router.ts
+++ b/src/modules/03_leave/router.ts
@@ -2,36 +2,48 @@
  * Router ขอโอน
  */
 
-const LeaveMain = () => import("@/modules/03_leave/views/Main.vue");
+const LeaveMain = () => import("@/modules/03_leave/views/Main.vue")
 
-const AddLeave = () => import("@/modules/03_leave/views/AddLeave.vue");
+const AddLeave = () => import("@/modules/03_leave/views/AddLeave.vue")
+
+const ResultQuestionair = () => import("@/modules/03_leave/views/result.vue")
 
 export default [
-  {
-    path: "/leave",
-    name: "leave",
-    component: LeaveMain,
-    meta: {
-      Auth: true,
-      Key: [7],
-    },
-  },
-  {
-    path: "/leave/add",
-    name: "AddLeave",
-    component: AddLeave,
-    meta: {
-      Auth: true,
-      Key: [7],
-    },
-  },
-  {
-    path: "/leave/:id",
-    name: "detailLeave",
-    component: AddLeave,
-    meta: {
-      Auth: true,
-      Key: [7],
-    },
-  },
-];
+	{
+		path: "/leave",
+		name: "leave",
+		component: LeaveMain,
+		meta: {
+			Auth: true,
+			Key: [7],
+		},
+	},
+	{
+		path: "/leave/add",
+		name: "AddLeave",
+		component: AddLeave,
+		meta: {
+			Auth: true,
+			Key: [7],
+		},
+	},
+	{
+		path: "/leave/:id",
+		name: "detailLeave",
+		component: AddLeave,
+		meta: {
+			Auth: true,
+			Key: [7],
+		},
+	},
+
+	{
+		path: "/leave/result",
+		name: "resultLeave",
+		component: ResultQuestionair,
+		meta: {
+			Auth: true,
+			Key: [7],
+		},
+	},
+]
diff --git a/src/modules/03_leave/views/AddLeave.vue b/src/modules/03_leave/views/AddLeave.vue
index 8dcc1d5..c801d44 100644
--- a/src/modules/03_leave/views/AddLeave.vue
+++ b/src/modules/03_leave/views/AddLeave.vue
@@ -1,240 +1,186 @@
 <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="saveResing"
-              :disable="tranferOrg == '' && noteReason == ''"
-            />
-          </div>
-        </q-card>
-      </div>
-    </div>
-  </div>
+									<q-separator />
+									<q-separator />
+									<q-uploader
+										class="col-xs-12 col-sm-12"
+										accept=".jpg,.png,.pdf,.csv,.doc"
+										url="http://localhost:4444/upload"
+										label="เอกสารเพิ่มเติม"
+										type="file"
+										@added="fileUploadDoc"
+										style="max-width: px"
+									/>
+								</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, 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";
+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, 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 tranferOrg = ref("");
-const dateCommand = ref<Date>(new Date());
-const dateLeave = ref<Date>(new Date());
-const noteReason = 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 fileDocDataUpload = ref<File[]>([])
+const files = ref<any>()
+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);
-  }
-});
+	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(() => {});
-};
+	$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 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)
+	formData.append("file", files.value)
+	await http
+		.post(config.API.listResign(), formData)
+		.then((res: any) => {
+			// console.log(res);
+			success($q, "บันทึกข้อมูลสำเร็จ")
+			router.push(`/leave/result`)
+		})
+		.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();
-    });
-};
+	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), (files.value = data.file)
+		})
+		.catch((e: any) => {
+			console.log(e)
+			messageError($q, e)
+		})
+		.finally(() => {
+			hideLoader()
+		})
+}
+
+const fileUploadDoc = async (file: any) => {
+	fileDocDataUpload.value.push(file)
+	files.value = file
+}
 </script>

From 8511baf41166ecb253adb15d938cbb650d6ba6e3 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Mon, 21 Aug 2023 15:05:48 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=9F?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B8=A5=E0=B8=B2=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/03_leave/views/result.vue | 85 +++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 src/modules/03_leave/views/result.vue

diff --git a/src/modules/03_leave/views/result.vue b/src/modules/03_leave/views/result.vue
new file mode 100644
index 0000000..dcd7877
--- /dev/null
+++ b/src/modules/03_leave/views/result.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+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 router = useRouter()
+const $q = useQuasar()
+const mixin = useCounterMixin()
+const { date2Thai, dateToISO, success, messageError, showLoader, hideLoader } = mixin
+const leaveReason = ref("")
+const noteReason = ref("")
+const routeName = router.currentRoute.value.name
+
+const saveForm = () => {
+	$q.dialog({
+		title: "ยืนยันข้อมูลแบบสอบถาม",
+		message: "ต้องการส่งข้อมูลแบบสอบถามนี้ใช่หรือไม่?",
+		cancel: {
+			flat: true,
+			color: "negative",
+		},
+		persistent: true,
+	})
+		.onOk(async () => {
+			createResult()
+		})
+		.onCancel(() => {})
+		.onDismiss(() => {})
+}
+
+const createResult = async () => {
+	// const formData = new FormData()
+	// // formData.append("Location", tranferOrg.value)
+	// // formData.append("SendDate", dateToISO(dateCommand.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)
+	// 	})
+	success($q, "บันทึกข้อมูลสำเร็จ")
+	router.push(`/leave`)
+}
+</script>
+
+<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>เราได้รับแบบฟอร์มของคุณแล้ว กรุณาตอบแบบสอบถาม</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-12" dense outlined v-model="leaveReason" label="ทำไมคุณถึงลาออก?" type="textarea" />
+									<q-input class="col-12" dense outlined v-model="noteReason" label="สิ่งที่คุณต้องการจะบอกเรา?" type="textarea" />
+									<q-separator />
+								</div>
+							</q-card>
+						</div>
+					</div>
+					<div class="row col-12 q-pa-sm">
+						<q-space />
+						<q-btn unelevated dense class="q-px-md items-center" color="primary" label="บันทึกข้อมูลแบบสอบถาม" @click="saveForm" />
+					</div>
+				</q-card>
+			</div>
+		</div>
+	</div>
+</template>