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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2024-11-15 16:53:43 +07:00
commit 98e5eaad27
13 changed files with 234 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/modules/06_retirement/components/resign/ResignByid.vue
View file

@ -70,6 +70,8 @@ const dataDetail = ref<any>({
status: "",
statustext: "",
fullname: "",
statusMain: "",
cancelReason: "",
});
const workflowRef = ref<any>(null);
@ -628,6 +630,18 @@ onMounted(async () => {
</div>
</div>
</div>
<div
class="col-xs-12 col-sm-12 row items-start"
v-if="dataDetail.statusMain === 'CANCEL'"
>
<div class="col-12">
<div class="col-12 text-top">เหตุผลการขอยกเลิก</div>
<div class="col-12 text-detail text-red">
{{ dataDetail.cancelReason }}
</div>
</div>
</div>
</div>
</div>
</q-card>
@ -744,7 +758,11 @@ onMounted(async () => {
<q-space />
<div
v-if="!checkRoutePermisson && workflowRef?.permission.isUpdate"
v-if="
!checkRoutePermisson &&
workflowRef?.permission.isUpdate &&
dataDetail.statusMain === 'WAITTING'
"
>
<div v-if="!conditions">
<q-btn
@ -819,7 +837,9 @@ onMounted(async () => {
<div class="col-12 row">
<q-file
v-if="
!checkRoutePermisson && workflowRef?.permission.isUpdate
!checkRoutePermisson &&
workflowRef?.permission.isUpdate &&
dataDetail.statusMain === 'WAITTING'
"
class="col-12"
for="#evidenceFiles"
@ -875,8 +895,8 @@ onMounted(async () => {
<div>
<q-btn
v-if="
dataDetail.status == 'WAITTING' &&
!checkRoutePermisson
!checkRoutePermisson &&
dataDetail.statusMain === 'WAITTING'
"
dense
flat
@ -959,7 +979,8 @@ onMounted(async () => {
class="q-gutter-x-sm"
v-if="
workflowRef?.permission.isUpdate &&
dataDetail.commanderReject === null
dataDetail.commanderReject === null &&
dataDetail.statusMain === 'WAITTING'
"
>
<q-btn
@ -1031,7 +1052,8 @@ onMounted(async () => {
class="q-gutter-x-sm"
v-if="
workflowRef?.permission.isUpdate &&
dataDetail.oligarchReject === null
dataDetail.oligarchReject === null &&
dataDetail.statusMain === 'WAITTING'
"
>
<q-btn
@ -1106,7 +1128,13 @@ onMounted(async () => {
</div>
<q-space />
<div v-if="!checkRoutePermisson && workflowRef?.permission.isUpdate">
<div
v-if="
!checkRoutePermisson &&
workflowRef?.permission.isUpdate &&
dataDetail.statusMain === 'WAITTING'
"
>
<div class="q-gutter-sm" v-if="!edit">
<q-btn
outline
@ -1335,7 +1363,7 @@ onMounted(async () => {
ref="workflowRef"
v-model:is-check-data="isCheckData"
:id="id"
sys-name="SYS_RETIREMENT"
sys-name="SYS_RESIGN"
/>
</div>

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

@ -67,6 +67,7 @@ const dataDetail = ref<any>({
status: "",
statustext: "",
fullname: "",
statusMain: "",
});
const workflowRef = ref<any>(null);
@ -380,7 +381,8 @@ onMounted(async () => {
class="q-gutter-x-sm"
v-if="
workflowRef?.permission.isUpdate &&
dataDetail.commanderReject === null
dataDetail.commanderReject === null &&
dataDetail.statusMain === 'WAITTING'
"
>
<q-btn
@ -453,7 +455,8 @@ onMounted(async () => {
class="q-gutter-x-sm"
v-if="
workflowRef?.permission.isUpdate &&
dataDetail.oligarchReject === null
dataDetail.oligarchReject === null &&
dataDetail.statusMain === 'WAITTING'
"
>
<q-btn

2
src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
View file

@ -282,7 +282,7 @@ watchEffect(() => {
<DialogCreateCommand
v-model:modal="modalCommand"
:command-type-code="props.mainTabs === '1' ? 'C-PM-17' : 'C-PM-41'"
:command-type-code="props.mainTabs === '1' ? 'C-PM-23' : 'C-PM-42'"
:persons="dataMapToSend"
/>
</template>

78
src/modules/06_retirement/components/resignEMP/ResignByid.vue
View file

@ -70,6 +70,8 @@ const dataDetail = ref<any>({
status: "",
statustext: "",
fullname: "",
statusMain: "",
cancelReason: "",
});
const workflowRef = ref<any>(null);
@ -516,10 +518,29 @@ function removeFile(fileName: string) {
});
}
const isDirector = ref<boolean>(false);
const isStaff = ref<boolean>(false);
function fetchCheckIsofficer() {
http
.get(config.API.workflowKeycloakSystem("SYS_RESIGN_EMP"))
.then((res) => {
isStaff.value = res.data.result.isStaff;
isDirector.value = res.data.result.isDirector;
})
.catch((err) => {
messageError($q, err);
});
}
/** Hook */
onMounted(async () => {
showLoader();
await Promise.all([fetchData(id.value), fetchFile()]).finally(() => {
await Promise.all([
fetchData(id.value),
fetchFile(),
fetchCheckIsofficer(),
]).finally(() => {
hideLoader();
});
});
@ -628,6 +649,18 @@ onMounted(async () => {
</div>
</div>
</div>
<div
class="col-xs-12 col-sm-12 row items-start"
v-if="dataDetail.statusMain === 'CANCEL'"
>
<div class="col-12">
<div class="col-12 text-top">เหตุผลการขอยกเลิก</div>
<div class="col-12 text-detail text-red">
{{ dataDetail.cancelReason }}
</div>
</div>
</div>
</div>
</div>
</q-card>
@ -742,8 +775,14 @@ onMounted(async () => {
เงื่อนไขต่าง ๆ
</div>
<q-space />
<!-- && workflowRef?.permission.isUpdate -->
<div v-if="!checkRoutePermisson">
<div
v-if="
!checkRoutePermisson &&
isStaff &&
dataDetail.statusMain === 'WAITTING'
"
>
<div v-if="!conditions">
<q-btn
outline
@ -815,9 +854,12 @@ onMounted(async () => {
<div class="col-12"><q-separator /></div>
<div class="row col-12 q-col-gutter-y-sm q-pa-sm">
<div class="col-12 row">
<!-- && workflowRef?.permission.isUpdate -->
<q-file
v-if="!checkRoutePermisson"
v-if="
!checkRoutePermisson &&
isStaff &&
dataDetail.statusMain === 'WAITTING'
"
class="col-12"
for="#evidenceFiles"
outlined
@ -872,8 +914,9 @@ onMounted(async () => {
<div>
<q-btn
v-if="
dataDetail.status == 'WAITTING' &&
!checkRoutePermisson
!checkRoutePermisson &&
isStaff &&
dataDetail.statusMain === 'WAITTING'
"
dense
flat
@ -955,8 +998,9 @@ onMounted(async () => {
<div
class="q-gutter-x-sm"
v-if="
workflowRef?.permission.isUpdate &&
dataDetail.commanderReject === null
isDirector &&
dataDetail.commanderReject === null &&
dataDetail.statusMain === 'WAITTING'
"
>
<q-btn
@ -1027,8 +1071,9 @@ onMounted(async () => {
<div
class="q-gutter-x-sm"
v-if="
workflowRef?.permission.isUpdate &&
dataDetail.oligarchReject === null
isDirector &&
dataDetail.oligarchReject === null &&
dataDetail.statusMain === 'WAITTING'
"
>
<q-btn
@ -1102,8 +1147,13 @@ onMounted(async () => {
แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
</div>
<q-space />
<!-- && workflowRef?.permission.isUpdate -->
<div v-if="!checkRoutePermisson">
<div
v-if="
!checkRoutePermisson &&
isStaff &&
dataDetail.statusMain === 'WAITTING'
"
>
<div class="q-gutter-sm" v-if="!edit">
<q-btn
outline
@ -1331,7 +1381,7 @@ onMounted(async () => {
ref="workflowRef"
v-model:is-check-data="isCheckData"
:id="id"
sys-name="SYS_RETIREMENT"
sys-name="SYS_RESIGN"
/> -->
</div>

41
src/modules/06_retirement/components/resignEMP/ResignReject.vue
View file

@ -67,6 +67,7 @@ const dataDetail = ref<any>({
status: "",
statustext: "",
fullname: "",
statusMain: "",
});
const workflowRef = ref<any>(null);
@ -176,7 +177,10 @@ function onSubmit() {
reject: !actionPass.value,
};
await http
.put(config.API.resignRejectEMP(`${roleUser.value}-cancel`, id.value), body)
.put(
config.API.resignRejectEMP(`${roleUser.value}-cancel`, id.value),
body
)
.then(async () => {
await fetchData(id.value);
closeModal();
@ -255,9 +259,24 @@ function statusOrder(val: boolean) {
}
}
const isDirector = ref<boolean>(false);
const isStaff = ref<boolean>(false);
function fetchCheckIsofficer() {
http
.get(config.API.workflowKeycloakSystem("RETIREMENT_CANCEL_EMP"))
.then((res) => {
isStaff.value = res.data.result.isStaff;
isDirector.value = res.data.result.isDirector;
})
.catch((err) => {
messageError($q, err);
});
}
/** Hook */
onMounted(async () => {
await fetchData(id.value);
await Promise.all([fetchData(id.value), fetchCheckIsofficer()]);
});
</script>
@ -379,8 +398,9 @@ onMounted(async () => {
<div
class="q-gutter-x-sm"
v-if="
workflowRef?.permission.isUpdate &&
dataDetail.commanderReject === null
isDirector &&
dataDetail.commanderReject === null &&
dataDetail.statusMain === 'WAITTING'
"
>
<q-btn
@ -452,8 +472,9 @@ onMounted(async () => {
<div
class="q-gutter-x-sm"
v-if="
workflowRef?.permission.isUpdate &&
dataDetail.oligarchReject === null
isDirector &&
dataDetail.oligarchReject === null &&
dataDetail.statusMain === 'WAITTING'
"
>
<q-btn
@ -528,7 +549,13 @@ onMounted(async () => {
</div>
<q-space />
<!-- && workflowRef?.permission.isUpdate -->
<div v-if="!checkRoutePermisson">
<div
v-if="
!checkRoutePermisson &&
isStaff &&
dataDetail.statusMain === 'WAITTING'
"
>
<div class="q-gutter-sm" v-if="!edit">
<q-btn
outline