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

โครงสร้างอัตรากำลัง => ปรับ btn

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-08-06 10:27:54 +07:00
parent 83db1a8921
commit b6dde4cfc5
2 changed files with 71 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

98
src/modules/02_organization/components/TreeMain.vue
View file

@ -448,11 +448,11 @@ watch(
v-if="store.typeOrganizational === 'draft'" v-if="store.typeOrganizational === 'draft'"
flat flat
dense dense
icon="mdi-dots-vertical" color="secondary"
class="q-ml-xs" icon="mdi-dots-horizontal-circle-outline"
color="grey-13"
size="12px"
round round
dene
class="q-ml-xs"
> >
<q-menu> <q-menu>
<q-list <q-list
@ -493,44 +493,53 @@ watch(
" "
> >
<q-item-section avatar style="min-width: 20px"> <q-item-section avatar style="min-width: 20px">
<q-icon <div class="row items-center">
size="17px" <q-icon
:color="item.color" size="xs"
:name="item.icon" :color="item.color"
/> :name="item.icon"
</q-item-section> />
<div v-if="prop.node.orgLevel === 0"> <div v-if="prop.node.orgLevel === 0">
<q-item-section <div
v-if=" class="q-pl-md"
item.type === 'EDIT' || v-if="
item.type === 'DEL' || item.type === 'EDIT' ||
item.type === 'HISTORY' || item.type === 'DEL' ||
item.type === 'SORT' item.type === 'HISTORY' ||
" item.type === 'SORT'
> "
{{ item.label }}หน่วยงาน >
</q-item-section> {{ item.label }}หน่วยงาน
<q-item-section v-else-if="item.type === 'ADD'"> </div>
{{ item.label }}ส่วนราชการ
</q-item-section>
<q-item-section v-else>
{{ item.label }}
</q-item-section>
</div>
<div v-else> <div
<q-item-section v-else-if="item.type === 'ADD'"
v-if=" class="q-pl-md"
item.type === 'ADD' || >
item.type === 'EDIT' || {{ item.label }}ส่วนราชการ
item.type === 'DEL' || </div>
item.type === 'HISTORY' || <div v-else class="q-pl-md">
item.type === 'SORT' {{ item.label }}
" </div>
>{{ item.label }}ส่วนราชการ</q-item-section </div>
>
<q-item-section v-else>{{ item.label }}</q-item-section> <div v-else>
</div> <div
class="q-pl-md"
v-if="
item.type === 'ADD' ||
item.type === 'EDIT' ||
item.type === 'DEL' ||
item.type === 'HISTORY' ||
item.type === 'SORT'
"
>
{{ item.label }}ส่วนราชการ
</div>
<div v-else class="q-pl-md">{{ item.label }}</div>
</div>
</div>
</q-item-section>
</q-item> </q-item>
</q-list> </q-list>
</q-menu> </q-menu>
@ -540,11 +549,10 @@ watch(
v-else v-else
flat flat
dense dense
icon="mdi-dots-vertical" color="secondary"
class="q-pa-none q-ml-xs" icon="mdi-dots-horizontal-circle-outline"
color="grey-13"
size="12px"
round round
class="q-pa-none q-ml-xs"
> >
<q-menu> <q-menu>
<q-list <q-list

26
src/modules/02_organization/components/TreeTable.vue
View file

@ -574,12 +574,12 @@ watch(
<q-tr :props="props" class="cursor-pointer"> <q-tr :props="props" class="cursor-pointer">
<q-td> <q-td>
<q-btn <q-btn
v-if="store.typeOrganizational === 'draft'"
flat flat
dense color="secondary"
icon="mdi-dots-vertical" icon="mdi-dots-horizontal-circle-outline"
round
class="q-pa-none q-ml-xs" class="q-pa-none q-ml-xs"
color="grey-13"
size="12px"
> >
<q-menu> <q-menu>
<q-list dense style="min-width: 150px"> <q-list dense style="min-width: 150px">
@ -625,9 +625,7 @@ watch(
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item
v-for="(item, index) in store.typeOrganizational === 'draft' v-for="(item, index) in listMenu"
? listMenu
: listMenu.filter((e) => e.type === 'HISTORY')"
:key="index" :key="index"
clickable clickable
v-close-popup v-close-popup
@ -651,7 +649,7 @@ watch(
<div class="row items-center"> <div class="row items-center">
<q-icon <q-icon
:color="item.color" :color="item.color"
size="17px" size="xs"
:name="item.icon" :name="item.icon"
/> />
<div class="q-pl-md">{{ item.label }}</div> <div class="q-pl-md">{{ item.label }}</div>
@ -674,6 +672,18 @@ watch(
</q-list> </q-list>
</q-menu> </q-menu>
</q-btn> </q-btn>
<q-btn
v-else
flat
dense
color="deep-purple"
icon="mdi-history"
round
@click.stop.pervent="onClickHistoryPos(props.row.id)"
>
<q-tooltip>ประวัติตำแหน่ง</q-tooltip>
</q-btn>
</q-td> </q-td>
<q-td> <q-td>
<q-btn <q-btn