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

Merge branch 'develop' into dev-tee

Browse source
This commit is contained in:
setthawutttty 2023-10-11 11:57:15 +07:00
commit 457164331d
3 changed files with 260 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
View file

@ -86,9 +86,9 @@ const columns2 = ref<QTableProps["columns"]>([
style: "font-size: 14px",
},
]);
const pageNext = (item: object) => {
props.nextPage?.(item);
};
// const pageNext = (item: object) => {
// props.nextPage?.(item);
// };
const emit = defineEmits([
"update:filterKeyword2",
"update:type",
@ -122,7 +122,7 @@ const createdAppoint = async () => {
};
showLoader();
await http
.put(config.API.appointEmployeeOrder(), data)
.post(config.API.appointEmployeeOrder(), data)
.then(() => {
success($q, "บันทึกสำเร็จ");
})
@ -240,18 +240,20 @@ watchEffect(() => {
<q-td key="no" :props="props">
{{ props.rowIndex + 1 }}
</q-td>
<q-td key="citizenId" :props="props" @click="pageNext(props.row)">
<q-td key="citizenId" :props="props">
{{ props.row.citizenId }}
</q-td>
<q-td key="fullname" :props="props" @click="pageNext(props.row)">
<q-td key="fullname" :props="props">
{{ props.row.fullname }}
</q-td>
<q-td
key="organizationName"
:props="props"
@click="pageNext(props.row)"
>
<div
<q-td key="organizationName" :props="props">
{{ props.row.orgName !== null ? props.row.orgName : "-" }}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
}}
<!-- <div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
@ -284,9 +286,9 @@ watchEffect(() => {
<div class="col-4">
<div class="text-weight-medium">-</div>
</div>
</div>
</div> -->
</q-td>
<q-td key="birthday" :props="props" @click="pageNext(props.row)">
<q-td key="birthday" :props="props">
{{ props.row.birthday }}
</q-td>
</q-tr>

267
src/modules/05_placement/components/AppointEmployee/Main.vue
View file

@ -256,10 +256,7 @@ const fecthlistappointment = async () => {
personalId: e.id,
citizenId: e.citizenId,
fullname: e.prefix + e.firstname + " " + e.lastname,
organizationName:
e.organizationName +
" " +
e.organizationShortName,
organizationName: e.organizationName + " " + e.organizationShortName,
orgName: e.organizationName,
organizationShortName: e.organizationShortName,
status: statusText(e.status),
@ -313,7 +310,6 @@ const fecthTypeOption = async () => {
// เปิดโครงสร้าง
const openModalEmployee = async (id: string) => {
personalId.value = id;
await getPosition(id);
};
const getPosition = async (id: string) => {
@ -353,16 +349,16 @@ const getPosition = async (id: string) => {
organizationGovernmentAgencyId: r.organizationGovernmentAgencyId,
organizationShortNameId: r.organizationShortNameId,
organizationFaxName: r.organizationFaxName,
organizationLevelName: r.organizationLevelName,
organizationOrganizationName: r.organizationOrganizationName,
organizationTelExternalName: r.organizationTelExternalName,
organizationTelInternalName: r.organizationTelInternalName,
organizationTypeName: r.organizationTypeName,
positionEmployeeStatusName: r.positionEmployeeStatusName,
positionEmployeeLineName: r.positionEmployeeLineName,
positionEmployeePositionName: r.positionEmployeePositionName,
organizationAgencyName: r.organizationAgencyName,
organizationGovernmentAgencyName: r.organizationGovernmentAgencyName,
organizationLevelName: r.organizationLevel,
organizationOrganizationName: r.organizationOrganization,
organizationTelExternalName: r.organizationTelExternal,
organizationTelInternalName: r.organizationTelInternal,
organizationTypeName: r.organizationType,
positionEmployeeStatusName: r.positionEmployeeStatus,
positionEmployeeLineName: r.positionEmployeeLine,
positionEmployeePositionName: r.positionEmployeePosition,
organizationAgencyName: r.organizationAgencyCode,
organizationGovernmentAgencyName: r.organizationGovernmentAgencyCode,
organizationShortName: r.organizationShortName,
positionEmployeeLevels: r.positionEmployeeLevels,
positionEmployeePositionSides: r.positionEmployeePositionSides,
@ -374,8 +370,7 @@ const getPosition = async (id: string) => {
if (index >= 0) {
selectedPosition.value = [data[index]];
}
rowsPosition.value = data;
rowsPosition.value = data;
ModalEmployee.value = true;
})
.catch((e) => {
@ -488,27 +483,65 @@ const savePosition = async () => {
<div class="row q-pa-md">
<div class="col-12">
<div class="row col-12">
<q-btn @click="popup()" size="14px" flat round color="add" icon="mdi-account-arrow-right">
<q-btn
@click="popup()"
size="14px"
flat
round
color="add"
icon="mdi-account-arrow-right"
>
<q-tooltip>ส่งไปออกคำสั่ง</q-tooltip>
</q-btn>
<q-space />
<q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
debounce="300" placeholder="ค้นหา">
<q-input
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" />
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
/>
</div>
<div class="col-12 q-pt-sm">
<d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="citizenId"
:visible-columns="visibleColumns" v-model:pagination="pagination">
<d-table
:columns="columns"
:rows="rows"
:filter="filterKeyword"
row-key="citizenId"
:visible-columns="visibleColumns"
v-model:pagination="pagination"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props">
@ -519,19 +552,38 @@ const savePosition = async () => {
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td key="no" :props="props" @click="nextPage(props.row.personalId)">
<q-td
key="no"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.rowIndex + 1 }}
</q-td>
<q-td key="citizenId" :props="props" @click="nextPage(props.row.personalId)">
<q-td
key="citizenId"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.citizenId }}
</q-td>
<q-td key="fullname" :props="props" @click="nextPage(props.row.personalId)">
<q-td
key="fullname"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.fullname }}
</q-td>
<q-td key="organizationName" :props="props" @click="nextPage(props.row.personalId)">
<div v-if="props.row.orgName !== null ||
props.row.positionPath !== null
">
<q-td
key="organizationName"
:props="props"
@click="nextPage(props.row.personalId)"
>
<div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<div class="col-4">
<div class="text-weight-medium">
{{
@ -539,8 +591,8 @@ const savePosition = async () => {
}}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
</div>
@ -551,29 +603,73 @@ const savePosition = async () => {
</div>
</div>
</q-td>
<q-td key="birthday" :props="props" @click="nextPage(props.row.personalId)">
<q-td
key="birthday"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.birthday }}
</q-td>
<q-td key="createdAt" :props="props" @click="nextPage(props.row.personalId)">
<q-td
key="createdAt"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.createdAt }}
</q-td>
<q-td key="status" :props="props" @click="nextPage(props.row.personalId)">
<q-td
key="status"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.status }}
</q-td>
<q-td auto-width>
<q-btn v-if="props.row.status !== 'ส่งรายชื่อไปออกคำสั่ง' &&
props.row.status !== 'ออกคำสั่งแล้ว'
" icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-btn
v-if="
props.row.status !== 'ส่งรายชื่อไปออกคำสั่ง' &&
props.row.status !== 'ออกคำสั่งแล้ว'
"
icon="mdi-dots-vertical"
size="12px"
color="grey-7"
flat
round
dense
>
<q-menu
transition-show="jump-down"
transition-hide="jump-up"
>
<q-list dense style="min-width: 200px">
<q-item clickable v-close-popup @click="openModalEmployee(props.row.personalId)">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon color="primary" size="xs" name="mdi-bookmark-outline" />
<q-item
clickable
v-close-popup
@click="openModalEmployee(props.row.personalId)"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="primary"
size="xs"
name="mdi-bookmark-outline"
/>
</q-item-section>
<q-item-section>กำหนดตำแหน่ง</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="clickDelete(props.row.personalId)">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-item
clickable
v-close-popup
@click="clickDelete(props.row.personalId)"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-tooltip>ลบข้อมูล</q-tooltip>
<q-icon color="red" size="xs" name="mdi-delete" />
</q-item-section>
@ -598,37 +694,88 @@ const savePosition = async () => {
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
<q-input borderless outlined dense ref="filterRef" debounce="300" v-model="filterKeyword2"
placeholder="ค้นหา" style="width: 850px; max-width: auto">
<q-input
borderless
outlined
dense
ref="filterRef"
debounce="300"
v-model="filterKeyword2"
placeholder="ค้นหา"
style="width: 850px; max-width: auto"
>
<template v-slot:append>
<q-icon v-if="filterKeyword2 == ''" name="search" />
<q-icon v-if="filterKeyword2 !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
<q-icon
v-if="filterKeyword2 !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select v-model="visibleColumnsPosition" multiple outlined dense options-dense
:display-value="$q.lang.table.columns" emit-value map-options :options="columnsPosition"
option-value="name" options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
<q-select
v-model="visibleColumnsPosition"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columnsPosition"
option-value="name"
options-cover
style="min-width: 150px"
class="gt-xs q-ml-sm"
/>
</q-toolbar>
</div>
</div>
<d-table :rows="rowsPosition" :columns="columnsPosition" :filter="filterKeyword2" row-key="id" selection="single"
v-model:selected="selectedPosition" :visible-columns="visibleColumnsPosition">
<d-table
:rows="rowsPosition"
:columns="columnsPosition"
:filter="filterKeyword2"
row-key="id"
selection="single"
v-model:selected="selectedPosition"
:visible-columns="visibleColumnsPosition"
>
<template v-slot:body-selection="scope">
<q-checkbox keep-color color="primary" dense v-model="scope.selected" />
<q-checkbox
keep-color
color="primary"
dense
v-model="scope.selected"
/>
</template>
</d-table>
</q-card-section>
<q-separator />
<q-card-actions align="right">
<q-btn dense unelevated label="บันทึก" color="public" @click="checkSave" class="q-px-md">
<q-btn
dense
unelevated
label="บันทึก"
color="public"
@click="checkSave"
class="q-px-md"
>
</q-btn>
</q-card-actions>
</q-card>
</q-dialog>
<Dialogbody v-model:Modal="modal" :clickClose="clickClose" :optionsType="optionsType" :rows2="rows2"
v-model:filterKeyword2="filterKeyword2" v-model:type="type" :nextPage="nextPage"
:fecthlistappointment="fecthlistappointment" />
<Dialogbody
v-model:Modal="modal"
:clickClose="clickClose"
:optionsType="optionsType"
:rows2="rows2"
v-model:filterKeyword2="filterKeyword2"
v-model:type="type"
:nextPage="nextPage"
:fecthlistappointment="fecthlistappointment"
/>
<!-- <DialogOrgTree
v-model:modal="modalTree"
:close="closeModalTree"

64
src/modules/07_insignia/components/2_Manage/listManage.vue
View file

@ -165,30 +165,32 @@ const fecthInsigniaByOc = async (
role: string,
status: string
) => {
showLoader();
await http
.get(config.API.insigniaList(roundId, ocId, role, status))
.then(async (res) => {
requestNote.value = res.data.result.requestNote;
requestStatus.value = res.data.result.requestStatus;
requestId.value = res.data.result.requestId;
document.value = res.data.result.document;
await DataStore.fetchData(res.data.result.items); // ส่งรายชื่อข้าราชการสามัญฯ
await DataStore.fetchDataInsignia(res.data.result); // ส่งข้อมูลรอบบการแสดง
loading.value = true;
// แสดงปุมล็อกข้อมูล
if (res.data.result.items !== null) {
if (res.data.result.items.length !== 0) {
hideBottom.value = true;
} else hideBottom.value = false;
}
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
if (roundId && ocId && role && status) {
showLoader();
await http
.get(config.API.insigniaList(roundId, ocId, role, status))
.then(async (res) => {
requestNote.value = res.data.result.requestNote;
requestStatus.value = res.data.result.requestStatus;
requestId.value = res.data.result.requestId;
document.value = res.data.result.document;
await DataStore.fetchData(res.data.result.items); // ส่งรายชื่อข้าราชการสามัญฯ
await DataStore.fetchDataInsignia(res.data.result); // ส่งข้อมูลรอบบการแสดง
loading.value = true;
// แสดงปุมล็อกข้อมูล
if (res.data.result.items !== null) {
if (res.data.result.items.length !== 0) {
hideBottom.value = true;
} else hideBottom.value = false;
}
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
}
};
// ส่งรอบการเสนอขอต่อ เฉพาะ รอบที่ requestStatus st1 และ st4
@ -449,7 +451,10 @@ const uploadFile = async (event: any) => {
<q-card flat bordered class="col-12 q-mt-sm" v-if="loading">
<div
v-if="(roleDataStore.insignia1Role && requestStatus == 'st4') || (roleDataStore.insignia2Role && requestStatus == 'st5')"
v-if="
(roleDataStore.insignia1Role && requestStatus == 'st4') ||
(roleDataStore.insignia2Role && requestStatus == 'st5')
"
class="q-pa-md q-gutter-sm"
>
<q-banner
@ -581,7 +586,10 @@ const uploadFile = async (event: any) => {
@click="sendToDirector"
/>
<q-btn
v-if="roleDataStore.insignia2Role && (requestStatus == 'st3' || requestStatus == 'st5')"
v-if="
roleDataStore.insignia2Role &&
(requestStatus == 'st3' || requestStatus == 'st5')
"
dense
unelevated
label="ตีกลับ"
@ -599,7 +607,9 @@ const uploadFile = async (event: any) => {
@click="directorApproved"
/>
<q-btn
v-if="requestStatus == 'st6' && roleDataStore.adminRole && !DataStore.isLock"
v-if="
requestStatus == 'st6' && roleDataStore.adminRole && !DataStore.isLock
"
dense
unelevated
label="ตีกลับ"