Merge commit '8511baf411' into develop

# Conflicts:
#	src/modules/02_transfer/views/AddTransfer.vue
#	src/modules/03_leave/views/AddLeave.vue

src/modules/02_transfer/views/AddTransfer.vue

@@ -21,9 +21,7 @@
 										accept=".jpg,.png,.pdf,.csv,.doc"
 										url="http://localhost:4444/upload"
 										label="เอกสารเพิ่มเติม"
-										:color="routeName != 'addTransfer' ? 'grey-8': 'blue'"
+										type="file"
-										multiple
-										:disable="routeName != 'addTransfer'"
 										@added="fileUploadDoc"
 									/>
 								</div>
@@ -336,6 +334,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 +369,8 @@ const fecthDataTransfer = async (id: string) => {
 		})
 }
 
-const fileUploadDoc = async (files: any) => {
+const fileUploadDoc = async (file: any) => {
-	fileDocDataUpload.value.push(files)
+	fileDocDataUpload.value.push(file)
+	files.value = file
 }
 </script>

src/modules/03_leave/router.ts

@@ -2,9 +2,11 @@
  * 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 [
 	{
@@ -34,4 +36,14 @@ export default [
 			Key: [7],
 		},
 	},
-];
+
+	{
+		path: "/leave/result",
+		name: "resultLeave",
+		component: ResultQuestionair,
+		meta: {
+			Auth: true,
+			Key: [7],
+		},
+	},
+]

src/modules/03_leave/views/AddLeave.vue

@@ -2,16 +2,7 @@
 	<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
+				<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="router.go(-1)" />
-          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>
@@ -20,25 +11,8 @@
 					<div class="col-12 row q-col-gutter-md q-pa-md">
 						<div class="col-xs-12 col-sm-12">
               <div class="col-12 row q-pa-sm q-col-gutter-sm">
-                <q-input
+                <q-input class="col-8" dense outlined v-model="tranferOrg" label="สถานที่ยื่นขอลาออกจากราชการ" :readonly="routeName != 'AddLeave'" />
-                  class="col-8"
+                <datepicker class="col-2" menu-class-name="modalfix" v-model="dateCommand" :locale="'th'" autoApply readonly borderless :enableTimePicker="false" week-start="0">
-                  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>
@@ -50,24 +24,14 @@
                       outlined
                       readonly
                       dense
+                      hide-bottom-space
                       class="full-width datepicker"
-                      :model-value="
+                      :model-value="dateCommand != null ? date2Thai(dateCommand) : null"
-                        dateCommand != null ? date2Thai(dateCommand) : null
-                      "
                       :label="`${'วันที่ยื่นขอลาออกจากราชการ'}`"
-                      :rules="[
+                      :rules="[val => !!val || `${'กรุณาเลือกวันที่ยื่นขอลาออกจากราชการ'}`]"
-                        (val) =>
-                          !!val ||
-                          `${'กรุณาเลือกวันที่ยื่นขอลาออกจากราชการ'}`,
-                      ]"
                     >
                       <template v-slot:prepend>
-                        <q-icon
+                        <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
-                          name="event"
-                          class="cursor-pointer"
-                          style="color: var(--q-primary)"
-                        >
-                        </q-icon>
                       </template>
                     </q-input>
                   </template>
@@ -93,53 +57,41 @@
                     <q-input
                       outlined
                       dense
+                      hide-bottom-space
                       :readonly="routeName != 'AddLeave'"
                       class="full-width datepicker"
-                      :model-value="
+                      :model-value="dateLeave != null ? date2Thai(dateLeave) : null"
-                        dateLeave != null ? date2Thai(dateLeave) : null
-                      "
                       :label="`${'วันที่ขอลาออกจากราชการ'}`"
-                      :rules="[
+                      :rules="[val => !!val || `${'กรุณาเลือกวันที่ขอลาออกจากราชการ'}`]"
-                        (val) =>
-                          !!val || `${'กรุณาเลือกวันที่ขอลาออกจากราชการ'}`,
-                      ]"
                     >
                       <template v-slot:prepend>
-                        <q-icon
+                        <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
-                          name="event"
-                          class="cursor-pointer"
-                          style="color: var(--q-primary)"
-                        >
-                        </q-icon>
                       </template>
                     </q-input>
                   </template>
                 </datepicker>
-                <q-input
+                <q-input class="col-12" dense outlined v-model="noteReason" label="เหตุผลที่ลาออกจากราชการ" type="textarea" :readonly="routeName != 'AddLeave'" />
-                  class="col-12"
-                  dense
-                  outlined
-                  v-model="noteReason"
-                  label="เหตุผลที่ลาออกจากราชการ"
-                  type="textarea"
-                  :readonly="routeName != 'AddLeave'"
-                />
 
+                <div class="col-12 row">
+                  <q-uploader
+                    flat
+                    bordered
+                    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>
               </div>
 						</div>
 					</div>
           <q-separator v-if="routeName == 'AddLeave'"/> 
 					<div class="row col-12 q-pa-md" v-if="routeName == 'AddLeave'">
 						<q-space />
-            <q-btn
+						<q-btn unelevated dense class="q-px-md items-center" color="primary" label="ยื่นเรื่องขอลาออก" @click="saveResing" :disable="tranferOrg == '' && noteReason == ''" />
-              unelevated
-              dense
-              class="q-px-md items-center"
-              color="primary"
-              label="ยื่นเรื่องขอลาออก"
-              @click="saveResing"
-              :disable="tranferOrg == '' && noteReason == ''"
-            />
 					</div>
 				</q-card>
 			</div>
