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

fixing

Browse source
This commit is contained in:
Warunee Tamkoo 2024-06-29 21:14:56 +07:00
parent f4a85b3b3a
commit 6fd49f4084
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/06_retirement/components/ListRetirement/AddList.vue
View file

@ -136,7 +136,7 @@ const fecthProfile = async () => {
formPagePersonList.keyword =
formPagePersonList.keyword === null ? "" : formPagePersonList.keyword;
await http
.post(config.API.orgProfileProbation, formPagePersonList)
.post(config.API.orgProfileRetire, formPagePersonList)
.then((res) => {
maxPage.value = Math.ceil(
res.data.result.total / formPagePersonList.pageSize

7
src/modules/06_retirement/components/ListRetirement/TableList.vue
View file

@ -10,7 +10,6 @@ import config from "@/app.config";
import DialogHeader from "@/components/DialogHeader.vue";
import DialogPopupReason from "@/components/Dialogs/PopupReason.vue";
import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
import { format } from "path";
const modalPersonal = ref<boolean>(false);
const personId = ref<string>("");
@ -644,7 +643,7 @@ function updatemodalPersonal(modal: boolean) {
>{{ props.row.organizationOrganization }}</q-td
> -->
<q-td key="position" :props="props">{{
props.row.position ? props.row.position:'-'
props.row.position ? props.row.position : "-"
}}</q-td>
<q-td key="positionType" :props="props"
>{{ props.row.positionType ? props.row.positionType : "-" }}
@ -656,7 +655,7 @@ function updatemodalPersonal(modal: boolean) {
</q-td>
<q-td key="positionNumber" :props="props">{{
props.row.positionNumber ? props.row.positionNumber:'-'
props.row.positionNumber ? props.row.positionNumber : "-"
}}</q-td>
<!-- <q-td key="organizationAgency" :props="props">{{
props.row.organizationAgency
@ -665,7 +664,7 @@ function updatemodalPersonal(modal: boolean) {
props.row.organizationGovernmentAgency
}}</q-td> -->
<q-td class="table_ellipsis" key="organization" :props="props">{{
props.row.organization ? props.row.organization:'-'
props.row.organization ? props.row.organization : "-"
}}</q-td>
<!-- <q-td class="table_ellipsis" key="bureau" :props="props">{{
props.row.bureau

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

@ -746,7 +746,9 @@ function removeFile(fileName: string) {
<div class="q-pl-sm text-weight-bold text-dark">เงื่อนไขต่าง ๆ</div>
<q-space />
<div v-if="dataDetail.status == 'WAITTING' && roleUser === 'admin'">
<div
v-if="dataDetail.status == 'WAITTING' && roleUser === 'officer'"
>
<div v-if="!conditions">
<q-btn
outline
@ -825,7 +827,7 @@ function removeFile(fileName: string) {
<div class="row col-12 q-col-gutter-y-sm q-pa-sm">
<div class="col-12 row">
<q-file
v-if="dataDetail.status == 'WAITTING' && roleUser === 'admin'"
v-if="dataDetail.status == 'WAITTING' && roleUser === 'officer'"
class="col-12"
for="#evidenceFiles"
outlined
@ -881,7 +883,7 @@ function removeFile(fileName: string) {
<q-btn
v-if="
dataDetail.status == 'WAITTING' &&
roleUser === 'admin'
roleUser === 'officer'
"
dense
flat
@ -1051,7 +1053,7 @@ function removeFile(fileName: string) {
</div>
<q-space />
<div v-if="roleUser === 'admin'">
<div v-if="roleUser === 'officer'">
<div class="q-gutter-sm" v-if="!edit">
<q-btn
outline