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>