@@ -147,34 +99,34 @@
 	</div>
 </template>
 <script setup lang="ts">
-import type { QTableProps } from "quasar";
+import type { QTableProps } from "quasar"
-import { ref, onMounted } from "vue";
+import { ref, onMounted } from "vue"
-import { useQuasar } from "quasar";
+import { useQuasar } from "quasar"
-import { useRouter, useRoute } from "vue-router";
+import { useRouter, useRoute } from "vue-router"
-import { useCounterMixin } from "@/stores/mixin";
+import { useCounterMixin } from "@/stores/mixin"
-import http from "@/plugins/http";
+import http from "@/plugins/http"
-import config from "@/app.config";
+import config from "@/app.config"
 
-const mixin = useCounterMixin();
+const mixin = useCounterMixin()
-const { date2Thai, dateToISO, success, messageError, showLoader, hideLoader } =
+const { date2Thai, dateToISO, success, messageError, showLoader, hideLoader } = mixin
-  mixin;
+const router = useRouter()
-const router = useRouter();
+const route = useRoute()
-const route = useRoute();
+const $q = useQuasar()
-const $q = useQuasar();
+const routeName = router.currentRoute.value.name
-const routeName = router.currentRoute.value.name;
+const id = ref<string>("")
-const id = ref<string>("");
+const fileDocDataUpload = ref<File[]>([])
-
+const files = ref<any>()
-const tranferOrg = ref("");
+const tranferOrg = ref("")
-const dateCommand = ref<Date>(new Date());
+const dateCommand = ref<Date>(new Date())
-const dateLeave = ref<Date>(new Date());
+const dateLeave = ref<Date>(new Date())
-const noteReason = ref("");
+const noteReason = ref("")
 
 onMounted(() => {
 	if (route.params.id !== undefined) {
-    id.value = route.params.id.toString();
+		id.value = route.params.id.toString()
-    fectDataresign(id.value);
+		fectDataresign(id.value)
 	}
-});
+})
 const saveResing = () => {
 	$q.dialog({
 		title: "ยืนยันการยื่นข้อมูลลาออก",
@@ -186,47 +138,50 @@ const saveResing = () => {
 		persistent: true,
 	})
 		.onOk(async () => {
-      createFormresign();
+			createFormresign()
 		})
 		.onCancel(() => {})
-    .onDismiss(() => {});
+		.onDismiss(() => {})
-};
+}
 const createFormresign = async () => {
-  const formData = new FormData();
+	const formData = new FormData()
-  formData.append("Location", tranferOrg.value);
+	formData.append("Location", tranferOrg.value)
-  formData.append("SendDate", dateToISO(dateCommand.value));
+	formData.append("SendDate", dateToISO(dateCommand.value))
-  formData.append("ActiveDate", dateToISO(dateLeave.value));
+	formData.append("ActiveDate", dateToISO(dateLeave.value))
-  formData.append("Reason", noteReason.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, "บันทึกข้อมูลสำเร็จ");
+			success($q, "บันทึกข้อมูลสำเร็จ")
-      router.push(`/leave`);
+			router.push(`/leave/result`)
 		})
 		.catch((e: any) => {
-      messageError($q, e);
+			messageError($q, e)
-      console.log(e);
+			console.log(e)
-    });
+		})
-};
+}
 const fectDataresign = async (id: string) => {
-  showLoader();
+	showLoader()
 	await http
 		.get(config.API.resingByid(id))
 		.then((res: any) => {
-      let data = res.data.result;
+			let data = res.data.result
 			// console.log(data);
-      (tranferOrg.value = data.location),
+			;(tranferOrg.value = data.location), (dateCommand.value = data.sendDate), (dateLeave.value = data.activeDate), (noteReason.value = data.reason), (files.value = data.file)
-        (dateCommand.value = data.sendDate),
-        (dateLeave.value = data.activeDate),
-        (noteReason.value = data.reason);
 		})
 		.catch((e: any) => {
-      console.log(e);
+			console.log(e)
-      messageError($q, e);
+			messageError($q, e)
 		})
 		.finally(() => {
-      hideLoader();
+			hideLoader()
-    });
+		})
-};
+}
+
+const fileUploadDoc = async (file: any) => {
+	fileDocDataUpload.value.push(file)
+	files.value = file
+}
 </script>

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>

src/views/MainLayout.vue

@@ -73,7 +73,7 @@ const doLogout = () => {
 				<div v-if="$q.screen.gt.xs">
 					<q-tabs v-model="tab" align="justify" indicator-color="transparent" active-color="white bg-white-btn border-100" dense inline-label class="text-grey-5 tabsHome">
 						<q-tab class="border-100" name="dashboard" label="หน้าแรก" icon="mdi-view-dashboard-outline" @click="router.push(`/`)" />
-						<q-tab class="border-100" name="time" label="ลงเวลางาน" icon="mdi-map-marker-check-outline" @click="router.push(`/check-in`)"/>
+						<q-tab class="border-100" name="Checkin" label="ลงเวลางาน" icon="mdi-map-marker-check-outline" @click="router.push(`/check-in`)"/>
 						<q-tab class="border-100" name="leave" label="การลา" icon="mdi-calendar-blank-outline" />
 					</q-tabs>
 				</div>