add: leaveCount in permission leave
This commit is contained in:
parent
906c6066e3
commit
91c870955b
3 changed files with 26 additions and 2 deletions
|
|
@ -84,6 +84,7 @@ const formData = reactive({
|
||||||
leaveYear: calculateFiscalYear(new Date()), //ปี
|
leaveYear: calculateFiscalYear(new Date()), //ปี
|
||||||
leaveDays: "", //วันลาที่ยกมา
|
leaveDays: "", //วันลาที่ยกมา
|
||||||
leaveDaysUsed: "", //วันลาที่ใช้ไป
|
leaveDaysUsed: "", //วันลาที่ใช้ไป
|
||||||
|
leaveCount: "", //ครั้งที่ใช้ไป
|
||||||
});
|
});
|
||||||
const leaveTypeOptions = ref<DataLeaveType[]>([]);
|
const leaveTypeOptions = ref<DataLeaveType[]>([]);
|
||||||
const leaveTypeOptionsMain = ref<DataLeaveType[]>([]);
|
const leaveTypeOptionsMain = ref<DataLeaveType[]>([]);
|
||||||
|
|
@ -104,6 +105,7 @@ async function onSubmit() {
|
||||||
leaveDaysUsed: formData.leaveDaysUsed
|
leaveDaysUsed: formData.leaveDaysUsed
|
||||||
? Number(formData.leaveDaysUsed)
|
? Number(formData.leaveDaysUsed)
|
||||||
: 0,
|
: 0,
|
||||||
|
leaveCount: formData.leaveCount ? Number(formData.leaveCount) : 0,
|
||||||
})
|
})
|
||||||
|
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
|
|
@ -156,6 +158,7 @@ async function defineDataLeaveBeginning(data: DataLeaveBeginning) {
|
||||||
formData.leaveDaysUsed = data.leaveDaysUsed
|
formData.leaveDaysUsed = data.leaveDaysUsed
|
||||||
? data.leaveDaysUsed.toString()
|
? data.leaveDaysUsed.toString()
|
||||||
: "0";
|
: "0";
|
||||||
|
formData.leaveCount = data.leaveCount ? data.leaveCount.toString() : "0";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -450,7 +453,17 @@ watch(modal, async (val) => {
|
||||||
v-model="formData.leaveDaysUsed"
|
v-model="formData.leaveDaysUsed"
|
||||||
dense
|
dense
|
||||||
outlined
|
outlined
|
||||||
label="วันลาที่ใช้ไป"
|
label="ที่ใช้ไป (วัน)"
|
||||||
|
hide-bottom-space
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="col-12">
|
||||||
|
<q-input
|
||||||
|
:class="classInput(true)"
|
||||||
|
v-model="formData.leaveCount"
|
||||||
|
dense
|
||||||
|
outlined
|
||||||
|
label="ที่ใช้ไป (ครั้ง)"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ interface DataLeaveBeginning {
|
||||||
leaveYear: number;
|
leaveYear: number;
|
||||||
prefix: string;
|
prefix: string;
|
||||||
profileId: string;
|
profileId: string;
|
||||||
|
leaveCount: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type { DataLeaveType, DataLeaveBeginning };
|
export type { DataLeaveType, DataLeaveBeginning };
|
||||||
|
|
|
||||||
|
|
@ -83,12 +83,21 @@ const columns = ref<QTableColumn[]>([
|
||||||
{
|
{
|
||||||
name: "leaveDaysUsed",
|
name: "leaveDaysUsed",
|
||||||
align: "left",
|
align: "left",
|
||||||
label: " วันลาที่ใช้ไป",
|
label: "ที่ใช้ไป (วัน)",
|
||||||
sortable: true,
|
sortable: true,
|
||||||
field: "leaveDaysUsed",
|
field: "leaveDaysUsed",
|
||||||
headerStyle: "font-size: 14px",
|
headerStyle: "font-size: 14px",
|
||||||
style: "font-size: 14px",
|
style: "font-size: 14px",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "leaveCount",
|
||||||
|
align: "left",
|
||||||
|
label: "ที่ใช้ไป (ครั้ง)",
|
||||||
|
sortable: true,
|
||||||
|
field: "leaveCount",
|
||||||
|
headerStyle: "font-size: 14px",
|
||||||
|
style: "font-size: 14px",
|
||||||
|
},
|
||||||
]);
|
]);
|
||||||
const visibleColumns = ref<string[]>([
|
const visibleColumns = ref<string[]>([
|
||||||
"fullName",
|
"fullName",
|
||||||
|
|
@ -96,6 +105,7 @@ const visibleColumns = ref<string[]>([
|
||||||
"leaveYear",
|
"leaveYear",
|
||||||
"leaveDays",
|
"leaveDays",
|
||||||
"leaveDaysUsed",
|
"leaveDaysUsed",
|
||||||
|
"leaveCount",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const modalDialogForm = ref<boolean>(false); //modal Dialog บันทึกข้อมูลการลาย้อนหลัง
|
const modalDialogForm = ref<boolean>(false); //modal Dialog บันทึกข้อมูลการลาย้อนหลัง
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue