hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge commit '8511baf411' into develop

Browse source 
# Conflicts:
#	src/modules/02_transfer/views/AddTransfer.vue
#	src/modules/03_leave/views/AddLeave.vue
This commit is contained in:
Tanyalak 2023-08-21 16:03:36 +07:00
commit e70ffe70a2
5 changed files with 258 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/02_transfer/views/AddTransfer.vue
View file

@ -21,9 +21,7 @@
accept=".jpg,.png,.pdf,.csv,.doc" accept=".jpg,.png,.pdf,.csv,.doc"
url="http://localhost:4444/upload" url="http://localhost:4444/upload"
label="เอกสารเพิ่มเติม" label="เอกสารเพิ่มเติม"
:color="routeName != 'addTransfer' ? 'grey-8': 'blue'" type="file"
multiple
:disable="routeName != 'addTransfer'"
@added="fileUploadDoc" @added="fileUploadDoc"
/> />
</div> </div>
@ -336,6 +334,8 @@ const createTransfer = async () => {
formData.append("Organization", tranferOrg.value) formData.append("Organization", tranferOrg.value)
formData.append("Reason", noteReason.value) formData.append("Reason", noteReason.value)
formData.append("file", files.value) formData.append("file", files.value)
console.log(files.value)
console.log(formData) console.log(formData)
await http await http
.post(config.API.listtransfer(), formData) .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> </script>

72
src/modules/03_leave/router.ts
View file

@ -2,36 +2,48 @@
* Router ขอโอน * 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 [ export default [
{ {
path: "/leave", path: "/leave",
name: "leave", name: "leave",
component: LeaveMain, component: LeaveMain,
meta: { meta: {
Auth: true, Auth: true,
Key: [7], Key: [7],
}, },
}, },
{ {
path: "/leave/add", path: "/leave/add",
name: "AddLeave", name: "AddLeave",
component: AddLeave, component: AddLeave,
meta: { meta: {
Auth: true, Auth: true,
Key: [7], Key: [7],
}, },
}, },
{ {
path: "/leave/:id", path: "/leave/:id",
name: "detailLeave", name: "detailLeave",
component: AddLeave, component: AddLeave,
meta: { meta: {
Auth: true, Auth: true,
Key: [7], Key: [7],
}, },
}, },
];
{
path: "/leave/result",
name: "resultLeave",
component: ResultQuestionair,
meta: {
Auth: true,
Key: [7],
},
},
]

293
src/modules/03_leave/views/AddLeave.vue
View file

@ -1,44 +1,18 @@
<template> <template>
<div class="col-12 row justify-center"> <div class="col-12 row justify-center">
<div class="col-xs-12 col-sm-12 col-md-11"> <div class="col-xs-12 col-sm-12 col-md-11">
<div class="toptitle text-white col-12 row items-center"> <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" <div v-if="routeName == 'AddLeave'">เพิ่มเรื่องลาออก</div>
unelevated <div v-else>รายละเอียดเรื่องลาออก</div>
round </div>
dense <div class="col-12">
flat <q-card bordered>
color="primary" <div class="col-12 row q-col-gutter-md q-pa-md">
class="q-mr-sm" <div class="col-xs-12 col-sm-12">
@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">
<div class="col-12 row q-pa-sm q-col-gutter-sm"> <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 }"> <template #year="{ year }">
{{ year + 543 }} {{ year + 543 }}
</template> </template>
@ -50,24 +24,14 @@
outlined outlined
readonly readonly
dense dense
hide-bottom-space
class="full-width datepicker" class="full-width datepicker"
:model-value=" :model-value="dateCommand != null ? date2Thai(dateCommand) : null"
dateCommand != null ? date2Thai(dateCommand) : null
"
:label="`${'วันที่ยื่นขอลาออกจากราชการ'}`" :label="`${'วันที่ยื่นขอลาออกจากราชการ'}`"
:rules="[ :rules="[val => !!val || `${'กรุณาเลือกวันที่ยื่นขอลาออกจากราชการ'}`]"
(val) =>
!!val ||
`${'กรุณาเลือกวันที่ยื่นขอลาออกจากราชการ'}`,
]"
> >
<template v-slot:prepend> <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> </template>
</q-input> </q-input>
</template> </template>
@ -93,140 +57,131 @@
<q-input <q-input
outlined outlined
dense dense
hide-bottom-space
:readonly="routeName != 'AddLeave'" :readonly="routeName != 'AddLeave'"
class="full-width datepicker" class="full-width datepicker"
:model-value=" :model-value="dateLeave != null ? date2Thai(dateLeave) : null"
dateLeave != null ? date2Thai(dateLeave) : null
"
:label="`${'วันที่ขอลาออกจากราชการ'}`" :label="`${'วันที่ขอลาออกจากราชการ'}`"
:rules="[ :rules="[val => !!val || `${'กรุณาเลือกวันที่ขอลาออกจากราชการ'}`]"
(val) =>
!!val || `${'กรุณาเลือกวันที่ขอลาออกจากราชการ'}`,
]"
> >
<template v-slot:prepend> <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> </template>
</q-input> </q-input>
</template> </template>
</datepicker> </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> </div>
</div> </div>
<q-separator v-if="routeName == 'AddLeave'"/> <q-separator v-if="routeName == 'AddLeave'"/>
<div class="row col-12 q-pa-md" v-if="routeName == 'AddLeave'"> <div class="row col-12 q-pa-md" v-if="routeName == 'AddLeave'">
<q-space /> <q-space />
<q-btn <q-btn unelevated dense class="q-px-md items-center" color="primary" label="ยื่นเรื่องขอลาออก" @click="saveResing" :disable="tranferOrg == '' && noteReason == ''" />
unelevated </div>
dense </q-card>
class="q-px-md items-center" </div>
color="primary" </div>
label="ยื่นเรื่องขอลาออก" </div>
@click="saveResing"
:disable="tranferOrg == '' && noteReason == ''"
/>
</div>
</q-card>
</div>
</div>
</div>
</template> </template>
<script setup lang="ts"> <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(() => { onMounted(() => {
if (route.params.id !== undefined) { 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 = () => { const saveResing = () => {
$q.dialog({ $q.dialog({
title: "ยืนยันการยื่นข้อมูลลาออก", title: "ยืนยันการยื่นข้อมูลลาออก",
message: "ต้องการยื่นข้อมูลลาออกนี้ใช่หรือไม่?", message: "ต้องการยื่นข้อมูลลาออกนี้ใช่หรือไม่?",
cancel: { cancel: {
flat: true, flat: true,
color: "negative", color: "negative",
}, },
persistent: true, persistent: true,
}) })
.onOk(async () => { .onOk(async () => {
createFormresign(); createFormresign()
}) })
.onCancel(() => {}) .onCancel(() => {})
.onDismiss(() => {}); .onDismiss(() => {})
}; }
const createFormresign = async () => { 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)
await http formData.append("file", files.value)
.post(config.API.listResign(), formData) await http
.then((res: any) => { .post(config.API.listResign(), formData)
// console.log(res); .then((res: any) => {
success($q, "บันทึกข้อมูลสำเร็จ"); // console.log(res);
router.push(`/leave`); success($q, "บันทึกข้อมูลสำเร็จ")
}) router.push(`/leave/result`)
.catch((e: any) => { })
messageError($q, e); .catch((e: any) => {
console.log(e); messageError($q, e)
}); console.log(e)
}; })
}
const fectDataresign = async (id: string) => { const fectDataresign = async (id: string) => {
showLoader(); showLoader()
await http await http
.get(config.API.resingByid(id)) .get(config.API.resingByid(id))
.then((res: any) => { .then((res: any) => {
let data = res.data.result; let data = res.data.result
// console.log(data); // 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), .catch((e: any) => {
(noteReason.value = data.reason); console.log(e)
}) messageError($q, e)
.catch((e: any) => { })
console.log(e); .finally(() => {
messageError($q, e); hideLoader()
}) })
.finally(() => { }
hideLoader();
}); const fileUploadDoc = async (file: any) => {
}; fileDocDataUpload.value.push(file)
files.value = file
}
</script> </script>

85
src/modules/03_leave/views/result.vue Normal file
View file

@ -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>

2
src/views/MainLayout.vue
View file

@ -73,7 +73,7 @@ const doLogout = () => {
<div v-if="$q.screen.gt.xs"> <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-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="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-tab class="border-100" name="leave" label="การลา" icon="mdi-calendar-blank-outline" />
</q-tabs> </q-tabs>
</div> </div>