chamomind/jws-frontend
chamomind/jws-frontend
6
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'dev/phat-2' into develop

Browse source
This commit is contained in:
puriphatt 2024-04-19 11:11:01 +07:00
commit 9b35e63dbd
4 changed files with 71 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/DrawerInfo.vue
View file

@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue'; import { ref, watch } from 'vue';
defineProps<{ defineProps<{
title: string; title: string;
@ -12,6 +12,7 @@ defineProps<{
undo?: (...args: unknown[]) => void; undo?: (...args: unknown[]) => void;
}>(); }>();
// const drawerWidth = ref(window.screen.width * 0.8);
const drawerOpen = defineModel<boolean>('drawerOpen', { const drawerOpen = defineModel<boolean>('drawerOpen', {
default: false, default: false,
}); });
@ -23,13 +24,22 @@ function reset() {
myForm.value.resetValidation(); myForm.value.resetValidation();
} }
} }
// watch(
// () => window.screen.width,
// (v) => {
// console.log(v);
// drawerWidth.value = v;
// },
// );
</script> </script>
<template> <template>
<q-drawer <q-drawer
@before-hide="reset" @before-hide="reset"
@hide="close" @hide="close"
:width="1300" :width="$q.screen.gt.md ? 1200 : $q.screen.gt.xs ? 700 : 900"
:breakpoint="500" :breakpoint="1366"
v-model="drawerOpen" v-model="drawerOpen"
behavior="mobile" behavior="mobile"
side="right" side="right"

2
src/components/SelectorList.vue
View file

@ -29,7 +29,7 @@ defineProps<{
" "
@click="selector = v.label" @click="selector = v.label"
> >
<div class="row full-width justify-between"> <div class="row full-width items-center justify-between">
<div> <div>
{{ $t(v.label) }} {{ $t(v.label) }}
</div> </div>

91
src/components/home/PersonCard.vue
View file

@ -68,56 +68,75 @@ defineEmits<{
size="sm" size="sm"
@click.stop="" @click.stop=""
> >
<q-menu :offset="[0, 10]" style="width: 130px"> <q-menu class="bordered">
<q-list> <q-list v-close-popup>
<q-item <q-item
clickable clickable
dense
class="row q-py-sm"
style="white-space: nowrap"
@click="$emit('enterCard', 'INFO', v.id)"
>
<q-icon
name="mdi-eye-outline"
class="col-3"
size="xs"
style="color: hsl(var(--green-6-hsl))"
/>
<span class="col-9 q-px-md flex items-center">
{{ $t('viewDetail') }}
</span>
</q-item>
<q-item
dense
clickable
class="row q-py-sm"
style="white-space: nowrap"
@click="$emit('updateCard', 'FORM', v.id)" @click="$emit('updateCard', 'FORM', v.id)"
v-close-popup v-close-popup
> >
<q-item-section class="col-4"> <q-icon
<q-icon name="mdi-pencil-outline"
class="full-width" class="col-3"
name="mdi-pencil-outline" size="xs"
color="positive" style="color: hsl(var(--cyan-6-hsl))"
size="xs" />
/> <span class="col-9 q-px-md flex items-center">
</q-item-section>
<q-item-section class="text-caption">
{{ $t('edit') }} {{ $t('edit') }}
</q-item-section> </span>
</q-item> </q-item>
<q-item <q-item
dense
clickable clickable
@click="$emit('deleteCard', v.id)" @click="$emit('deleteCard', v.id)"
v-close-popup v-close-popup
> >
<q-item-section class="col-4"> <q-icon
<q-icon name="mdi-trash-can-outline"
class="full-width" size="xs"
name="mdi-trash-can-outline" class="col-3 app-text-negative"
color="negative" />
size="xs" <span class="col-9 q-px-md flex items-center">
/>
</q-item-section>
<q-item-section class="text-caption">
{{ $t('delete') }} {{ $t('delete') }}
</q-item-section> </span>
</q-item> </q-item>
<q-item clickable> <q-item dense>
<q-item-section class="col-4"> <q-item-section class="q-py-sm">
<q-toggle <div class="q-pa-sm surface-2 rounded">
dense <q-toggle
color="primary" dense
size="xs" size="sm"
@click="$emit('toggleStatus', v.id)" @click="$emit('toggleStatus', v.id)"
:model-value="!v.disabled" :model-value="!v.disabled"
val="xs" val="xs"
padding="none" padding="none"
/> :label="
</q-item-section> v.disabled
<q-item-section class="text-caption"> ? $t('switchOnLabel')
{{ v.disabled ? 'เปิดสถานะ' : 'ปิดสถานะ' }} : $t('switchOffLabel')
"
/>
</div>
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>

3
src/pages/02_personnel-management/MainPage.vue
View file

@ -278,12 +278,13 @@ async function onSubmit() {
result.id, result.id,
); );
} }
onClose(); selectorLabel.value = formData.value.userType;
userStore.fetchList({ userStore.fetchList({
includeBranch: true, includeBranch: true,
userType: selectorLabel.value ?? undefined, userType: selectorLabel.value ?? undefined,
}); });
typeStats.value = await userStore.typeStats(); typeStats.value = await userStore.typeStats();
onClose();
}, },
}); });
} }