Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m54s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m54s
* develop: ปิดปุ่มแก้ไข และเพิ่มของประวัติตำแหน่ง เงินเดือน แก้ได้แค่ owner เท่านั้น
This commit is contained in:
commit
8683cda9d5
2 changed files with 20 additions and 5 deletions
|
|
@ -898,7 +898,11 @@ onMounted(async () => {
|
|||
|
||||
<div class="row items-center q-gutter-x-sm q-pb-sm">
|
||||
<q-btn
|
||||
v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
|
||||
v-if="
|
||||
!isLeave &&
|
||||
checkPermission($route)?.attrIsUpdate &&
|
||||
checkPermission($route)?.attrOwnership === 'OWNER'
|
||||
"
|
||||
flat
|
||||
color="primary"
|
||||
round
|
||||
|
|
@ -972,7 +976,11 @@ onMounted(async () => {
|
|||
</q-btn>
|
||||
|
||||
<q-btn
|
||||
v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
|
||||
v-if="
|
||||
!isLeave &&
|
||||
checkPermission($route)?.attrIsUpdate &&
|
||||
checkPermission($route)?.attrOwnership === 'OWNER'
|
||||
"
|
||||
flat
|
||||
:disable="
|
||||
(props.row.commandId !== null && props.row.commandId !== '') ||
|
||||
|
|
|
|||
|
|
@ -860,7 +860,11 @@ onMounted(async () => {
|
|||
<template>
|
||||
<div class="row items-center q-gutter-x-sm q-pb-sm">
|
||||
<q-btn
|
||||
v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
|
||||
v-if="
|
||||
!isLeave &&
|
||||
checkPermission($route)?.attrIsUpdate &&
|
||||
checkPermission($route)?.attrOwnership === 'OWNER'
|
||||
"
|
||||
flat
|
||||
color="primary"
|
||||
round
|
||||
|
|
@ -932,9 +936,12 @@ onMounted(async () => {
|
|||
>
|
||||
<q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
|
||||
</q-btn>
|
||||
|
||||
<q-btn
|
||||
v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
|
||||
v-if="
|
||||
!isLeave &&
|
||||
checkPermission($route)?.attrIsUpdate &&
|
||||
checkPermission($route)?.attrOwnership === 'OWNER'
|
||||
"
|
||||
flat
|
||||
:disable="
|
||||
(props.row.commandId !== null && props.row.commandId !== '') ||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue