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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-02-28 09:38:53 +07:00
commit 9ee003c913
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/17_acting/views/main.vue
View file

@ -315,6 +315,7 @@ onMounted(() => {
> >
รักษาการในตำแหน่ง รักษาการในตำแหน่ง
<q-space /> <q-space />
<q-btn <q-btn
class="q-px-sm" class="q-px-sm"
v-if="storeActing.isOfficer" v-if="storeActing.isOfficer"
@ -332,7 +333,7 @@ onMounted(() => {
<q-card style="height: 100%"> <q-card style="height: 100%">
<q-card-section :horizontal="$q.screen.gt.sm"> <q-card-section :horizontal="$q.screen.gt.sm">
<!-- โครงสร้าง --> <!-- โครงสร้าง -->
<q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm"> <q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm q-pa-sm">
<div> <div>
<q-input dense outlined v-model="filter" label="ค้นหา"> <q-input dense outlined v-model="filter" label="ค้นหา">
<template v-slot:append> <template v-slot:append>
@ -671,7 +672,7 @@ onMounted(() => {
/> />
</template> </template>
<style scoped> <style lang="scss" scoped>
.tree-container { .tree-container {
overflow: auto; overflow: auto;
height: 74vh; height: 74vh;

4
src/modules/21_report/views/02_reportRegistry.vue
View file

@ -904,7 +904,7 @@ onMounted(async () => {
</template> </template>
</q-input> </q-input>
<q-tree <q-tree
class="tree-container q-mt-sm" class="tree-container-report-registry q-mt-sm"
dense dense
:nodes="node" :nodes="node"
node-key="orgTreeName" node-key="orgTreeName"
@ -1673,7 +1673,7 @@ onMounted(async () => {
padding: 10px; padding: 10px;
} }
.tree-container { .tree-container-report-registry {
overflow: auto; overflow: auto;
max-height: 50vh; max-height: 50vh;
} }