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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2023-10-31 16:21:32 +07:00
commit d6040fe95e
8 changed files with 48 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/09_leave/components/1_Work/DialogDetail.vue
View file

@ -92,7 +92,7 @@ function colsePopup() {
</q-item-section>
</q-item>
</div>
<div class="col row items-center">
<!-- <div class="col row items-center">
<q-btn
v-if="!statusEdit"
for="editDialog"
@ -132,7 +132,7 @@ function colsePopup() {
<q-tooltip>บันทึกข้อมูล</q-tooltip>
</q-btn>
</div>
</div>
</div> -->
</div>
</q-card>
<div class="row q-gutter-md q-pt-md">

19
src/modules/09_leave/components/1_Work/ToolBar.vue
View file

@ -11,8 +11,8 @@ const { filterFn, searchDataFn } = workStore;
</script>
<template>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
<div class="col-2">
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="col-xs-12 col-sm-3 col-md-2">
<datepicker
menu-class-name="modalfix"
v-model="workStore.selectDate"
@ -50,7 +50,7 @@ const { filterFn, searchDataFn } = workStore;
</template>
</datepicker>
</div>
<div class="col-3">
<div class="col-xs-12 col-sm-3 col-md-2">
<q-select
for="selectStatus"
emit-value
@ -76,16 +76,21 @@ const { filterFn, searchDataFn } = workStore;
>
</div>
<q-space />
<div class="col-2">
<div class="col-xs-12 col-sm-3 col-md-2">
<q-input
for="filterTable"
dense
outlined
v-model="workStore.filterTable"
label="ค้นหา"
/>
debounce="300"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
</div>
<div class="col-2">
<div class="col-xs-12 col-sm-3 col-md-2">
<q-select
for="visibleColumns"
v-model="workStore.visibleColumns"
@ -101,7 +106,7 @@ const { filterFn, searchDataFn } = workStore;
options-cover
/>
</div>
</q-toolbar>
</div>
</template>
<style scoped></style>

14
src/modules/09_leave/components/2_Leave/ToolBar.vue
View file

@ -7,8 +7,8 @@ const { searchDataFn, filterOption } = leaveStore;
</script>
<template>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
<div class="col-2">
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="col-xs-12 col-sm-3 col-md-2">
<q-select
for="selectYear"
emit-value
@ -22,7 +22,7 @@ const { searchDataFn, filterOption } = leaveStore;
label="ปีงบประมาณ"
/>
</div>
<div class="col-3">
<div class="col-xs-12 col-sm-3 col-md-2">
<q-select
for="selectType"
emit-value
@ -50,7 +50,7 @@ const { searchDataFn, filterOption } = leaveStore;
</template></q-select
>
</div>
<div class="col-2">
<div class="col-xs-12 col-sm-3 col-md-2">
<q-select
for="selectStatus"
v-if="leaveStore.tab == '2'"
@ -74,7 +74,7 @@ const { searchDataFn, filterOption } = leaveStore;
/>
</div>
<q-space />
<div class="col-2">
<div class="col-xs-12 col-sm-3 col-md-2">
<q-input
for="filterTable"
dense
@ -83,7 +83,7 @@ const { searchDataFn, filterOption } = leaveStore;
label="ค้นหา"
/>
</div>
<div class="col-2">
<div class="col-xs-12 col-sm-3 col-md-2">
<q-select
for="visibleColumns"
v-model="leaveStore.visibleColumns"
@ -99,7 +99,7 @@ const { searchDataFn, filterOption } = leaveStore;
options-cover
/>
</div>
</q-toolbar>
</div>
</template>
<style scoped></style>

5
src/modules/09_leave/interface/response/work.ts
View file

@ -8,8 +8,9 @@ interface TableRows {
coordinatesOut: string
latOut: string
longOut: string
status: string
date: String | null
status: string | undefined
date: string | null
}
interface DataRes {
fullName: string

22
src/modules/09_leave/stores/WorkStore.ts
View file

@ -13,7 +13,7 @@ export const useWorklistDataStore = defineStore("work", () => {
const visibleColumns = ref<string[]>([]);
const dataMain = ref<TableRows[]>([])
function fetchList(data: DataRes[]) {
let datalist = data.map((e: DataRes) => ({
let datalist: TableRows[] = data.map((e: DataRes) => ({
fullName: e.fullName,
timeIn: e.timeIn,
coordinatesIn: e.coordinatesIn,
@ -33,11 +33,17 @@ export const useWorklistDataStore = defineStore("work", () => {
//ค้นหาข้อมูล
const filterTable = ref<string>('')
const selectDate = ref<Date | null>(null);
const selectDate = ref<Date | null>(new Date());
const selectStatus = ref<String>('all')
const optionStatusMain = ref<DataOption[]>([])
const optionStatus = ref<DataOption[]>([])
function searchDataFn(searchDate: any, searchStatus: any) {
let a = new Date(searchDate);// วันที่เลือก
let b = new Date(); // วันที่ปัจจุบัน
if (a > b) {
selectDate.value = new Date()
searchDate = new Date()
}
searchStatus = searchStatus || "all";
if (searchDate == null && searchStatus == "all") {
rows.value = dataMain.value
@ -84,12 +90,12 @@ export const useWorklistDataStore = defineStore("work", () => {
// convertSatatus
function convertSatatus(val: string) {
switch (val) {
case "1":
return "ลงเวลาเรียบร้อย"
case "2":
return "สายทำงานครบ"
default:
return "ยังไม่ได้ลงเวลา"
case "normal":
return "ปกติ"
case "late":
return "สาย"
case "absent":
return "ขาดราชการ"
}
}
return {

12
src/modules/09_leave/views/WorkingMain.vue
View file

@ -33,8 +33,8 @@ function fecthWorkList() {
coordinatesOut: "สำนักงาน",
latOut: "18.7903",
longOut: "99.0029",
status: "1",
date: new Date("2023-10-27"),
status: "normal",
date: new Date(new Date()),
},
{
fullName: "นายนครชัย วันดี",
@ -46,8 +46,8 @@ function fecthWorkList() {
coordinatesOut: "สำนักงาน",
latOut: "18.7903",
longOut: "99.0029",
status: "2",
date: new Date("2023-10-28"),
status: "late",
date: new Date(new Date()),
},
{
fullName: "นายปิยรมย์ ศิริธาราฟ",
@ -59,7 +59,7 @@ function fecthWorkList() {
coordinatesOut: "สำนักงาน",
latOut: "18.7903",
longOut: "99.0029",
status: "3",
status: "absent",
date: new Date("2023-10-27"),
},
{
@ -72,7 +72,7 @@ function fecthWorkList() {
coordinatesOut: "สำนักงาน",
latOut: "18.7903",
longOut: "99.0029",
status: "1",
status: "normal",
date: new Date("2023-10-27"),
},
];