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

Merge branch 'develop' into work

Browse source
This commit is contained in:
Kittapath 2023-07-14 11:37:29 +07:00
commit c04f26da0c
4 changed files with 105 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/modules/05_placement/components/PersonalDetail/Information/top.vue
View file

@ -87,31 +87,80 @@ const add = () => {
<template>
<div class="flex items-center">
<div class="flex items-center">
<q-icon :name="icon" size="1.5em" color="grey-5" class="q-mr-md" v-if="icon != ''" />
<div class="text-bold text-subtitle2 col-12 row items-center" v-if="header != ''">
<q-icon
:name="icon"
size="1.5em"
color="grey-5"
class="q-mr-md"
v-if="icon != ''"
/>
<div
class="text-bold text-subtitle2 col-12 row items-center"
v-if="header != ''"
>
{{ header }}
</div>
</div>
<div class="q-gutter-sm q-mx-sm" v-if="addData == false">
<q-btn size="12px" v-if="!edit" flat round :disabled="disable" :color="edit ? 'grey-7' : 'primary'"
@click="ClickEdit" icon="mdi-pencil-outline">
<q-btn
size="12px"
v-if="!edit"
flat
round
:disabled="disable"
:color="edit ? 'grey-7' : 'primary'"
@click="ClickEdit"
icon="mdi-pencil-outline"
>
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn>
<q-btn size="12px" flat round v-if="edit" :color="!edit ? 'grey-7' : 'public'" @click="save"
icon="mdi-content-save-outline">
<q-tooltip>บันทึกข้อมูล</q-tooltip>
</q-btn>
<q-btn size="12px" flat round v-if="edit" :color="!edit ? 'grey-7' : 'red'" @click="ClickCancel" icon="mdi-undo">
<q-btn
size="12px"
flat
round
v-if="edit"
:color="!edit ? 'grey-7' : 'red'"
@click="ClickCancel"
icon="mdi-undo"
>
<q-tooltip>ยกเลิก</q-tooltip>
</q-btn>
<q-btn
size="12px"
flat
round
v-if="edit"
:color="!edit ? 'grey-7' : 'public'"
@click="save"
icon="mdi-content-save-outline"
>
<q-tooltip>บันทึกข้อมูล</q-tooltip>
</q-btn>
</div>
<div class="q-pl-sm" v-else>
<q-btn size="12px" flat round :disabled="disable" color="add" @click="add" icon="mdi-plus">
<q-btn
size="12px"
flat
round
:disabled="disable"
color="add"
@click="add"
icon="mdi-plus"
>
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
</q-btn>
</div>
<q-space />
<q-btn color="info" flat dense round size="14px" icon="mdi-history" v-if="history" @click="historyClick">
<q-btn
color="info"
flat
dense
round
size="14px"
icon="mdi-history"
v-if="history"
@click="historyClick"
>
<q-tooltip>ประวัติ{{ header }}</q-tooltip>
</q-btn>
</div>

51
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -133,6 +133,34 @@ const columns = ref<QTableProps["columns"]>([
},
]);
const convertBmaOfficer = (val: string) => {
switch (val) {
case "OFFICER":
return "ขรก.กทม. สามัญ";
case "EMPLOYEE_PERM":
return "ลูกจ้างประจำ";
case "EMPLOYEE_TEMP":
return "ลูกจ้างชั่วคราว";
default:
return "บุคคลภายนอก";
}
};
const convertContainStatus = (val: string) => {
switch (val) {
case "UN-CONTAIN":
return "ยังไม่บรรจุ";
case "PREPARE-CONTAIN":
return "เตรียมบรรจุ";
case "CONTAIN":
return "บรรจุแล้ว";
case "DISCLAIM":
return "สละสิทธิ์";
default:
return "-";
}
};
const getTable = async () => {
showLoader();
await http
@ -153,27 +181,10 @@ const getTable = async () => {
positionPath: data.positionPath,
reportingDate: dateText(new Date(data.reportingDate)),
number: data.number,
bmaOfficer:
data.bmaOfficer == "OFFICER"
? "ขรก.กทม. สามัญ"
: data.bmaOfficer == "EMPLOYEE_PERM"
? "ลูกจ้างประจำ"
: data.bmaOfficer == "EMPLOYEE_TEMP"
? "ลูกจ้างชั่วคราว"
: data.bmaOfficer == null
? "บุคคลภายนอก"
: "-",
bmaOfficer: convertBmaOfficer(data.bmaOfficer),
statusId: data.statusId,
statusName:
data.statusId == "UN-CONTAIN"
? "ยังไม่บรรจุ"
: data.statusId == "PREPARE-CONTAIN"
? "เตรียมบรรจุ"
: data.statusId == "CONTAIN"
? "บรรจุแล้ว"
: data.statusId == "DISCLAIM"
? "สละสิทธิ์"
: "-",
statusName: convertContainStatus(data.statusId)
,
deferment: data.deferment,
};

18
src/modules/05_placement/components/PersonalList/TableDetail.vue
View file

@ -149,19 +149,17 @@ const fetchData = async () => {
};
const formBmaofficer = (val: string) => {
switch (val) {
case "officer":
case "OFFICER":
return "ขรก.กทม. สามัญ";
break;
case "employee_perm":
case "EMPLOYEE_PERM":
return "ลูกจ้างประจำ";
break;
case "employee_temp":
case "EMPLOYEE_TEMP":
return "ลูกจ้างชั่วคราว";
break;
default:
"";
return "";
}
};
const close = async () => {
props.close();
selection.value = [];
@ -199,8 +197,10 @@ const putpersonalForm = async () => {
<q-card bordered class="card-panding">
<div class="row items-center q-pa-xs header-text">
ข้อมูลทั่วไป
<span class="check-officer"><q-icon name="mdi-check" v-if="personalForm.bmaofficer !== null && ''" />{{
formBmaofficer(personalForm.bmaofficer) }}</span>
<span v-if="personalForm.bmaOfficer != null" class="check-officer">
<q-icon name="mdi-check" />
{{ formBmaofficer(personalForm.bmaOfficer) }}
</span>
</div>
<div class="row q-pa-xs">
<div class="col-3 header-sub-text">

10
src/modules/05_placement/components/probation/AddWork.vue
View file

@ -54,7 +54,7 @@
<div class="col-12 text-top0 items-center">
<q-avatar class="bg-grey-2 q-mr-sm" size="28px">2</q-avatar>
ผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ (อาจมีได้มากกว่า 1 คน)
<q-btn round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
<q-btn v-if="routeName == 'probationWorkAdd'" round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
</div>
<div class="col-12 row q-col-gutter-md">
<q-select
@ -87,7 +87,7 @@
<div class="col-12 text-top2 row items-center ">
<q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
3.1 ชื่องาน / ภารกิจงานที่มอบหมาย (ควรมีมากกว่า 1 ภารกิจงาน)
<q-btn round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
<q-btn v-if="routeName == 'probationWorkAdd'" round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
</div>
<div class="col-12 row q-gutter-md">
<q-card flat bordered class="col-12 q-pa-sm bg-grey-1">
@ -153,7 +153,7 @@
<div class="col-12 row">
<div class="col-12 text-top2 row items-center">
ความรู้ความสามารถในการปฏิบัติงาน
<q-btn round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
<q-btn v-if="routeName == 'probationWorkAdd'" round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
</div>
<div class="col-12 row q-col-gutter-sm">
<div class="col-12 ">
@ -194,7 +194,7 @@
<div class="col-12 row">
<div class="col-12 text-top2 row items-center">
ความรู้เรื่องกฎหมายและกฎระเบียบ (ไม่เกิน 20 หัวข้อ)
<q-btn round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
<q-btn v-if="routeName == 'probationWorkAdd'" round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
</div>
<q-card flat bordered class="col-12 q-pa-md" style="max-height: 500px; overflow-y: scroll">
<div class="col-12 row q-pb-sm" v-for="(lawl, index) in listlaw" :key="index" >
@ -457,7 +457,7 @@
<div class="col-12 text-top2 row items-center">
<q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
3.6 ผลผลิตของงานที่คาดหวังและตัวชี้วัดความสําเร็จของงาน
<q-btn round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
<q-btn v-if="routeName == 'probationWorkAdd'" round color="primary" dense icon="mdi-plus" flat class="q-ml-sm" />
</div>
<div class="col-12 row q-gutter-md">
<q-card flat bordered class="col-12 q-pa-sm bg-grey-1">