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

Merge branch 'develop' into nice

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-09-25 15:14:32 +07:00
commit 208d867dfd
2 changed files with 33 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/modules/09_leave/components/2_Leave/DetailLeave.vue
View file

@ -8,14 +8,14 @@ import config from "@/app.config";
import genReport from "@/plugins/genreport";
import { useCounterMixin } from "@/stores/mixin";
import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
import DialogReason from "@/components/Dialogs/PopupReason.vue";
import { checkPermission } from "@/utils/permissions";
/** importType */
import type { FremData } from "@/modules/09_leave/interface/request/leave";
import type { LeaveType } from "@/modules/09_leave/interface/response/leave";
/** importForm*/
import DialogReason from "@/components/Dialogs/PopupReason.vue";
import FormMain from "@/modules/09_leave/components/2_Leave/formDetail/formMain.vue"; // from ซ้าย
import FormLeave from "@/modules/09_leave/components/2_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
import FormChildbirth from "@/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
@ -743,10 +743,14 @@ onMounted(async () => {
</div>
</div>
</div>
<q-separator />
<q-separator v-if="checkPermission($route)?.attrIsUpdate" />
<div class="row q-pa-md q-gutter-md justify-end">
<q-btn
v-if="formData.approveStep === 'st1' && formData.status !== 'ยกเลิก'"
v-if="
formData.approveStep === 'st1' &&
formData.status !== 'ยกเลิก' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="orange-5"
label="ส่งไปยังผู้บังคับบัญชา"
@ -755,7 +759,11 @@ onMounted(async () => {
</q-btn>
<q-btn
v-if="formData.approveStep === 'st2' && formData.status !== 'ยกเลิก'"
v-if="
formData.approveStep === 'st2' &&
formData.status !== 'ยกเลิก' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="orange-5"
label="ส่งไปยังผู้มีอำนาจ"
@ -764,7 +772,11 @@ onMounted(async () => {
</q-btn>
<q-btn
v-if="formData.approveStep === 'st3' && formData.status !== 'ยกเลิก'"
v-if="
formData.approveStep === 'st3' &&
formData.status !== 'ยกเลิก' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="orange-5"
label="ไม่อนุมัติ"
@ -772,7 +784,11 @@ onMounted(async () => {
><q-tooltip>ไม่อนุมัติ</q-tooltip>
</q-btn>
<q-btn
v-if="formData.approveStep === 'st3' && formData.status !== 'ยกเลิก'"
v-if="
formData.approveStep === 'st3' &&
formData.status !== 'ยกเลิก' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="primary"
label="อนุมัติ"

14
src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
View file

@ -8,6 +8,7 @@ import config from "@/app.config";
import genReport from "@/plugins/genreport";
import { useCounterMixin } from "@/stores/mixin";
import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
import { checkPermission } from "@/utils/permissions";
/** importType */
import type {
@ -470,7 +471,6 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</q-btn>
</div>
<q-space />
</div>
</div>
<q-card flat bordered class="col-12 q-mt-sm">
@ -698,10 +698,13 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</div>
</div>
</div>
<q-separator />
<q-separator v-if="checkPermission($route)?.attrIsUpdate" />
<div class="row q-pa-md q-gutter-md justify-end">
<q-btn
v-if="formDataReject.status === 'NEW'"
v-if="
formDataReject.status === 'NEW' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="orange-5"
label="ไม่อนุมัติการยกเลิก"
@ -709,7 +712,10 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
><q-tooltip>ไม่อนุมัติการยกเลิก</q-tooltip>
</q-btn>
<q-btn
v-if="formDataReject.status === 'NEW'"
v-if="
formDataReject.status === 'NEW' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="primary"
label="อนุมัติการยกเลิก"