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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-11-11 10:13:33 +07:00
commit 247cda6e46
8 changed files with 55 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/07_insignia/views/03_ResultMain.vue
View file

@ -85,6 +85,7 @@ const columns = ref<QTableProps["columns"]>([
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "citizenId",
align: "left",
@ -103,6 +104,15 @@ const columns = ref<QTableProps["columns"]>([
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "position",
align: "left",
label: "ตำแหน่ง",
field: "position",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "employeeType",
align: "left",
@ -219,6 +229,7 @@ const visibleColumns = ref<String[]>([
"status",
"citizenId",
"name",
"position",
"type",
"dateReceive",
"date",

5
src/modules/09_leave/components/2_Leave/DetailLeave.vue
View file

@ -167,8 +167,7 @@ async function fetchDetailLeave(paramsId: string) {
formData.leaveDraftDocument = data.leaveDraftDocument;
formData.leaveLastStart =
data.leaveLastStart && date2Thai(data.leaveLastStart);
formData.leaveLastEnd =
data.leaveLastStart && date2Thai(data.leaveLastEnd);
formData.leaveLastEnd = data.leaveLastEnd && date2Thai(data.leaveLastEnd);
formData.leaveTotal = data.leaveTotal ? data.leaveTotal : "0";
formData.leavebirthDate =
data.leaveBirthDate && date2Thai(data.leaveBirthDate);
@ -263,7 +262,7 @@ async function fetchDetailLeave(paramsId: string) {
formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory
? data.coupleDaySumTotalHistory
: "-";
formData.approveStep = data.approveStep;
formData.approveStep = data.approveStep ? data.approveStep : "-";
formData.dear = data.dear ? data.dear : "-";
/** ส่งประเภทของการลาไป Function เช็คประเภทการลา*/

8
src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue
View file

@ -36,7 +36,13 @@ const props = defineProps({
</div>
<div class="row">
<div class="col text-grey-8">ลงวันที่</div>
<div class="col">{{ props.data.absentDayRegistorDate }}</div>
<div class="col">
{{
props.data.absentDayRegistorDate
? props.data.absentDayRegistorDate
: "-"
}}
</div>
</div>
<div class="row">
<div class="col text-grey-8">ให้เข้ารับการ</div>

4
src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue
View file

@ -31,7 +31,9 @@ const props = defineProps({
</div>
<div class="row">
<div class="col text-grey-8">วันที่คลอด</div>
<div class="col">{{ props.data.wifeDayDateBorn }}</div>
<div class="col">
{{ props.data.wifeDayDateBorn ? props.data.wifeDayDateBorn : "-" }}
</div>
</div>
<div class="row">
<div class="col text-grey-8">หมายเลขที่ติดต่อขณะลา</div>

4
src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue
View file

@ -42,7 +42,9 @@ const props = defineProps({
<div class="col text-grey-8">
ลาครั้งสุดท้ายในประเภทนั้น ๆ เมื่อวันที่
</div>
<div class="col">{{ props.data.leaveLastStart }}</div>
<div class="col">
{{ props.data.leaveLastStart ? props.data.leaveLastStart : "-" }}
</div>
</div>
<div class="row">
<div class="col text-grey-8">หมายเลขที่ติดต่อขณะลา</div>

8
src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue
View file

@ -71,7 +71,13 @@ function convertDateToEng(dataThia: string) {
</div>
<div class="row">
<div class="col text-grey-8">วันที่เข้ารับราชการ</div>
<div class="col">{{ props.data.leavegovernmentDate }}</div>
<div class="col">
{{
props.data.leavegovernmentDate
? props.data.leavegovernmentDate
: "-"
}}
</div>
</div>
<div class="row">
<div class="col text-grey-8">เงินเดือนปัจจุบัน</div>

12
src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue
View file

@ -67,11 +67,19 @@ function convertDateToEng(dataThia: string) {
</div>
<div class="row">
<div class="col text-grey-8">วันเดือนปีเกิด</div>
<div class="col">{{ props.data.leavebirthDate }}</div>
<div class="col">
{{ props.data.leavebirthDate ? props.data.leavebirthDate : "-" }}
</div>
</div>
<div class="row">
<div class="col text-grey-8">วันที่เข้ารับราชการ</div>
<div class="col">{{ props.data.leavegovernmentDate }}</div>
<div class="col">
{{
props.data.leavegovernmentDate
? props.data.leavegovernmentDate
: "-"
}}
</div>
</div>
<div class="row">
<div class="col text-grey-8">เงินเดือนปัจจุบัน</div>

16
src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue
View file

@ -16,11 +16,11 @@ const props = defineProps({
</div>
<div class="row">
<div class="col text-grey-8">ลาตั้งแต่วันที่</div>
<div class="col">{{ props.data.leaveLastStart }}</div>
<div class="col">{{ props.data.leaveDateStart }}</div>
</div>
<div class="row">
<div class="col text-grey-8">ลาถึงวันที่</div>
<div class="col">{{ props.data.leaveLastEnd }}</div>
<div class="col">{{ props.data.leaveDateEnd }}</div>
</div>
<div class="row">
<div class="col text-grey-8">จำนวนวันที่ลา</div>
@ -28,11 +28,19 @@ const props = defineProps({
</div>
<div class="row">
<div class="col text-grey-8">วันเดือนปีเกิด</div>
<div class="col">{{ props.data.leavebirthDate }}</div>
<div class="col">
{{ props.data.leavebirthDate ? props.data.leavebirthDate : "-" }}
</div>
</div>
<div class="row">
<div class="col text-grey-8">วันที่เข้ารับราชการ</div>
<div class="col">{{ props.data.leavegovernmentDate }}</div>
<div class="col">
{{
props.data.leavegovernmentDate
? props.data.leavegovernmentDate
: "-"
}}
</div>
</div>
<div class="row">
<div class="col text-grey-8">เคย/ไม่เคยบวช</div>