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

Merge branch 'develop' into dev

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-06-04 15:10:37 +07:00
commit b76b926175
4 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/06_retirement/components/02_resign/ResignByid.vue
View file

@ -47,6 +47,7 @@ const {
success,
dialogConfirm,
dialogRemove,
convertDateToAPI,
} = mixin;
/** ตัวแปร */
@ -477,9 +478,8 @@ function onSubmitConditions() {
function onSubmitAttached() {
dialogConfirm($q, async () => {
const formData = new FormData();
const send = date.value !== null ? new Date(date.value).toUTCString() : "";
const activeDate =
dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
const send: string = convertDateToAPI(date.value) ?? "";
const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
formData.append("Location", location.value);
formData.append("SendDate", send);
formData.append("ActiveDate", activeDate);
@ -771,10 +771,13 @@ onMounted(async () => {
<q-space />
<div
v-if="
!checkRoutePermisson &&
isStaff &&
status === 'WAITTING' &&
checkPermission($route)?.attrIsUpdate
(!checkRoutePermisson &&
isStaff &&
status === 'WAITTING' &&
checkPermission($route)?.attrIsUpdate) ||
(!checkRoutePermisson &&
((isStaff && group === '1.1' && approveStep === 'st1') ||
(isOfficer && group !== '1.1' && approveStep === 'st3')))
"
>
<q-btn

8
src/modules/06_retirement/components/02_resign/ResignReject.vue
View file

@ -34,6 +34,7 @@ const {
hideLoader,
success,
dialogConfirm,
convertDateToAPI,
} = useCounterMixin();
const checkRoutePermisson = ref<boolean>(route.name == "resignDetailreject");
@ -313,9 +314,8 @@ async function clickCancel() {
function onSubmitAttached() {
dialogConfirm($q, () => {
const formData = new FormData();
const send = date.value !== null ? new Date(date.value).toUTCString() : "";
const activeDate =
dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
const send: string = convertDateToAPI(date.value) ?? "";
const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
formData.append("Location", location.value);
formData.append("SendDate", send);
formData.append("ActiveDate", activeDate);
@ -439,7 +439,7 @@ onMounted(async () => {
class="q-mr-sm"
@click="router.push('/retirement/resign')"
/>
รายละเอียดการยกเลิกลาออก
รายละเอียดการยกเลิกลาออก
{{
dataDetail.prefix + dataDetail.firstName + " " + dataDetail.lastName
}}

9
src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
View file

@ -801,10 +801,11 @@ onMounted(async () => {
<q-space />
<div
v-if="
!checkRoutePermisson &&
isStaff &&
status === 'WAITTING' &&
checkPermission($route)?.attrIsUpdate
(!checkRoutePermisson &&
isStaff &&
status === 'WAITTING' &&
checkPermission($route)?.attrIsUpdate) ||
(!checkRoutePermisson && isStaff && approveStep === 'st1')
"
>
<q-btn

7
src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
View file

@ -38,6 +38,7 @@ const {
hideLoader,
success,
dialogConfirm,
convertDateToAPI,
} = mixin;
/** ตัวแปร */
@ -301,9 +302,9 @@ async function clickCancel() {
function onSubmitAttached() {
dialogConfirm($q, () => {
const formData = new FormData();
const send = date.value !== null ? new Date(date.value).toUTCString() : "";
const activeDate =
dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
const send: string = convertDateToAPI(date.value) ?? "";
const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
formData.append("Location", location.value);
formData.append("SendDate", send);
formData.append("ActiveDate", activeDate);